Skip to content

Commit 41c7fc3

Browse files
authored
Update grammars (microsoft#189172)
1 parent a1c783c commit 41c7fc3

File tree

10 files changed

+41
-16
lines changed

10 files changed

+41
-16
lines changed

extensions/csharp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dotnet/csharp-tmLanguage",
88
"repositoryUrl": "https://github.com/dotnet/csharp-tmLanguage",
9-
"commitHash": "878aefe73f942ac68dc4a46a0f154661bcb9eff4"
9+
"commitHash": "772323937fedd65c6dc1c8ce6ea41d97415ed7d1"
1010
}
1111
},
1212
"license": "MIT",

extensions/csharp/syntaxes/csharp.tmLanguage.json

Lines changed: 16 additions & 2 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/dotnet/csharp-tmLanguage/commit/878aefe73f942ac68dc4a46a0f154661bcb9eff4",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/772323937fedd65c6dc1c8ce6ea41d97415ed7d1",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -286,6 +286,9 @@
286286
{
287287
"include": "#nameof-expression"
288288
},
289+
{
290+
"include": "#default-literal-expression"
291+
},
289292
{
290293
"include": "#throw-expression"
291294
},
@@ -298,6 +301,9 @@
298301
{
299302
"include": "#verbatim-interpolated-string"
300303
},
304+
{
305+
"include": "#type-builtin"
306+
},
301307
{
302308
"include": "#this-or-base-expression"
303309
},
@@ -2733,6 +2739,14 @@
27332739
}
27342740
]
27352741
},
2742+
"default-literal-expression": {
2743+
"match": "(?<!\\.)\\b(default)\\b",
2744+
"captures": {
2745+
"1": {
2746+
"name": "keyword.other.default.cs"
2747+
}
2748+
}
2749+
},
27362750
"throw-expression": {
27372751
"match": "(?<!\\.)\\b(throw)\\b",
27382752
"captures": {
@@ -3673,7 +3687,7 @@
36733687
]
36743688
},
36753689
"object-creation-expression-with-parameters": {
3676-
"begin": "(?x)\n(new)\\s+\n(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n)\\s*\n(?=\\()",
3690+
"begin": "(?x)\n(new)(?:\\s+\n(?<type_name>\n (?:\n (?:\n (?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*\\:\\:\\s*)? # alias-qualification\n (?<name_and_type_args> # identifier + type arguments (if any)\n \\g<identifier>\\s*\n (?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?\n )\n (?:\\s*\\.\\s*\\g<name_and_type_args>)* | # Are there any more names being dotted into?\n (?<tuple>\\s*\\((?:[^\\(\\)]|\\g<tuple>)+\\))\n )\n (?:\\s*\\?\\s*)? # nullable suffix?\n (?:\\s* # array suffix?\n \\[\n (?:\\s*,\\s*)* # commata for multi-dimensional arrays\n \\]\n \\s*\n (?:\\?)? # arrays can be nullable reference types\n \\s*\n )*\n )\n))?\\s*\n(?=\\()",
36773691
"beginCaptures": {
36783692
"1": {
36793693
"name": "keyword.other.new.cs"

extensions/fsharp/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "ionide/ionide-fsgrammar",
88
"repositoryUrl": "https://github.com/ionide/ionide-fsgrammar",
9-
"commitHash": "71b1ead8c99715f6c994115ebab7ee4a14cf0c59"
9+
"commitHash": "8740e610a367c5e3f15be716acc7207655ced4cf"
1010
}
1111
},
1212
"license": "MIT",

extensions/fsharp/syntaxes/fsharp.tmLanguage.json

Lines changed: 3 additions & 3 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/ionide/ionide-fsgrammar/commit/71b1ead8c99715f6c994115ebab7ee4a14cf0c59",
7+
"version": "https://github.com/ionide/ionide-fsgrammar/commit/8740e610a367c5e3f15be716acc7207655ced4cf",
88
"name": "fsharp",
99
"scopeName": "source.fsharp",
1010
"patterns": [
@@ -314,7 +314,7 @@
314314
},
315315
{
316316
"match": "(?!when|and|or\\b)\\b([\\w0-9'`^._]+)",
317-
"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
317+
"comments": "Here we need the \\w modifier in order to check that the words are allowed",
318318
"captures": {
319319
"1": {
320320
"name": "entity.name.type.fsharp"
@@ -1832,4 +1832,4 @@
18321832
]
18331833
}
18341834
}
1835-
}
1835+
}

