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

i18n/chs/extensions/html/client/out/htmlMain.i18n.json

@@ -1,9 +1,11 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// Do not edit this file. It is machine generated.
 {
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the Source EULA. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
 	"htmlserver.name": "HTML 语言服务器",
 	"folding.start": "折叠区域开始",
 	"folding.end": "折叠区域结束"

i18n/chs/extensions/html/package.i18n.json

@@ -1,9 +1,13 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the MIT License. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-// Do not edit this file. It is machine generated.
 {
+	"": [
+		"--------------------------------------------------------------------------------------------",
+		"Copyright (c) Microsoft Corporation. All rights reserved.",
+		"Licensed under the Source EULA. See License.txt in the project root for license information.",
+		"--------------------------------------------------------------------------------------------",
+		"Do not edit this file. It is machine generated."
+	],
+	"displayName": "HTML 语言功能",
+	"description": "为 HTML、Razor 和 Handlebar 文件提供丰富的语言支持。",
 	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序",
 	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
 	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
@@ -25,5 +29,6 @@
 	"html.trace.server.desc": "跟踪 VS Code 与 HTML 语言服务器之间的通信。",
 	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
 	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。",
+	"html.experimental.syntaxFolding": "启用或禁用语法折叠标记。",
 	"html.autoClosingTags": "启用/禁用 HTML 标记的自动关闭。"
 }