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

@@ -5,17 +5,8 @@
"Once accepted there, we are happy to receive an update request."
],
"version": "https://github.com/Ikuyadeu/vscode-R/commit/b3ef459a3999160d97ea28f4754fda810417f99f",
"fileTypes": [
"R",
"r",
"S",
"s",
"Rprofile"
],
"foldingStartMarker": "(\\(\\s*$|\\{\\s*$)",
"foldingStopMarker": "(^\\s*\\)|^\\s*\\})",
"keyEquivalent": "^~R",
"name": "R",
"scopeName": "source.r",
"patterns": [
{
"include": "#roxygen"
@@ -549,7 +540,5 @@
}
]
}
},
"scopeName": "source.r",
"uuid": "B2E6B78D-6E70-11D9-A369-000D93B3A10A"
}
}