Merge VS Code 1.21 source code (#1067)

* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms

src/bootstrap-amd.js

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 var path = require('path');
+var fs = require('fs');
 var loader = require('./vs/loader');
 
 function uriFromPath(_path) {
@@ -16,9 +17,40 @@ function uriFromPath(_path) {
 	return encodeURI('file://' + pathName);
 }
 
+function readFile(file) {
+	return new Promise(function(resolve, reject) {
+		fs.readFile(file, 'utf8', function(err, data) {
+			if (err) {
+				reject(err);
+				return;
+			}
+			resolve(data);
+		});
+	});
+}
+
 var rawNlsConfig = process.env['VSCODE_NLS_CONFIG'];
 var nlsConfig = rawNlsConfig ? JSON.parse(rawNlsConfig) : { availableLanguages: {} };
 
+// We have a special location of the nls files. They come from a language pack
+if (nlsConfig._resolvedLanguagePackCoreLocation) {
+	let bundles = Object.create(null);
+	nlsConfig.loadBundle = function(bundle, language, cb) {
+		let result = bundles[bundle];
+		if (result) {
+			cb(undefined, result);
+			return;
+		}
+		let bundleFile = path.join(nlsConfig._resolvedLanguagePackCoreLocation, bundle.replace(/\//g, '!') + '.nls.json');
+		readFile(bundleFile).then(function (content) {
+			let json = JSON.parse(content);
+			bundles[bundle] = json;
+			cb(undefined, json);
+		})
+		.catch(cb);
+	};
+}
+
 loader.config({
 	baseUrl: uriFromPath(__dirname),
 	catchError: true,