From e369dd0789601f4929eb6f3f1a65579c30fe2e05 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 31 Aug 2017 10:34:45 +0200
Subject: [PATCH] "html.validate.scripts" not applied on folder. Fixes #33533

---
 extensions/html/server/src/htmlServerMain.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/html/server/src/htmlServerMain.ts b/extensions/html/server/src/htmlServerMain.ts
index fe75e080fef..9b53da722a2 100644
--- a/extensions/html/server/src/htmlServerMain.ts
+++ b/extensions/html/server/src/htmlServerMain.ts
@@ -54,6 +54,7 @@ documents.onDidClose(e => {
 });
 
 function getDocumentSettings(textDocument: TextDocument, needsDocumentSettings: () => boolean): Thenable<Settings> {
+	console.log('scopedSettingsSupport ' + scopedSettingsSupport + 'needsSettings ' + needsDocumentSettings());
 	if (scopedSettingsSupport && needsDocumentSettings()) {
 		let promise = documentSettings[textDocument.uri];
 		if (!promise) {
@@ -184,7 +185,7 @@ async function validateTextDocument(textDocument: TextDocument) {
 	let diagnostics: Diagnostic[] = [];
 	if (textDocument.languageId === 'html') {
 		let modes = languageModes.getAllModesInDocument(textDocument);
-		let settings = await getDocumentSettings(textDocument, () => modes.some(m => m.doValidation && m.doValidation.length > 1));
+		let settings = await getDocumentSettings(textDocument, () => modes.some(m => !!m.doValidation));
 		modes.forEach(mode => {
 			if (mode.doValidation && isValidationEnabled(mode.getId(), settings)) {
 				pushAll(diagnostics, mode.doValidation(textDocument, settings));