Skip to content

Commit bbe6e10

Browse files
author
Miguel Solorio
authored
Merge branch 'master' into misolori/scm-ruler-decorations
2 parents fc571e3 + 9c43386 commit bbe6e10

479 files changed

Lines changed: 15117 additions & 16982 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build/builtInExtensions.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
{
1818
"name": "ms-vscode.node-debug2",
19-
"version": "1.41.2",
19+
"version": "1.41.3",
2020
"repo": "https://github.com/Microsoft/vscode-node-debug2",
2121
"metadata": {
2222
"id": "36d19e17-7569-4841-a001-947eb18602b2",
@@ -31,7 +31,7 @@
3131
},
3232
{
3333
"name": "ms-vscode.references-view",
34-
"version": "0.0.40",
34+
"version": "0.0.43",
3535
"repo": "https://github.com/Microsoft/vscode-reference-view",
3636
"metadata": {
3737
"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",

build/monaco/monaco.d.ts.recipe

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ export interface ICommandHandler {
6262
#includeAll(vs/editor/common/editorCommon;editorOptions.=>): IScrollEvent
6363
#includeAll(vs/editor/common/model/textModelEvents):
6464
#includeAll(vs/editor/common/controller/cursorEvents):
65-
#include(vs/platform/accessibility/common/accessibility): AccessibilitySupport
6665
#includeAll(vs/editor/common/config/editorOptions):
6766
#includeAll(vs/editor/browser/editorBrowser;editorCommon.=>;editorOptions.=>):
6867
#include(vs/editor/common/config/fontInfo): FontInfo, BareFontInfo

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"request": "^2.85.0",
4141
"terser": "4.3.8",
4242
"tslint": "^5.9.1",
43-
"typescript": "3.7.2",
43+
"typescript": "3.7.3",
4444
"vsce": "1.48.0",
4545
"vscode-telemetry-extractor": "^1.5.4",
4646
"xml2js": "^0.4.17"

build/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2441,10 +2441,10 @@ typed-rest-client@^0.9.0:
24412441
tunnel "0.0.4"
24422442
underscore "1.8.3"
24432443

2444-
typescript@3.7.2:
2445-
version "3.7.2"
2446-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz#27e489b95fa5909445e9fef5ee48d81697ad18fb"
2447-
integrity sha512-ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ==
2444+
typescript@3.7.3:
2445+
version "3.7.3"
2446+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69"
2447+
integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw==
24482448

24492449
typescript@^3.0.1:
24502450
version "3.5.3"

extensions/configuration-editing/schemas/attachContainer.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "http://json-schema.org/schema#",
2+
"$schema": "http://json-schema.org/draft-07/schema#",
33
"description": "Configures an attached to container",
44
"allowComments": true,
55
"type": "object",

extensions/configuration-editing/schemas/devContainer.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "http://json-schema.org/schema#",
2+
"$schema": "http://json-schema.org/draft-07/schema#",
33
"description": "Defines a dev container",
44
"allowComments": true,
55
"type": "object",

extensions/cpp/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
"git": {
77
"name": "jeff-hykin/cpp-textmate-grammar",
88
"repositoryUrl": "https://github.com/jeff-hykin/cpp-textmate-grammar",
9-
"commitHash": "fedd206d1b2803f31a278e9b5f098ce4bc76e532"
9+
"commitHash": "666808cab3907fc91ed4d3901060ee6b045cca58"
1010
}
1111
},
1212
"license": "MIT",
13-
"version": "1.14.13",
13+
"version": "1.14.15",
1414
"description": "The files syntaxes/c.json and syntaxes/c++.json were derived from https://github.com/atom/language-c which was originally converted from the C TextMate bundle https://github.com/textmate/c.tmbundle."
1515
},
1616
{

extensions/cpp/syntaxes/c.tmLanguage.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"If you want to provide a fix or improvement, please create a pull request against the original repository.",
55
"Once accepted there, we are happy to receive an update request."
66
],
7-
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/fedd206d1b2803f31a278e9b5f098ce4bc76e532",
7+
"version": "https://github.com/jeff-hykin/cpp-textmate-grammar/commit/72b309aabb63bf14a3cdf0280149121db005d616",
88
"name": "C",
99
"scopeName": "source.c",
1010
"patterns": [
@@ -583,7 +583,7 @@
583583
},
584584
"case_statement": {
585585
"name": "meta.conditional.case.c",
586-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)case(?!\\w))",
586+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)case(?!\\w))",
587587
"beginCaptures": {
588588
"1": {
589589
"patterns": [
@@ -946,7 +946,7 @@
946946
},
947947
"default_statement": {
948948
"name": "meta.conditional.case.c",
949-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)default(?!\\w))",
949+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)default(?!\\w))",
950950
"beginCaptures": {
951951
"1": {
952952
"patterns": [
@@ -2772,7 +2772,7 @@
27722772
}
27732773
},
27742774
"static_assert": {
2775-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)static_assert|_Static_assert(?!\\w))((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
2775+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)static_assert|_Static_assert(?!\\w))((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
27762776
"beginCaptures": {
27772777
"1": {
27782778
"patterns": [
@@ -3051,7 +3051,7 @@
30513051
},
30523052
"switch_conditional_parentheses": {
30533053
"name": "meta.conditional.switch.c",
3054-
"begin": "((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))(\\()",
3054+
"begin": "((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))(\\()",
30553055
"beginCaptures": {
30563056
"1": {
30573057
"patterns": [
@@ -3099,7 +3099,7 @@
30993099
},
31003100
"switch_statement": {
31013101
"name": "meta.block.switch.c",
3102-
"begin": "(((?:(?:(?>\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+?|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z)))((?<!\\w)switch(?!\\w)))",
3102+
"begin": "(((?>(?:(?:(?>(?<!\\s)\\s+)|(\\/\\*)((?>(?:[^\\*]|(?>\\*+)[^\\/])*)((?>\\*+)\\/)))+|(?:(?:(?:(?:\\b|(?<=\\W))|(?=\\W))|\\A)|\\Z))))((?<!\\w)switch(?!\\w)))",
31033103
"beginCaptures": {
31043104
"1": {
31053105
"name": "meta.head.switch.c"

0 commit comments

Comments
 (0)