Fixes #3087: Remove JavaScript and TypeScript from VSCode

.vscode/settings.json

@@ -12,6 +12,6 @@
 		"out*/**": true,
 		"extensions/**/out/**": true
 	},
-	"tslint.enable": true,
+	"tslint.enable": false,
 	"tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib"
 }
\ No newline at end of file

src/vs/editor/editor.main.js

@@ -9,7 +9,10 @@ define([
 	'vs/editor/contrib/quickOpen/browser/quickOutline.contribution',
 	'vs/editor/contrib/quickOpen/browser/gotoLine.contribution',
 	'vs/editor/contrib/quickOpen/browser/quickCommand.contribution',
-	'vs/languages/languages.main'
+	'vs/languages/languages.main',
+	"vs/languages/javascript/common/javascript.contribution",
+	"vs/languages/typescript/common/typescript.contribution",
+	"vs/languages/json/common/json.contribution"
 ], function() {
 
 });
\ No newline at end of file

src/vs/languages/javascript/common/javascript.contribution.ts

@@ -12,10 +12,7 @@ import {LanguageExtensions} from 'vs/editor/common/modes/languageExtensionPoint'
 import Options = require('vs/languages/typescript/common/options');
 let defaults = Options.javaScriptOptions;
 
-let enable = false;
-if (enable) {
-
-	LanguageExtensions.registerCompatMode({
+LanguageExtensions.registerCompatMode({
 	id: 'javascript',
 	extensions: ['.js', '.es6'],
 	firstLine: '^#!.*\\bnode',
@@ -24,13 +21,13 @@ if (enable) {
 	mimetypes: ['text/javascript'],
 	moduleId: 'vs/languages/javascript/common/javascript',
 	ctorName: 'JSMode'
-	});
+});
 
-	// ----- Registration and Configuration --------------------------------------------------------
+// ----- Registration and Configuration --------------------------------------------------------
 
-	var configurationRegistry = <ConfigurationRegistry.IConfigurationRegistry>platform.Registry.as(ConfigurationRegistry.Extensions.Configuration);
+var configurationRegistry = <ConfigurationRegistry.IConfigurationRegistry>platform.Registry.as(ConfigurationRegistry.Extensions.Configuration);
 
-	configurationRegistry.registerConfiguration({
+configurationRegistry.registerConfiguration({
 	'id': 'javascript',
 	'order': 20,
 	'type': 'object',
@@ -183,14 +180,4 @@ if (enable) {
 			}
 		}
 	]
-	});
-} else {
-	LanguageExtensions.registerLanguage({
-		id: 'javascript',
-		extensions: ['.js', '.es6'],
-		firstLine: '^#!.*\\bnode',
-		filenames: ['jakefile'],
-		aliases: ['JavaScript', 'javascript', 'js'],
-		mimetypes: ['text/javascript']
-	});
-}
\ No newline at end of file
+});
\ No newline at end of file

src/vs/languages/languages.main.js

@@ -6,12 +6,10 @@ define([
 	"vs/languages/css/common/css.contribution",
 	"vs/languages/handlebars/common/handlebars.contribution",
 	"vs/languages/html/common/html.contribution",
-	"vs/languages/javascript/common/javascript.contribution",
 	"vs/languages/markdown/common/markdown.contribution",
 	"vs/languages/php/common/php.contribution",
 	"vs/languages/plaintext/common/plaintext.contribution",
 	"vs/languages/razor/common/razor.contribution",
-	"vs/languages/typescript/common/typescript.contribution",
 	"vs/languages/less/common/less.contribution",
 	"vs/languages/sass/common/sass.contribution"
 ], function() {