diff --git a/extensions/typescript-language-features/src/commands/learnMoreAboutRefactorings.ts b/extensions/typescript-language-features/src/commands/learnMoreAboutRefactorings.ts index b166397e38b..c1c21f363ee 100644 --- a/extensions/typescript-language-features/src/commands/learnMoreAboutRefactorings.ts +++ b/extensions/typescript-language-features/src/commands/learnMoreAboutRefactorings.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as vscode from 'vscode'; -import { isTypeScriptDocument } from '../utils/languageModeIds'; +import { isTypeScriptDocument } from '../utils/languageIds'; import { Command } from './commandManager'; export class LearnMoreAboutRefactoringsCommand implements Command { diff --git a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts index c79e44c63eb..bd86df43522 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fileConfigurationManager.ts @@ -9,7 +9,7 @@ import { ITypeScriptServiceClient } from '../typescriptService'; import API from '../utils/api'; import { Disposable } from '../utils/dispose'; import * as fileSchemes from '../utils/fileSchemes'; -import { isTypeScriptDocument } from '../utils/languageModeIds'; +import { isTypeScriptDocument } from '../utils/languageIds'; import { equals } from '../utils/objects'; import { ResourceMap } from '../utils/resourceMap'; diff --git a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts index 010f4038c7a..68685848035 100644 --- a/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts +++ b/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts @@ -8,7 +8,7 @@ import * as nls from 'vscode-nls'; import { Command, CommandManager } from '../commands/commandManager'; import { ITypeScriptServiceClient } from '../typescriptService'; import API from '../utils/api'; -import { isSupportedLanguageMode } from '../utils/languageModeIds'; +import { isSupportedLanguageMode } from '../utils/languageIds'; import * as typeConverters from '../utils/typeConverters'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts index 4c47cd0cdfc..80d64aee524 100644 --- a/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts +++ b/extensions/typescript-language-features/src/languageFeatures/languageConfiguration.ts @@ -10,7 +10,7 @@ import * as vscode from 'vscode'; import { Disposable } from '../utils/dispose'; -import * as languageModeIds from '../utils/languageModeIds'; +import * as languageModeIds from '../utils/languageIds'; const jsTsLanguageConfiguration: vscode.LanguageConfiguration = { indentationRules: { diff --git a/extensions/typescript-language-features/src/languageProvider.ts b/extensions/typescript-language-features/src/languageProvider.ts index 3f031e9b140..3ff5e9b03c3 100644 --- a/extensions/typescript-language-features/src/languageProvider.ts +++ b/extensions/typescript-language-features/src/languageProvider.ts @@ -43,7 +43,7 @@ export default class LanguageProvider extends Disposable { private get documentSelector(): DocumentSelector { const semantic: vscode.DocumentFilter[] = []; const syntax: vscode.DocumentFilter[] = []; - for (const language of this.description.modeIds) { + for (const language of this.description.languageIds) { syntax.push({ language }); for (const scheme of fileSchemes.semanticSupportedSchemes) { semantic.push({ language, scheme }); @@ -84,7 +84,7 @@ export default class LanguageProvider extends Disposable { import('./languageFeatures/smartSelect').then(provider => this._register(provider.register(selector, this.client))), import('./languageFeatures/tagClosing').then(provider => this._register(provider.register(selector, this.description.id, this.client))), import('./languageFeatures/typeDefinitions').then(provider => this._register(provider.register(selector, this.client))), - import('./languageFeatures/inlayHints').then(provider => this._register(provider.register(selector, this.description.id, this.description.modeIds, this.client, this.fileConfigurationManager))), + import('./languageFeatures/inlayHints').then(provider => this._register(provider.register(selector, this.description.id, this.description.languageIds, this.client, this.fileConfigurationManager))), ]); } @@ -100,7 +100,7 @@ export default class LanguageProvider extends Disposable { } public handlesDocument(doc: vscode.TextDocument): boolean { - return this.description.modeIds.includes(doc.languageId) || this.handlesConfigFile(doc.uri); + return this.description.languageIds.includes(doc.languageId) || this.handlesConfigFile(doc.uri); } private handlesConfigFile(resource: vscode.Uri) { diff --git a/extensions/typescript-language-features/src/lazyClientHost.ts b/extensions/typescript-language-features/src/lazyClientHost.ts index 638aa0f7ee8..195c5eaf669 100644 --- a/extensions/typescript-language-features/src/lazyClientHost.ts +++ b/extensions/typescript-language-features/src/lazyClientHost.ts @@ -56,7 +56,7 @@ export function lazilyActivateClient( const disposables: vscode.Disposable[] = []; const supportedLanguage = flatten([ - ...standardLanguageDescriptions.map(x => x.modeIds), + ...standardLanguageDescriptions.map(x => x.languageIds), ...pluginManager.plugins.map(x => x.languages) ]); diff --git a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts index ba04ec7e302..ed6af73fcf4 100644 --- a/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts +++ b/extensions/typescript-language-features/src/tsServer/bufferSyncSupport.ts @@ -11,7 +11,7 @@ import { coalesce } from '../utils/arrays'; import { Delayer, setImmediate } from '../utils/async'; import { nulToken } from '../utils/cancellation'; import { Disposable } from '../utils/dispose'; -import * as languageModeIds from '../utils/languageModeIds'; +import * as languageModeIds from '../utils/languageIds'; import { ResourceMap } from '../utils/resourceMap'; import * as typeConverters from '../utils/typeConverters'; diff --git a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts index f67db7f3858..7cf6587c473 100644 --- a/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts +++ b/extensions/typescript-language-features/src/typeScriptServiceClientHost.ts @@ -121,7 +121,7 @@ export default class TypeScriptServiceClientHost extends Disposable { if (plugin.configNamespace && plugin.languages.length) { this.registerExtensionLanguageProvider({ id: plugin.configNamespace, - modeIds: Array.from(plugin.languages), + languageIds: Array.from(plugin.languages), diagnosticSource: 'ts-plugin', diagnosticLanguage: DiagnosticLanguage.TypeScript, diagnosticOwner: 'typescript', @@ -138,7 +138,7 @@ export default class TypeScriptServiceClientHost extends Disposable { if (languages.size) { this.registerExtensionLanguageProvider({ id: 'typescript-plugins', - modeIds: Array.from(languages.values()), + languageIds: Array.from(languages.values()), diagnosticSource: 'ts-plugin', diagnosticLanguage: DiagnosticLanguage.TypeScript, diagnosticOwner: 'typescript', @@ -166,7 +166,7 @@ export default class TypeScriptServiceClientHost extends Disposable { private getAllModeIds(descriptions: LanguageDescription[], pluginManager: PluginManager) { const allModeIds = flatten([ - ...descriptions.map(x => x.modeIds), + ...descriptions.map(x => x.languageIds), ...pluginManager.plugins.map(x => x.languages) ]); return allModeIds; diff --git a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts index 87758230999..449973047ad 100644 --- a/extensions/typescript-language-features/src/ui/intellisenseStatus.ts +++ b/extensions/typescript-language-features/src/ui/intellisenseStatus.ts @@ -9,7 +9,7 @@ import { CommandManager } from '../commands/commandManager'; import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService'; import { ActiveJsTsEditorTracker } from '../utils/activeJsTsEditorTracker'; import { Disposable } from '../utils/dispose'; -import { isSupportedLanguageMode, isTypeScriptDocument, jsTsLanguageModes } from '../utils/languageModeIds'; +import { isSupportedLanguageMode, isTypeScriptDocument, jsTsLanguageModes } from '../utils/languageIds'; import { isImplicitProjectConfigFile, openOrCreateConfig, openProjectConfigForFile, openProjectConfigOrPromptToCreate, ProjectType } from '../utils/tsconfig'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/ui/versionStatus.ts b/extensions/typescript-language-features/src/ui/versionStatus.ts index 98a292ac97d..d577e22b194 100644 --- a/extensions/typescript-language-features/src/ui/versionStatus.ts +++ b/extensions/typescript-language-features/src/ui/versionStatus.ts @@ -9,7 +9,7 @@ import { SelectTypeScriptVersionCommand } from '../commands/selectTypeScriptVers import { TypeScriptVersion } from '../tsServer/versionProvider'; import { ITypeScriptServiceClient } from '../typescriptService'; import { Disposable } from '../utils/dispose'; -import { jsTsLanguageModes } from '../utils/languageModeIds'; +import { jsTsLanguageModes } from '../utils/languageIds'; const localize = nls.loadMessageBundle(); diff --git a/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts b/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts index f26380b3b7f..ab9e9576d67 100644 --- a/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts +++ b/extensions/typescript-language-features/src/utils/activeJsTsEditorTracker.ts @@ -6,7 +6,7 @@ import * as vscode from 'vscode'; import { Disposable } from './dispose'; import { isJsConfigOrTsConfigFileName } from './languageDescription'; -import { isSupportedLanguageMode } from './languageModeIds'; +import { isSupportedLanguageMode } from './languageIds'; /** * Tracks the active JS/TS editor. diff --git a/extensions/typescript-language-features/src/utils/languageDescription.ts b/extensions/typescript-language-features/src/utils/languageDescription.ts index f607a7cf22b..96ec01f8de8 100644 --- a/extensions/typescript-language-features/src/utils/languageDescription.ts +++ b/extensions/typescript-language-features/src/utils/languageDescription.ts @@ -5,7 +5,7 @@ import { basename } from 'path'; import * as vscode from 'vscode'; -import * as languageModeIds from './languageModeIds'; +import * as languageIds from './languageIds'; export const enum DiagnosticLanguage { JavaScript, @@ -19,7 +19,7 @@ export interface LanguageDescription { readonly diagnosticOwner: string; readonly diagnosticSource: string; readonly diagnosticLanguage: DiagnosticLanguage; - readonly modeIds: readonly string[]; + readonly languageIds: readonly string[]; readonly configFilePattern?: RegExp; readonly isExternal?: boolean; readonly standardFileExtensions: readonly string[], @@ -31,7 +31,7 @@ export const standardLanguageDescriptions: LanguageDescription[] = [ diagnosticOwner: 'typescript', diagnosticSource: 'ts', diagnosticLanguage: DiagnosticLanguage.TypeScript, - modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact], + languageIds: [languageIds.typescript, languageIds.typescriptreact], configFilePattern: /^tsconfig(\..*)?\.json$/gi, standardFileExtensions: [ 'ts', @@ -44,7 +44,7 @@ export const standardLanguageDescriptions: LanguageDescription[] = [ diagnosticOwner: 'typescript', diagnosticSource: 'ts', diagnosticLanguage: DiagnosticLanguage.JavaScript, - modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact], + languageIds: [languageIds.javascript, languageIds.javascriptreact], configFilePattern: /^jsconfig(\..*)?\.json$/gi, standardFileExtensions: [ 'js', diff --git a/extensions/typescript-language-features/src/utils/languageModeIds.ts b/extensions/typescript-language-features/src/utils/languageIds.ts similarity index 100% rename from extensions/typescript-language-features/src/utils/languageModeIds.ts rename to extensions/typescript-language-features/src/utils/languageIds.ts diff --git a/extensions/typescript-language-features/src/utils/managedFileContext.ts b/extensions/typescript-language-features/src/utils/managedFileContext.ts index 750cc74c7d0..bca5675a49d 100644 --- a/extensions/typescript-language-features/src/utils/managedFileContext.ts +++ b/extensions/typescript-language-features/src/utils/managedFileContext.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode'; import { ActiveJsTsEditorTracker } from './activeJsTsEditorTracker'; import { Disposable } from './dispose'; import { isJsConfigOrTsConfigFileName } from './languageDescription'; -import { isSupportedLanguageMode } from './languageModeIds'; +import { isSupportedLanguageMode } from './languageIds'; /**E * When clause context set when the current file is managed by vscode's built-in typescript extension.