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

Fixed a few more cases and updated wording to be more clear

Browse Source
This commit is contained in:
Matt Bierner
2017-01-27 11:24:11 -08:00
parent 850c163f49
commit aa19ee1d1e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/typescript/src/typescriptServiceClient.ts
View File

@@ -383,8 +383,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
if (!this.workspaceState.get<boolean>(TypeScriptServiceClient.tsdkMigratedStorageKey, false)) {
this.workspaceState.update(TypeScriptServiceClient.tsdkMigratedStorageKey, true);
if (workspace.rootPath && (this.hasWorkspaceTsdkSetting() || this.localTypeScriptPath)) {
modulePath = this.showVersionPicker(false);
if (workspace.rootPath && this.hasWorkspaceTsdkSetting()) {
modulePath = this.showVersionPicker(true);
}
}
@@ -489,10 +489,10 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
}
public onVersionStatusClicked(): Thenable<string> {
return this.showVersionPicker(true);
return this.showVersionPicker(false);
}
private showVersionPicker(promptForRestart: boolean) {
private showVersionPicker(firstRun: boolean) {
const modulePath = this.modulePath || this.globalTypescriptPath;
if (!workspace.rootPath) {
return Promise.resolve(modulePath);
@@ -521,7 +521,8 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
}], {
placeHolder: localize(
'selectTsVersion',
'Select the TypeScript version used for language features')
'Select the TypeScript version used for JavaScript and TypeScript language features'),
ignoreFocusOut: firstRun
});
} else {
messageShown = window.showQuickPick<MyQuickPickItem>([
@@ -532,13 +533,13 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
}], {
placeHolder: localize(
'versionCheckUsingBundledTS',
'Using VSCode\'s TypeScript version {0} for Typescript language features',
'Using VSCode\'s TypeScript version {0} for JavaScript and TypeScript language features',
shippedVersion),
});
}
const tryShowRestart = (newModulePath: string) => {
if (!promptForRestart || newModulePath === this.modulePath) {
if (firstRun || newModulePath === this.modulePath) {
return;
}