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/sql/package.json

@@ -1,6 +1,8 @@
 {
 	"name": "sql",
-	"version": "0.1.0",
+	"displayName": "%displayName%",
+	"description": "%description%",
+	"version": "1.0.0",
 	"publisher": "vscode",
 	"engines": { "vscode": "*" },
 	"scripts": {

extensions/sql/package.nls.json

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

extensions/sql/syntaxes/sql.tmLanguage.json

@@ -5,13 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Microsoft/vscode-mssql/commit/c8effddd6a9df117f3ed45b60b487163950a7ea5",
-	"fileTypes": [
-		"sql",
-		"ddl",
-		"dml"
-	],
-	"keyEquivalent": "^~S",
 	"name": "SQL",
+	"scopeName": "source.sql",
 	"patterns": [
 		{
 			"match": "((?<!@)@)\\b(\\w+)\\b",
@@ -520,7 +515,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.sql",
-	"uuid": "C49120AC-6ECC-11D9-ACC8-000D93589AF6"
+	}
 }

extensions/sql/test/colorize-results/test_sql.json

@@ -11,7 +11,29 @@
 		}
 	},
 	{
-		"c": " VIEW METRIC_STATS (ID, MONTH, TEMP_C, RAIN_C) ",
+		"c": " VIEW METRIC_STATS (ID, ",
+		"t": "source.sql",
+		"r": {
+			"dark_plus": "default: #D4D4D4",
+			"light_plus": "default: #000000",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "default: #FFFFFF"
+		}
+	},
+	{
+		"c": "MONTH",
+		"t": "source.sql support.function.datetime.sql",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": ", TEMP_C, RAIN_C) ",
 		"t": "source.sql",
 		"r": {
 			"dark_plus": "default: #D4D4D4",
@@ -55,7 +77,18 @@
 		}
 	},
 	{
-		"c": "MONTH,",
+		"c": "MONTH",
+		"t": "source.sql support.function.datetime.sql",
+		"r": {
+			"dark_plus": "support.function: #DCDCAA",
+			"light_plus": "support.function: #795E26",
+			"dark_vs": "default: #D4D4D4",
+			"light_vs": "default: #000000",
+			"hc_black": "support.function: #DCDCAA"
+		}
+	},
+	{
+		"c": ",",
 		"t": "source.sql",
 		"r": {
 			"dark_plus": "default: #D4D4D4",