diff --git a/extensions/typescript-language-features/src/ui/capabilitiesStatus.ts b/extensions/typescript-language-features/src/ui/capabilitiesStatus.ts index dbf5b9c1da1..095e7ea83b3 100644 --- a/extensions/typescript-language-features/src/ui/capabilitiesStatus.ts +++ b/extensions/typescript-language-features/src/ui/capabilitiesStatus.ts @@ -7,7 +7,7 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { ClientCapability, ITypeScriptServiceClient } from '../typescriptService'; import { Disposable } from '../utils/dispose'; -import * as languageModeIds from '../utils/languageModeIds'; +import { jsTsLanguageModes } from '../utils/languageModeIds'; const localize = nls.loadMessageBundle(); @@ -20,12 +20,7 @@ export class CapabilitiesStatus extends Disposable { ) { super(); - this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.capabilities', [ - languageModeIds.javascript, - languageModeIds.javascriptreact, - languageModeIds.typescript, - languageModeIds.typescriptreact, - ])); + this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.capabilities', jsTsLanguageModes)); this._statusItem.name = localize('capabilitiesStatus.name', "IntelliSense IntelliSense Status"); diff --git a/extensions/typescript-language-features/src/ui/projectStatus.ts b/extensions/typescript-language-features/src/ui/projectStatus.ts index 50c04bd9188..6d130c08ae2 100644 --- a/extensions/typescript-language-features/src/ui/projectStatus.ts +++ b/extensions/typescript-language-features/src/ui/projectStatus.ts @@ -9,7 +9,7 @@ import { CommandManager } from '../commands/commandManager'; import { ITypeScriptServiceClient } from '../typescriptService'; import { ActiveJsTsEditorTracker } from '../utils/activeJsTsEditorTracker'; import { Disposable } from '../utils/dispose'; -import * as languageModeIds from '../utils/languageModeIds'; +import { jsTsLanguageModes, isSupportedLanguageMode } from '../utils/languageModeIds'; import { isImplicitProjectConfigFile, openOrCreateConfig, openProjectConfigForFile, openProjectConfigOrPromptToCreate, ProjectType } from '../utils/tsconfig'; const localize = nls.loadMessageBundle(); @@ -59,12 +59,7 @@ export class ProjectStatus extends Disposable { ) { super(); - this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.projectStatus', [ - languageModeIds.javascript, - languageModeIds.javascriptreact, - languageModeIds.typescript, - languageModeIds.typescriptreact, - ])); + this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.projectStatus', jsTsLanguageModes)); this._statusItem.name = localize('statusItem.name', "Project config"); this._statusItem.text = 'TSConfig'; @@ -101,7 +96,7 @@ export class ProjectStatus extends Disposable { } const doc = editor.document; - if (languageModeIds.isSupportedLanguageMode(doc)) { + if (isSupportedLanguageMode(doc)) { const file = this._client.toOpenedFilePath(doc, { suppressAlertOnFailure: true }); if (file) { if (!this._ready) { diff --git a/extensions/typescript-language-features/src/ui/versionStatus.ts b/extensions/typescript-language-features/src/ui/versionStatus.ts index 60135b8a4de..98a292ac97d 100644 --- a/extensions/typescript-language-features/src/ui/versionStatus.ts +++ b/extensions/typescript-language-features/src/ui/versionStatus.ts @@ -6,10 +6,10 @@ import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; import { SelectTypeScriptVersionCommand } from '../commands/selectTypeScriptVersion'; +import { TypeScriptVersion } from '../tsServer/versionProvider'; import { ITypeScriptServiceClient } from '../typescriptService'; import { Disposable } from '../utils/dispose'; -import * as languageModeIds from '../utils/languageModeIds'; -import { TypeScriptVersion } from '../tsServer/versionProvider'; +import { jsTsLanguageModes } from '../utils/languageModeIds'; const localize = nls.loadMessageBundle(); @@ -22,12 +22,7 @@ export class VersionStatus extends Disposable { ) { super(); - this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.version', [ - languageModeIds.javascript, - languageModeIds.javascriptreact, - languageModeIds.typescript, - languageModeIds.typescriptreact, - ])); + this._statusItem = this._register(vscode.languages.createLanguageStatusItem('typescript.version', jsTsLanguageModes)); this._statusItem.name = localize('versionStatus.name', "TypeScript Version"); this._statusItem.detail = localize('versionStatus.detail', "TypeScript Version"); diff --git a/extensions/typescript-language-features/src/utils/languageModeIds.ts b/extensions/typescript-language-features/src/utils/languageModeIds.ts index 9be48067eda..5decbc602d6 100644 --- a/extensions/typescript-language-features/src/utils/languageModeIds.ts +++ b/extensions/typescript-language-features/src/utils/languageModeIds.ts @@ -11,6 +11,12 @@ export const javascript = 'javascript'; export const javascriptreact = 'javascriptreact'; export const jsxTags = 'jsx-tags'; +export const jsTsLanguageModes = [ + javascript, + javascriptreact, + typescript, + typescriptreact, +]; export function isSupportedLanguageMode(doc: vscode.TextDocument) { return vscode.languages.match([typescript, typescriptreact, javascript, javascriptreact], doc) > 0; @@ -18,4 +24,4 @@ export function isSupportedLanguageMode(doc: vscode.TextDocument) { export function isTypeScriptDocument(doc: vscode.TextDocument) { return vscode.languages.match([typescript, typescriptreact], doc) > 0; -} \ No newline at end of file +}