extensions/java/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "redhat-developer/vscode-java",
88
"repositoryUrl": "https://github.com/redhat-developer/vscode-java",
9-
"commitHash": "7a770ab6750b4b09173d98de14eb9792e3432b36"
9+
"commitHash": "5fb57e8e1c5d776b21be13cd7227b25b87edf4a6"
1010
}
1111
},
1212
"license": "MIT",
@@ -48,4 +48,4 @@
4848
}
4949
],
5050
"version": 1
51-
}
51+
}

extensions/java/syntaxes/java.tmLanguage.json

Lines changed: 12 additions & 1 deletion
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/redhat-developer/vscode-java/commit/7a770ab6750b4b09173d98de14eb9792e3432b36",
7+
"version": "https://github.com/redhat-developer/vscode-java/commit/5fb57e8e1c5d776b21be13cd7227b25b87edf4a6",
88
"name": "Java",
99
"scopeName": "source.java",
1010
"patterns": [
@@ -1378,6 +1378,17 @@
13781378
},
13791379
"properties": {
13801380
"patterns": [
1381+
{
1382+
"match": "(\\.)\\s*(new)",
1383+
"captures": {
1384+
"1": {
1385+
"name": "punctuation.separator.period.java"
1386+
},
1387+
"2": {
1388+
"name": "keyword.control.new.java"
1389+
}
1390+
}
1391+
},
13811392
{
13821393
"match": "(\\.)\\s*([a-zA-Z_$][\\w$]*)(?=\\s*\\.\\s*[a-zA-Z_$][\\w$]*)",
13831394
"captures": {

extensions/latex/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "jlelong/vscode-latex-basics",
88
"repositoryUrl": "https://github.com/jlelong/vscode-latex-basics",
9-
"commitHash": "30adbfae9dcb0a6477584247ac477f13845d1f5f"
9+
"commitHash": "30d04562e592305b6f6d41a539b3ccf326888aaf"
1010
}
1111
},
1212
"license": "MIT",

extensions/latex/syntaxes/LaTeX.tmLanguage.json

Lines changed: 2 additions & 2 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/jlelong/vscode-latex-basics/commit/30adbfae9dcb0a6477584247ac477f13845d1f5f",
7+
"version": "https://github.com/jlelong/vscode-latex-basics/commit/30d04562e592305b6f6d41a539b3ccf326888aaf",
88
"name": "LaTeX",
99
"scopeName": "text.tex.latex",
1010
"patterns": [
@@ -1337,7 +1337,7 @@
13371337
]
13381338
},
13391339
{
1340-
"begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?)\\}(\\s*\\n)?)",
1340+
"begin": "(\\s*\\\\begin\\{(tabular[xy*]?|xltabular|longtable|(?:long)?tabu|(?:long|tall)?tblr|NiceTabular[X*]?|booktabs)\\}(\\s*\\n)?)",
13411341
"captures": {
13421342
"1": {
13431343
"patterns": [

extensions/sql/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "microsoft/vscode-mssql",
88
"repositoryUrl": "https://github.com/microsoft/vscode-mssql",
9-
"commitHash": "cb5940297a8cef76daaf4a6b63c4968c9a12d17a"
9+
"commitHash": "9cb3529a978ddf599bf5bdd228f21bbcfe2914f5"
1010
}
1111
},
1212
"license": "MIT",

extensions/sql/syntaxes/sql.tmLanguage.json

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)