Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898 (#15681)

* Merge from vscode a348d103d1256a06a2c9b3f9b406298a9fef6898

* Fixes and cleanup

* Distro

* Fix hygiene yarn

* delete no yarn lock changes file

* Fix hygiene

* Fix layer check

* Fix CI

* Skip lib checks

* Remove tests deleted in vs code

* Fix tests

* Distro

* Fix tests and add removed extension point

* Skip failing notebook tests for now

* Disable broken tests and cleanup build folder

* Update yarn.lock and fix smoke tests

* Bump sqlite

* fix contributed actions and file spacing

* Fix user data path

* Update yarn.locks

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2021-06-17 08:17:11 -07:00
committed by GitHub
parent fdcb97c7f7
commit 3cb2f552a6
2582 changed files with 124827 additions and 87099 deletions

View File

@@ -9,10 +9,26 @@
"vscode": "*"
},
"scripts": {
"update-grammar": "node ../node_modules/.bin/vscode-grammar-updater textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.tmLanguage.json"
"update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/yaml.tmbundle Syntaxes/YAML.tmLanguage ./syntaxes/yaml.tmLanguage.json"
},
"contributes": {
"languages": [
{
"id": "dockercompose",
"aliases": [
"Compose",
"compose"
],
"filenamePatterns": [
"compose.yml",
"compose.yaml",
"compose.*.yml",
"compose.*.yaml",
"*docker*compose*.yml",
"*docker*compose*.yaml"
],
"configuration": "./language-configuration.json"
},
{
"id": "yaml",
"aliases": [
@@ -30,6 +46,11 @@
}
],
"grammars": [
{
"language": "dockercompose",
"scopeName": "source.yaml",
"path": "./syntaxes/yaml.tmLanguage.json"
},
{
"language": "yaml",
"scopeName": "source.yaml",