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
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions

View File

@@ -1,8 +1,10 @@
/*---------------------------------------------------------------------------------------------
* 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."
],
"jsonserver.name": "JSON 语言服务器"
}

View File

@@ -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": "JSON 语言功能",
"description": "为 JSON 文件提供丰富的语言支持",
"json.schemas.desc": "将当前项目中的 JSON 文件与架构关联起来",
"json.schemas.url.desc": "当前目录中指向架构的 URL 或相对路径",
"json.schemas.fileMatch.desc": "将 JSON 文件解析到架构时,用于匹配的一组文件模式。",
@@ -12,5 +16,6 @@
"json.format.enable.desc": "启用/禁用默认 JSON 格式化程序(需要重启)",
"json.tracing.desc": "跟踪 VS Code 与 JSON 语言服务器之间的通信。",
"json.colorDecorators.enable.desc": "启用或禁用颜色修饰器",
"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\",请改用 \"editor.colorDecorators\"。"
"json.colorDecorators.enable.deprecationMessage": "已弃用设置 \"json.colorDecorators.enable\",请改用 \"editor.colorDecorators\"。",
"json.experimental.syntaxFolding": "启用或禁用语法折叠标记。"
}