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/json/syntaxes/JSON.tmLanguage.json

@@ -5,21 +5,8 @@
 		"Once accepted there, we are happy to receive an update request."
 	],
 	"version": "https://github.com/Microsoft/vscode-JSON.tmLanguage/commit/9bd83f1c252b375e957203f21793316203f61f70",
-	"fileTypes": [
-		"json",
-		"sublime-settings",
-		"sublime-menu",
-		"sublime-keymap",
-		"sublime-mousemap",
-		"sublime-theme",
-		"sublime-build",
-		"sublime-project",
-		"sublime-completions"
-	],
-	"foldingStartMarker": "(?x)       # turn on extended mode\n  ^        # a line beginning with\n  \\s*      # some optional space\n  [{\\[]    # the start of an object or array\n  (?!      # but not followed by\n    .*     # whatever\n    [}\\]]  # and the close of an object or array\n    ,?     # an optional comma\n    \\s*    # some optional space\n    $      # at the end of the line\n  )\n  |        # ...or...\n  [{\\[]    # the start of an object or array\n  \\s*      # some optional space\n  $        # at the end of the line",
-	"foldingStopMarker": "(?x)     # turn on extended mode\n  ^      # a line beginning with\n  \\s*    # some optional space\n  [}\\]]  # and the close of an object or array",
-	"keyEquivalent": "^~J",
 	"name": "JSON (Javascript Next)",
+	"scopeName": "source.json",
 	"patterns": [
 		{
 			"include": "#value"
@@ -222,7 +209,5 @@
 				}
 			]
 		}
-	},
-	"scopeName": "source.json",
-	"uuid": "8f97457b-516e-48ce-83c7-08ae12fb327a"
+	}
 }