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

Extract duplicated constant

Browse Source
This commit is contained in:
Matt Bierner
2021-09-16 17:19:49 -07:00
parent 6d01964e8e
commit eefcaf6e0f
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extensions/typescript-language-features/src/ui/capabilitiesStatus.ts
View File

@@ -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");

11
extensions/typescript-language-features/src/ui/projectStatus.ts
View File

@@ -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) {

11
extensions/typescript-language-features/src/ui/versionStatus.ts
View File

@@ -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");

8
extensions/typescript-language-features/src/utils/languageModeIds.ts
View File

@@ -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;
}
}