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

extensions/xml/package.json

@@ -1,6 +1,8 @@
 {
 	"name": "xml",
-	"version": "0.1.0",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"contributes": {
@@ -80,14 +82,14 @@
 		"grammars": [{
 			"language": "xml",
 			"scopeName": "text.xml",
-			"path": "./syntaxes/xml.json"
+			"path": "./syntaxes/xml.tmLanguage.json"
 		}, {
 			"language": "xsl",
 			"scopeName": "text.xml.xsl",
-			"path": "./syntaxes/xsl.json"
+			"path": "./syntaxes/xsl.tmLanguage.json"
 		}]
 	},
 	"scripts": {
-		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-xml grammars/xml.cson ./syntaxes/xml.json grammars/xsl.cson ./syntaxes/xsl.json"
+		"update-grammar": "node ../../build/npm/update-grammar.js atom/language-xml grammars/xml.cson ./syntaxes/xml.tmLanguage.json grammars/xsl.cson ./syntaxes/xsl.tmLanguage.json"
 	}
 }

extensions/xml/package.nls.json

@@ -0,0 +1,4 @@
+{
+	"displayName": "XML Language Basics",
+	"description": "Provides syntax highlighting and bracket matching in XML files."
+}

extensions/xml/syntaxes/xml.tmLanguage.json

@@ -5,88 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-xml/commit/27352842917b911383122bdcf98ed0d69d55c179",
-	"scopeName": "text.xml",
 	"name": "XML",
-	"fileTypes": [
-		"aiml",
-		"atom",
-		"axml",
-		"bpmn",
-		"config",
-		"cpt",
-		"csl",
-		"csproj",
-		"csproj.user",
-		"dae",
-		"dia",
-		"dita",
-		"ditamap",
-		"dtml",
-		"fodg",
-		"fodp",
-		"fods",
-		"fodt",
-		"fsproj",
-		"fxml",
-		"gir",
-		"glade",
-		"gpx",
-		"graphml",
-		"icls",
-		"iml",
-		"isml",
-		"jmx",
-		"jsp",
-		"kst",
-		"launch",
-		"menu",
-		"mxml",
-		"nuspec",
-		"opml",
-		"owl",
-		"pom",
-		"ppj",
-		"proj",
-		"pt",
-		"pubxml",
-		"pubxml.user",
-		"rdf",
-		"rng",
-		"rss",
-		"sdf",
-		"shproj",
-		"siml",
-		"sld",
-		"storyboard",
-		"svg",
-		"targets",
-		"tld",
-		"vbox",
-		"vbox-prev",
-		"vbproj",
-		"vbproj.user",
-		"vcproj",
-		"vcproj.filters",
-		"vcxproj",
-		"vcxproj.filters",
-		"wixmsp",
-		"wixmst",
-		"wixobj",
-		"wixout",
-		"wsdl",
-		"wxs",
-		"xaml",
-		"xbl",
-		"xib",
-		"xlf",
-		"xliff",
-		"xml",
-		"xpdl",
-		"xsd",
-		"xul",
-		"ui"
-	],
-	"firstLineMatch": "(?x)\n# XML declaration\n(?:\n  ^ <\\? xml\n\n  # VersionInfo\n  \\s+ version\n  \\s* = \\s*\n  (['\"])\n    1 \\. [0-9]+\n  \\1\n\n  # EncodingDecl\n  (?:\n    \\s+ encoding\n    \\s* = \\s*\n\n    # EncName\n    (['\"])\n      [A-Za-z]\n      [-A-Za-z0-9._]*\n    \\2\n  )?\n\n  # SDDecl\n  (?:\n    \\s+ standalone\n    \\s* = \\s*\n    (['\"])\n      (?:yes|no)\n    \\3\n  )?\n\n  \\s* \\?>\n)\n|\n# Modeline\n(?i:\n  # Emacs\n  -\\*-(?:\\s*(?=[^:;\\s]+\\s*-\\*-)|(?:.*?[;\\s]|(?<=-\\*-))mode\\s*:\\s*)\n    xml\n  (?=[\\s;]|(?<![-*])-\\*-).*?-\\*-\n  |\n  # Vim\n  (?:(?:\\s|^)vi(?:m[<=>]?\\d+|m)?|\\sex)(?=:(?=\\s*set?\\s[^\\n:]+:)|:(?!\\s*set?\\s))(?:(?:\\s|\\s*:\\s*)\\w*(?:\\s*=(?:[^\\n\\\\\\s]|\\\\.)*)?)*[\\s:](?:filetype|ft|syntax)\\s*=\n    xml\n  (?=\\s|:|$)\n)",
+	"scopeName": "text.xml",
 	"patterns": [
 		{
 			"begin": "(<\\?)\\s*([-_a-zA-Z0-9]+)",

extensions/xml/syntaxes/xsl.tmLanguage.json

@@ -5,12 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/atom/language-xml/commit/507de2ee7daca60cf02e9e21fbeb92bbae73e280",
-	"scopeName": "text.xml.xsl",
 	"name": "XSL",
-	"fileTypes": [
-		"xsl",
-		"xslt"
-	],
+	"scopeName": "text.xml.xsl",
 	"patterns": [
 		{
 			"begin": "(<)(xsl)((:))(template)",