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

If Salsa is enabled look for the tsserver also in local node_modules

Browse source
This commit is contained in:
Dirk Baeumer 2016-01-06 15:12:43 +01:00 committed by Johannes Rieken
parent 3e9fe80339
commit 58e894eff3
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extensions/typescript/src/typescriptServiceClient.ts
View file

@ -117,6 +117,11 @@ export default class TypeScriptServiceClient implements ITypescriptServiceClient
} else if (workspace.rootPath) {
modulePath = path.join(workspace.rootPath, this.tsdk, 'tsserver.js');
}
} else if (!!process.env['CODE_TSJS'] || !!process.env['VSCODE_TSJS']) {
let candidate = path.join(workspace.rootPath, 'node_modules', 'typescript', 'lib', 'tsserver.js');
if (fs.existsSync(candidate)) {
modulePath = candidate;
}
}
if (!fs.existsSync(modulePath)) {
window.showErrorMessage(`The path ${path.dirname(modulePath)} doesn't point to a valid tsserver install. TypeScript language features will be disabled.`);