Fixes #3909: Revive javascript.validate.enable setting

extensions/typescript/package.json

@@ -76,6 +76,11 @@
 					"default": null,
 					"description": "%typescript.tsdk.desc%"
 				},
+				"typescript.validate.enable": {
+					"type": "boolean",
+					"default": true,
+					"description": "%typescript.validate.enable%"
+				},
 				"javascript.validate.enable": {
 					"type": "boolean",
 					"default": true,

extensions/typescript/package.nls.json

@@ -4,5 +4,6 @@
 	"configuration.typescript": "TypeScript configuration",
 	"typescript.useCodeSnippetsOnMethodSuggest.dec": "Complete functions with their parameter signature.",
 	"typescript.tsdk.desc": "Specifies the folder path containing the tsserver and lib*.d.ts files to use.",
+	"typescript.validate.enable": "Enable / disable TypeScript validation",
 	"javascript.validate.enable": "Enable / disable JavaScript validation"
 }

extensions/typescript/src/features/bufferSyncSupport.ts

@@ -71,17 +71,19 @@ export default class BufferSyncSupport {
 
 	private client: ITypescriptServiceClient;
 
+	private _validate: boolean;
 	private modeIds: Map<boolean>;
 	private disposables: Disposable[] = [];
 	private syncedBuffers: { [key: string]: SyncedBuffer };
 
 	private pendingDiagnostics: { [key: string]: number; };
 	private diagnosticDelayer: Delayer<any>;
 
-	constructor(client: ITypescriptServiceClient, modeIds: string[]) {
+	constructor(client: ITypescriptServiceClient, modeIds: string[], validate: boolean = true) {
 		this.client = client;
 		this.modeIds = Object.create(null);
 		modeIds.forEach(modeId => this.modeIds[modeId] = true);
+		this._validate = validate;
 
 		this.pendingDiagnostics = Object.create(null);
 		this.diagnosticDelayer = new Delayer<any>(100);
@@ -93,6 +95,14 @@ export default class BufferSyncSupport {
 		workspace.textDocuments.forEach(this.onDidAddDocument, this);
 	}
 
+	public get validate(): boolean {
+		return this._validate;
+	}
+
+	public set validate(value: boolean) {
+		this._validate = value;
+	}
+
 	public handles(file: string): boolean {
 		return !!this.syncedBuffers[file];
 	}
@@ -153,20 +163,29 @@ export default class BufferSyncSupport {
 	}
 
 	public requestAllDiagnostics() {
+		if (!this._validate) {
+			return;
+		}
 		Object.keys(this.syncedBuffers).forEach(filePath => this.pendingDiagnostics[filePath] = Date.now());
 		this.diagnosticDelayer.trigger(() => {
 			this.sendPendingDiagnostics();
 		});
 	}
 
 	public requestDiagnostic(file: string): void {
+		if (!this._validate) {
+			return;
+		}
 		this.pendingDiagnostics[file] = Date.now();
 		this.diagnosticDelayer.trigger(() => {
 			this.sendPendingDiagnostics();
 		});
 	}
 
 	private sendPendingDiagnostics(): void {
+		if (!this._validate) {
+			return;
+		}
 		let files = Object.keys(this.pendingDiagnostics).map((key) => {
 			return {
 				file: key,

extensions/typescript/src/typescriptMain.ts

@@ -173,7 +173,7 @@ class LanguageManager {
 
 	constructor(client: TypeScriptServiceClient, description: LanguageDescription, validate: boolean = true) {
 		this.description = description;
-		this.bufferSyncSupport = new BufferSyncSupport(client, description.modeIds);
+		this.bufferSyncSupport = new BufferSyncSupport(client, description.modeIds, validate);
 		this.syntaxDiagnostics = Object.create(null);
 		this.currentDiagnostics = languages.createDiagnosticCollection(description.id);
 		this._validate = validate;
@@ -183,12 +183,20 @@ class LanguageManager {
 		return this.bufferSyncSupport.handles(file);
 	}
 
+	public get id(): string {
+		return this.description.id;
+	}
+
 	public get validate(): boolean {
 		return this._validate;
 	}
 
 	public set validate(value: boolean) {
+		if (this._validate === value) {
+			return;
+		}
 		this._validate = value;
+		this.bufferSyncSupport.validate = value;
 		if (value) {
 			this.triggerAllDiagnostics();
 		} else {
@@ -206,9 +214,6 @@ class LanguageManager {
 	}
 
 	public triggerAllDiagnostics(): void {
-		if (!this._validate) {
-			return;
-		}
 		this.bufferSyncSupport.requestAllDiagnostics();
 	}
 
@@ -226,6 +231,7 @@ class LanguageManager {
 	}
 }
 
+const validateSetting = 'validate.enable';
 class TypeScriptServiceClientHost implements ITypescriptServiceClientHost {
 	private client: TypeScriptServiceClient;
 	private languages: LanguageManager[];
@@ -250,10 +256,12 @@ class TypeScriptServiceClientHost implements ITypescriptServiceClientHost {
 		this.languages = [];
 		this.languagePerId = Object.create(null);
 		descriptions.forEach(description => {
-			let manager = new LanguageManager(this.client, description);
+			let config = workspace.getConfiguration(description.id);
+			let manager = new LanguageManager(this.client, description, config.get(validateSetting, true));
 			this.languages.push(manager);
 			this.languagePerId[description.id] = manager;
 		});
+		workspace.onDidChangeConfiguration(this.configurationChanged, this);
 	}
 
 	public get serviceClient(): TypeScriptServiceClient {
@@ -275,6 +283,13 @@ class TypeScriptServiceClientHost implements ITypescriptServiceClientHost {
 		return null;
 	}
 
+	private configurationChanged(): void {
+		this.languages.forEach(language => {
+			let config = workspace.getConfiguration(language.id);
+			language.validate = config.get(validateSetting, true);
+		});
+	}
+
 	private triggerAllDiagnostics() {
 		Object.keys(this.languagePerId).forEach(key => this.languagePerId[key].triggerAllDiagnostics());
 	}