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

Fixes #2434

Browse Source
This commit is contained in:
Dirk Baeumer
2016-01-27 12:03:14 +01:00
parent d605cc4b49
commit 4bed00b373
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/vs/workbench/node/extensionPoints.ts
View File

@@ -42,6 +42,17 @@ export class PluginScanner {
});
return null;
}
// This is a workaround to enable Salsa and avoid TS extension loading
// for JavaScript (see https://github.com/Microsoft/vscode/issues/2225)
if (pluginDescFromFile.name === 'typescript' && pluginDescFromFile.publisher === 'vscode' && (!!process.env['CODE_TSJS'] || !!process.env['VSCODE_TSJS'])) {
pluginDescFromFile.activationEvents = pluginDescFromFile.activationEvents || [];
if (pluginDescFromFile.activationEvents.indexOf('onLanguage:javascript') === -1) {
pluginDescFromFile.activationEvents.push('onLanguage:javascript');
}
if (pluginDescFromFile.activationEvents.indexOf('onLanguage:javascriptreact') === -1) {
pluginDescFromFile.activationEvents.push('onLanguage:javascriptreact');
}
}
return pluginDescFromFile;
}).then((pluginDescFromFile) => {
if (pluginDescFromFile === null) {