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

Only register TS providers for known schemes

Browse Source
This commit is contained in:
Matt Bierner
2017-12-04 13:51:13 -08:00
parent 408b6d5f83
commit 815c1ece96
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/typescript/src/features/formattingProvider.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, FormattingOptions, TextDocument, Position, Range, CancellationToken, TextEdit, WorkspaceConfiguration, Disposable, languages, workspace } from 'vscode';
import { DocumentRangeFormattingEditProvider, OnTypeFormattingEditProvider, FormattingOptions, TextDocument, Position, Range, CancellationToken, TextEdit, WorkspaceConfiguration, Disposable, languages, workspace, DocumentSelector } from 'vscode';
import * as Proto from '../protocol';
import { ITypeScriptServiceClient } from '../typescriptService';
@@ -123,7 +123,7 @@ export class FormattingProviderManager {
constructor(
private readonly modeId: string,
private readonly formattingProvider: TypeScriptFormattingProvider,
private readonly selector: string[]
private readonly selector: DocumentSelector
) { }
public dispose() {

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

@@ -8,7 +8,7 @@
* https://github.com/Microsoft/TypeScript-Sublime-Plugin/blob/master/TypeScript%20Indent.tmPreferences
* ------------------------------------------------------------------------------------------ */
import { env, languages, commands, workspace, window, Memento, Diagnostic, Range, Disposable, Uri, MessageItem, DiagnosticSeverity, TextDocument } from 'vscode';
import { env, languages, commands, workspace, window, Memento, Diagnostic, Range, Disposable, Uri, MessageItem, DiagnosticSeverity, TextDocument, DocumentFilter } from 'vscode';
// This must be the first statement otherwise modules might got loaded with
// the wrong locale.
@@ -36,6 +36,7 @@ import * as languageConfigurations from './utils/languageConfigurations';
import { CommandManager } from './utils/commandManager';
import DiagnosticsManager from './features/diagnostics';
import { LanguageDescription } from './utils/languageDescription';
import * as fileSchemes from './utils/fileSchemes';
const validateSetting = 'validate.enable';
@@ -48,6 +49,8 @@ class LanguageProvider {
private _validate: boolean = true;
private _documentSelector: DocumentFilter[];
private readonly disposables: Disposable[] = [];
private readonly versionDependentDisposables: Disposable[] = [];
@@ -97,12 +100,24 @@ class LanguageProvider {
this.formattingOptionsManager.dispose();
}
private get documentSelector(): DocumentFilter[] {
if (!this._documentSelector) {
this._documentSelector = [];
for (const language of this.description.modeIds) {
for (const scheme of fileSchemes.supportedSchemes) {
this._documentSelector.push({ language, scheme });
}
}
}
return this._documentSelector;
}
private async registerProviders(
client: TypeScriptServiceClient,
commandManager: CommandManager,
typingsStatus: TypingsStatus
): Promise<void> {
const selector = this.description.modeIds;
const selector = this.documentSelector;
const config = workspace.getConfiguration(this.id);
this.disposables.push(languages.registerCompletionItemProvider(selector,
@@ -214,7 +229,7 @@ class LanguageProvider {
return;
}
const selector = this.description.modeIds;
const selector = this.documentSelector;
if (this.client.apiVersion.has220Features()) {
this.versionDependentDisposables.push(languages.registerImplementationProvider(selector, new (await import('./features/implementationProvider')).default(this.client)));
}