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

Fixes #3086

Browse Source
This commit is contained in:
Dirk Baeumer
2016-02-17 14:15:28 +01:00
parent 0bd1682830
commit 1dc404e2ea
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/typescript/package.json
+2
View File
@@ -13,6 +13,8 @@
"vscode:prepublish": "node ../../node_modules/gulp/bin/gulp.js --gulpfile ../../gulpfile.plugins.js compile-plugin:typescript ./src/tsconfig.json"
},
"activationEvents": [
"onLanguage:javascript",
"onLanguage:javascriptreact",
"onLanguage:typescript",
"onLanguage:typescriptreact",
"onCommand:typescript.reloadProjects"
extensions/typescript/src/typescriptMain.ts
+2 -5
View File
@@ -51,11 +51,8 @@ export function activate(context: ExtensionContext): void {
client.onReady().then(() => {
registerSupports(MODE_ID_TS, clientHost, client);
registerSupports(MODE_ID_TSX, clientHost, client);
let useSalsa = !!process.env['CODE_TSJS'] || !!process.env['VSCODE_TSJS'];
if (useSalsa) {
registerSupports(MODE_ID_JS, clientHost, client);
registerSupports(MODE_ID_JSX, clientHost, client);
}
registerSupports(MODE_ID_JS, clientHost, client);
registerSupports(MODE_ID_JSX, clientHost, client);
}, () => {
// Nothing to do here. The client did show a message;
});
src/vs/languages/javascript/common/javascript.contribution.ts
+2 -1
View File
@@ -12,7 +12,8 @@ import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint'
import Options = require('vs/languages/typescript/common/options');
let defaults = Options.javaScriptOptions;
if (!env.enableTypeScriptServiceModeForJS) {
let enable = false;
if (enable) {
LanguageExtensions.registerCompatMode({
id: 'javascript',
src/vs/workbench/node/extensionPoints.ts
-11
View File
@@ -126,17 +126,6 @@ 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');
}
}
let extension = paths.extname(absoluteManifestPath);
let basename = absoluteManifestPath.substr(0, absoluteManifestPath.length - extension.length);