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

@@ -1,13 +1,17 @@
 {
   "name": "json",
-  "version": "0.1.0",
+  "displayName": "%displayName%",
+	"description": "%description%",
+  "version": "1.0.0",
   "publisher": "vscode",
   "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
   "engines": {
     "vscode": "0.10.x"
   },
+  "icon": "icons/json.png",
   "activationEvents": [
-    "onLanguage:json", "onLanguage:jsonc"
+    "onLanguage:json",
+    "onLanguage:jsonc"
   ],
   "enableProposedApi": true,
   "main": "./client/out/jsonMain",
@@ -53,7 +57,8 @@
           ".code-workspace",
           "language-configuration.json",
           "icon-theme.json",
-          "color-theme.json"
+          "color-theme.json",
+          ".code-snippets"
         ],
         "filenames": [
           "settings.json",
@@ -148,6 +153,11 @@
           "default": true,
           "description": "%json.colorDecorators.enable.desc%",
           "deprecationMessage": "%json.colorDecorators.enable.deprecationMessage%"
+        },
+        "json.experimental.syntaxFolding": {
+          "type": "boolean",
+          "default": false,
+          "description": "%json.experimental.syntaxFolding%"
         }
       }
     },
@@ -160,11 +170,11 @@
     }
   },
   "dependencies": {
-    "vscode-extension-telemetry": "0.0.8",
-    "vscode-languageclient": "^3.5.0",
-    "vscode-nls": "2.0.2"
+    "vscode-extension-telemetry": "0.0.15",
+    "vscode-languageclient": "4.0.0-next.9",
+    "vscode-nls": "^3.2.1"
   },
   "devDependencies": {
     "@types/node": "7.0.43"
   }
-}
+}