diff --git a/extensions/typescript/src/extension.ts b/extensions/typescript/src/extension.ts index ed9f93b082c..d9a1eb85244 100644 --- a/extensions/typescript/src/extension.ts +++ b/extensions/typescript/src/extension.ts @@ -5,27 +5,13 @@ import * as vscode from 'vscode'; import { CommandManager } from './utils/commandManager'; -import { ReloadTypeScriptProjectsCommand, SelectTypeScriptVersionCommand, ReloadJavaScriptProjectsCommand, RestartTsServerCommand, OpenTsServerLogCommand, TypeScriptGoToProjectConfigCommand, JavaScriptGoToProjectConfigCommand, LanguageDescription, TypeScriptServiceClientHost } from './typescriptMain'; +import { ReloadTypeScriptProjectsCommand, SelectTypeScriptVersionCommand, ReloadJavaScriptProjectsCommand, RestartTsServerCommand, OpenTsServerLogCommand, TypeScriptGoToProjectConfigCommand, JavaScriptGoToProjectConfigCommand, TypeScriptServiceClientHost } from './typescriptMain'; import TypeScriptTaskProviderManager from './features/taskProvider'; import { getContributedTypeScriptServerPlugins } from './utils/plugins'; import * as ProjectStatus from './utils/projectStatus'; import * as languageModeIds from './utils/languageModeIds'; import * as languageConfigurations from './utils/languageConfigurations'; - -export const standardLanguageDescriptions: LanguageDescription[] = [ - { - id: 'typescript', - diagnosticSource: 'ts', - modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact], - configFile: 'tsconfig.json' - }, { - id: 'javascript', - diagnosticSource: 'js', - modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact], - configFile: 'jsconfig.json' - } -]; - +import { standardLanguageDescriptions } from './utils/languageDescription'; export function activate(context: vscode.ExtensionContext): void { const plugins = getContributedTypeScriptServerPlugins(); diff --git a/extensions/typescript/src/typescriptMain.ts b/extensions/typescript/src/typescriptMain.ts index c585d7e1289..85b74c9455c 100644 --- a/extensions/typescript/src/typescriptMain.ts +++ b/extensions/typescript/src/typescriptMain.ts @@ -35,14 +35,7 @@ import FormattingConfigurationManager from './features/formattingConfigurationMa import * as languageConfigurations from './utils/languageConfigurations'; import { CommandManager, Command } from './utils/commandManager'; import DiagnosticsManager from './features/diagnostics'; - -export interface LanguageDescription { - id: string; - diagnosticSource: string; - modeIds: string[]; - configFile?: string; - isExternal?: boolean; -} +import { LanguageDescription } from './utils/languageDescription'; export class ReloadTypeScriptProjectsCommand implements Command { public readonly id = 'typescript.reloadProjects'; diff --git a/extensions/typescript/src/utils/languageDescription.ts b/extensions/typescript/src/utils/languageDescription.ts new file mode 100644 index 00000000000..5ac2f55483f --- /dev/null +++ b/extensions/typescript/src/utils/languageDescription.ts @@ -0,0 +1,27 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ +import * as languageModeIds from './languageModeIds'; + +export interface LanguageDescription { + id: string; + diagnosticSource: string; + modeIds: string[]; + configFile?: string; + isExternal?: boolean; +} + +export const standardLanguageDescriptions: LanguageDescription[] = [ + { + id: 'typescript', + diagnosticSource: 'ts', + modeIds: [languageModeIds.typescript, languageModeIds.typescriptreact], + configFile: 'tsconfig.json' + }, { + id: 'javascript', + diagnosticSource: 'js', + modeIds: [languageModeIds.javascript, languageModeIds.javascriptreact], + configFile: 'jsconfig.json' + } +];