Make the typescript plugins contribution point dynamic

Part of #67575
microsoft · Feb 12, 2019 · a8216d4 · a8216d4
1 parent ebff3af
commit a8216d4
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 16 deletions.
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -166,6 +166,10 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 		this._register(this.pluginManager.onDidUpdateConfig(update => {
 			this.configurePlugin(update.pluginId, update.config);
 		}));
+
+		this._register(this.pluginManager.onDidChangePlugins(() => {
+			this.restartTsServer();
+		}));
 	}
 
 	public get configuration() {

diff --git a/extensions/typescript-language-features/src/utils/plugins.ts b/extensions/typescript-language-features/src/utils/plugins.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
+import * as arrays from './arrays';
 import { Disposable } from './dispose';
-import { memoize } from './memoize';
 
 export interface TypeScriptServerPlugin {
 	readonly path: string;
@@ -14,28 +14,45 @@ export interface TypeScriptServerPlugin {
 	readonly languages: ReadonlyArray<string>;
 }
 
+namespace TypeScriptServerPlugin {
+	export function equals(a: TypeScriptServerPlugin, b: TypeScriptServerPlugin): boolean {
+		return a.path === b.path
+			&& a.name === b.name
+			&& a.enableForWorkspaceTypeScriptVersions === b.enableForWorkspaceTypeScriptVersions
+			&& arrays.equals(a.languages, b.languages);
+	}
+}
+
 export class PluginManager extends Disposable {
 	private readonly _pluginConfigurations = new Map<string, {}>();
 
-	@memoize
-	public get plugins(): ReadonlyArray<TypeScriptServerPlugin> {
-		const plugins: TypeScriptServerPlugin[] = [];
-		for (const extension of vscode.extensions.all) {
-			const pack = extension.packageJSON;
-			if (pack.contributes && Array.isArray(pack.contributes.typescriptServerPlugins)) {
-				for (const plugin of pack.contributes.typescriptServerPlugins) {
-					plugins.push({
-						name: plugin.name,
-						enableForWorkspaceTypeScriptVersions: !!plugin.enableForWorkspaceTypeScriptVersions,
-						path: extension.extensionPath,
-						languages: Array.isArray(plugin.languages) ? plugin.languages : [],
-					});
-				}
+	private _plugins: Map<string, ReadonlyArray<TypeScriptServerPlugin>> | undefined;
+
+	constructor() {
+		super();
+
+		vscode.extensions.onDidChange(() => {
+			if (!this._plugins) {
+				return;
 			}
+			const newPlugins = this.readPlugins();
+			if (!arrays.equals(arrays.flatten(Array.from(this._plugins.values())), arrays.flatten(Array.from(newPlugins.values())), TypeScriptServerPlugin.equals)) {
+				this._plugins = newPlugins;
+				this._onDidUpdatePlugins.fire(this);
+			}
+		}, undefined, this._disposables);
+	}
+
+	public get plugins(): ReadonlyArray<TypeScriptServerPlugin> {
+		if (!this._plugins) {
+			this._plugins = this.readPlugins();
 		}
-		return plugins;
+		return arrays.flatten(Array.from(this._plugins.values()));
 	}
 
+	private readonly _onDidUpdatePlugins = this._register(new vscode.EventEmitter<this>());
+	public readonly onDidChangePlugins = this._onDidUpdatePlugins.event;
+
 	private readonly _onDidUpdateConfig = this._register(new vscode.EventEmitter<{ pluginId: string, config: {} }>());
 	public readonly onDidUpdateConfig = this._onDidUpdateConfig.event;
 
@@ -47,4 +64,26 @@ export class PluginManager extends Disposable {
 	public configurations(): IterableIterator<[string, {}]> {
 		return this._pluginConfigurations.entries();
 	}
+
+	private readPlugins() {
+		const pluginMap = new Map<string, ReadonlyArray<TypeScriptServerPlugin>>();
+		for (const extension of vscode.extensions.all) {
+			const pack = extension.packageJSON;
+			if (pack.contributes && Array.isArray(pack.contributes.typescriptServerPlugins)) {
+				const plugins: TypeScriptServerPlugin[] = [];
+				for (const plugin of pack.contributes.typescriptServerPlugins) {
+					plugins.push({
+						name: plugin.name,
+						enableForWorkspaceTypeScriptVersions: !!plugin.enableForWorkspaceTypeScriptVersions,
+						path: extension.extensionPath,
+						languages: Array.isArray(plugin.languages) ? plugin.languages : [],
+					});
+				}
+				if (plugins.length) {
+					pluginMap.set(extension.id, plugins);
+				}
+			}
+		}
+		return pluginMap;
+	}
 }