microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-12 09:50:11 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Restore having both javascript.goToProjectConfig and typescript.goToProjectConfig

Browse Source
This commit is contained in:
Matt Bierner
2017-11-07 16:35:04 -08:00
parent 5d143998e8
commit 49e2d76264
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/typescript/package.json
View File

@@ -506,11 +506,11 @@
"when": "editorLangId == typescriptreact"
},
{
"command": "typescript.goToProjectConfig",
"command": "javascript.goToProjectConfig",
"when": "editorLangId == 'javascript'"
},
{
"command": "typescript.goToProjectConfig",
"command": "javascript.goToProjectConfig",
"when": "editorLangId == javascriptreact"
}
]

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

@@ -119,7 +119,7 @@ class RestartTsServerCommand implements Command {
}
}
class GoToProjectConfigCommand implements Command {
class TypeScriptGoToProjectConfigCommand implements Command {
public readonly id = 'typescript.goToProjectConfig';
public constructor(
@@ -129,8 +129,22 @@ class GoToProjectConfigCommand implements Command {
public execute() {
const editor = window.activeTextEditor;
if (editor) {
const isTsProject = languages.match([languageModeIds.typescript, languageModeIds.typescriptreact], editor.document) > 0;
this.lazyClientHost().goToProjectConfig(isTsProject, editor.document.uri);
this.lazyClientHost().goToProjectConfig(true, editor.document.uri);
}
}
}
class JavaScriptGoToProjectConfigCommand implements Command {
public readonly id = 'javascript.goToProjectConfig';
public constructor(
private readonly lazyClientHost: () => TypeScriptServiceClientHost,
) { }
public execute() {
const editor = window.activeTextEditor;
if (editor) {
this.lazyClientHost().goToProjectConfig(false, editor.document.uri);
}
}
}
@@ -166,7 +180,8 @@ export function activate(context: ExtensionContext): void {
commandManager.register(new SelectTypeScriptVersionCommand(lazyClientHost));
commandManager.register(new OpenTsServerLogCommand(lazyClientHost));
commandManager.register(new RestartTsServerCommand(lazyClientHost));
commandManager.register(new GoToProjectConfigCommand(lazyClientHost));
commandManager.register(new TypeScriptGoToProjectConfigCommand(lazyClientHost));
commandManager.register(new JavaScriptGoToProjectConfigCommand(lazyClientHost));
context.subscriptions.push(new TypeScriptTaskProviderManager(() => lazyClientHost().serviceClient));