diff --git a/extensions/typescript-language-features/src/utils/platform.ts b/extensions/typescript-language-features/src/utils/platform.ts index de2cd033273..81847ece464 100644 --- a/extensions/typescript-language-features/src/utils/platform.ts +++ b/extensions/typescript-language-features/src/utils/platform.ts @@ -4,5 +4,5 @@ *--------------------------------------------------------------------------------------------*/ export function isWeb(): boolean { - return typeof process !== 'undefined'; + return typeof process === 'undefined'; } diff --git a/extensions/typescript-language-features/src/utils/versionProvider.electron.ts b/extensions/typescript-language-features/src/utils/versionProvider.electron.ts index de9adeb481d..3f42c93dd13 100644 --- a/extensions/typescript-language-features/src/utils/versionProvider.electron.ts +++ b/extensions/typescript-language-features/src/utils/versionProvider.electron.ts @@ -82,8 +82,8 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider try { const extension = vscode.extensions.getExtension(extensionId); if (extension) { - const typescriptPath = path.join(extension.extensionPath, ...pathToTs, 'typescript', 'lib'); - const bundledVersion = new TypeScriptVersion(source, path.join(typescriptPath, 'tsserver.js'), DiskTypeScriptVersionProvider.getApiVersion(typescriptPath), ''); + const serverPath = path.join(extension.extensionPath, ...pathToTs, 'typescript', 'lib', 'tsserver.js'); + const bundledVersion = new TypeScriptVersion(source, serverPath, DiskTypeScriptVersionProvider.getApiVersion(serverPath), ''); if (bundledVersion.isValid) { return bundledVersion; } @@ -101,19 +101,21 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider private loadVersionsFromSetting(source: TypeScriptVersionSource, tsdkPathSetting: string): TypeScriptVersion[] { if (path.isAbsolute(tsdkPathSetting)) { + const serverPath = path.join(tsdkPathSetting, 'tsserver.js'); return [ new TypeScriptVersion(source, - path.join(tsdkPathSetting, 'tsserver.js'), - DiskTypeScriptVersionProvider.getApiVersion(tsdkPathSetting)) + serverPath, + DiskTypeScriptVersionProvider.getApiVersion(serverPath)) ]; } const workspacePath = RelativeWorkspacePathResolver.asAbsoluteWorkspacePath(tsdkPathSetting); if (workspacePath !== undefined) { + const serverPath = path.join(workspacePath, 'tsserver.js'); return [ new TypeScriptVersion(source, - path.join(workspacePath, 'tsserver.js'), - DiskTypeScriptVersionProvider.getApiVersion(tsdkPathSetting), + serverPath, + DiskTypeScriptVersionProvider.getApiVersion(serverPath), tsdkPathSetting) ]; } @@ -138,8 +140,8 @@ export class DiskTypeScriptVersionProvider implements ITypeScriptVersionProvider label = path.join(root.name, relativePath); } - const serverPath = path.join(root.uri.fsPath, relativePath); - versions.push(new TypeScriptVersion(source, path.join(serverPath, 'tsserver.js'), DiskTypeScriptVersionProvider.getApiVersion(serverPath), label)); + const serverPath = path.join(root.uri.fsPath, relativePath, 'tsserver.js'); + versions.push(new TypeScriptVersion(source, serverPath, DiskTypeScriptVersionProvider.getApiVersion(serverPath), label)); } return versions; }