maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add support for loading contributed TS version

Browse source 
Fixes https://github.com/microsoft/vscode/issues/75222
Fixes https://github.com/microsoft/TypeScript/issues/31623
This commit is contained in:
Matt Bierner 2019-06-10 15:42:35 -07:00
parent 18b659dd5e
commit 1f4e2a21fc
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
extensions/typescript-language-features/src/utils/versionProvider.ts
View file

@ -9,8 +9,8 @@ import * as nls from 'vscode-nls';
import API from './api';
import { TypeScriptServiceConfiguration } from './configuration';
import { RelativeWorkspacePathResolver } from './relativePathResolver';
const localize = nls.loadMessageBundle();
const localize = nls.loadMessageBundle();
export class TypeScriptVersion {
constructor(
@ -109,7 +109,7 @@ export class TypeScriptVersionProvider {
return globals[0];
}
}
return undefined;
return this.contributedTsNextVersion;
}
public get localVersion(): TypeScriptVersion | undefined {
@ -138,22 +138,35 @@ export class TypeScriptVersionProvider {
}
public get bundledVersion(): TypeScriptVersion {
try {
const { extensionPath } = vscode.extensions.getExtension('vscode.typescript-language-features')!;
const typescriptPath = path.join(extensionPath, '../node_modules/typescript/lib');
const bundledVersion = new TypeScriptVersion(typescriptPath, '');
if (bundledVersion.isValid) {
return bundledVersion;
}
} catch (e) {
// noop
const version = this.getContributedVersion('vscode.typescript-language-features', ['..', 'node_modules']);
if (version) {
return version;
}
vscode.window.showErrorMessage(localize(
'noBundledServerFound',
'VS Code\'s tsserver was deleted by another application such as a misbehaving virus detection tool. Please reinstall VS Code.'));
throw new Error('Could not find bundled tsserver.js');
}
private get contributedTsNextVersion(): TypeScriptVersion | undefined {
return this.getContributedVersion('ms-vscode.vscode-typescript-next', ['node_modules']);
}
private getContributedVersion(extensionId: string, pathToTs: readonly string[]): TypeScriptVersion | undefined {
try {
const { extensionPath } = vscode.extensions.getExtension(extensionId)!;
const typescriptPath = path.join(extensionPath, ...pathToTs, 'typescript', 'lib');
const bundledVersion = new TypeScriptVersion(typescriptPath, '');
if (bundledVersion.isValid) {
return bundledVersion;
}
} catch {
// noop
}
return undefined;
}
private get localTsdkVersions(): TypeScriptVersion[] {
const localTsdk = this.configuration.localTsdk;
return localTsdk ? this.loadVersionsFromSetting(localTsdk) : [];