Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -7,15 +7,14 @@
"vscode": "0.10.x"
},
"activationEvents": [
"onLanguage:json"
"onLanguage:json", "onLanguage:jsonc"
],
"enableProposedApi": true,
"main": "./client/out/jsonMain",
"scripts": {
"compile": "gulp compile-extension:json-client && gulp compile-extension:json-server",
"postinstall": "cd server && npm install",
"install-client-next": "npm install vscode-languageclient@next -f -S",
"install-client-local": "npm install ../../../vscode-languageserver-node/client -f -S",
"postinstall": "cd server && yarn install",
"install-client-next": "yarn add vscode-languageclient@next",
"update-grammar": "node ../../build/npm/update-grammar.js Microsoft/vscode-JSON.tmLanguage JSON.tmLanguage ./syntaxes/JSON.tmLanguage.json"
},
"contributes": {
@@ -33,14 +32,38 @@
".jscsrc",
".eslintrc",
".babelrc",
".webmanifest",
".code-workspace"
".webmanifest"
],
"filenames": [
".watchmanconfig",
".ember-cli"
],
"mimetypes": [
"application/json",
"application/manifest+json"
],
"configuration": "./language-configuration.json"
},
{
"id": "jsonc",
"aliases": [
"JSON with Comments"
],
"extensions": [
".code-workspace",
"language-configuration.json",
"icon-theme.json",
"color-theme.json"
],
"filenames": [
"settings.json",
"launch.json",
"tasks.json",
"keybindings.json",
"tsconfig.json",
"jsconfig.json"
],
"configuration": "./language-configuration.json"
}
],
"grammars": [
@@ -48,6 +71,11 @@
"language": "json",
"scopeName": "source.json",
"path": "./syntaxes/JSON.tmLanguage.json"
},
{
"language": "jsonc",
"scopeName": "source.json",
"path": "./syntaxes/JSON.tmLanguage.json"
}
],
"jsonValidation": [
@@ -133,10 +161,10 @@
},
"dependencies": {
"vscode-extension-telemetry": "0.0.8",
"vscode-languageclient": "3.5.0-next.4",
"vscode-languageclient": "^3.5.0",
"vscode-nls": "2.0.2"
},
"devDependencies": {
"@types/node": "7.0.43"
}
}
}