Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Properly gate type definition and implementation providers for TS changes. Fixes #24548

Browse Source
This commit is contained in:
Matt Bierner
2017-04-25 14:46:01 -07:00
parent 90a81236cd
commit 3f930c796d
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
extensions/typescript/src/typescriptMain.ts
View File

@@ -152,6 +152,8 @@ class LanguageProvider {
private readonly disposables: Disposable[] = [];
private versionDependentDisposables: Disposable[] = [];
constructor(
private readonly client: TypeScriptServiceClient,
private readonly description: LanguageDescription
@@ -193,6 +195,13 @@ class LanguageProvider {
}
}
while (this.versionDependentDisposables.length) {
const obj = this.versionDependentDisposables.pop();
if (obj) {
obj.dispose();
}
}
this.typingsStatus.dispose();
this.currentDiagnostics.dispose();
this.bufferSyncSupport.dispose();
@@ -235,13 +244,7 @@ class LanguageProvider {
this.disposables.push(languages.registerCodeActionsProvider(selector, new CodeActionProvider(client, this.description.id)));
if (client.apiVersion.has220Features()) {
this.disposables.push(languages.registerImplementationProvider(selector, new ImplementationProvider(client)));
}
if (client.apiVersion.has213Features()) {
this.disposables.push(languages.registerTypeDefinitionProvider(selector, new TypeDefintionProvider(client)));
}
this.registerVersionDependentProviders();
this.description.modeIds.forEach(modeId => {
this.disposables.push(languages.registerWorkspaceSymbolProvider(new WorkspaceSymbolProvider(client, modeId)));
@@ -363,6 +366,30 @@ class LanguageProvider {
this.syntaxDiagnostics = Object.create(null);
this.bufferSyncSupport.reOpenDocuments();
this.bufferSyncSupport.requestAllDiagnostics();
this.registerVersionDependentProviders();
}
private registerVersionDependentProviders(): void {
while (this.versionDependentDisposables.length) {
const obj = this.versionDependentDisposables.pop();
if (obj) {
obj.dispose();
}
}
this.versionDependentDisposables = [];
if (!this.client) {
return;
}
const selector = this.description.modeIds;
if (this.client.apiVersion.has220Features()) {
this.versionDependentDisposables.push(languages.registerImplementationProvider(selector, new ImplementationProvider(this.client)));
}
if (this.client.apiVersion.has213Features()) {
this.versionDependentDisposables.push(languages.registerTypeDefinitionProvider(selector, new TypeDefintionProvider(this.client)));
}
}
public triggerAllDiagnostics(): void {