Skip to content

Commit 35d97bc

Browse files
authored
Update grammars (microsoft#203521)
1 parent 0e7e31b commit 35d97bc

21 files changed

+882
-237
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": "7bf5709ac1a713e340a618d1b41f44a043e393c6"
9+
"commitHash": "7a7482ffc72a6677a87eb1ed76005593a4f7f131"
1010
}
1111
},
1212
"license": "MIT",

extensions/csharp/syntaxes/csharp.tmLanguage.json

Lines changed: 27 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/dotnet/csharp-tmLanguage/commit/7bf5709ac1a713e340a618d1b41f44a043e393c6",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/7a7482ffc72a6677a87eb1ed76005593a4f7f131",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -164,6 +164,9 @@
164164
{
165165
"include": "#comment"
166166
},
167+
{
168+
"include": "#storage-modifier"
169+
},
167170
{
168171
"include": "#property-declaration"
169172
},
@@ -176,6 +179,9 @@
176179
{
177180
"include": "#method-declaration"
178181
},
182+
{
183+
"include": "#operator-declaration"
184+
},
179185
{
180186
"include": "#attribute-section"
181187
},
@@ -1050,6 +1056,18 @@
10501056
"name": "storage.type.struct.cs",
10511057
"match": "\\bstruct\\b"
10521058
},
1059+
{
1060+
"name": "keyword.other.constraint.default.cs",
1061+
"match": "\\bdefault\\b"
1062+
},
1063+
{
1064+
"name": "keyword.other.constraint.notnull.cs",
1065+
"match": "\\bnotnull\\b"
1066+
},
1067+
{
1068+
"name": "keyword.other.constraint.unmanaged.cs",
1069+
"match": "\\bunmanaged\\b"
1070+
},
10531071
{
10541072
"match": "(new)\\s*(\\()\\s*(\\))",
10551073
"captures": {
@@ -2632,7 +2650,7 @@
26322650
},
26332651
"patterns": [
26342652
{
2635-
"begin": "\\G",
2653+
"begin": "(?=[^;\\)])",
26362654
"end": "(?=;|\\))",
26372655
"patterns": [
26382656
{
@@ -2695,22 +2713,25 @@
26952713
"include": "#intrusive"
26962714
},
26972715
{
2698-
"match": "(?x)\n(?:\n (\\bvar\\b)|\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 )\n)\\s+\n(\\g<identifier>)\\s+\n\\b(in)\\b",
2716+
"match": "(?x)\n(?:\n (?:(\\bref)\\s+)?(\\bvar\\b)| # ref local\n (?<type_name>\n (?:\n (?:ref\\s+)? # ref local\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 )\n)\\s+\n(\\g<identifier>)\\s+\n\\b(in)\\b",
26992717
"captures": {
27002718
"1": {
2701-
"name": "storage.type.var.cs"
2719+
"name": "storage.modifier.ref.cs"
27022720
},
27032721
"2": {
2722+
"name": "storage.type.var.cs"
2723+
},
2724+
"3": {
27042725
"patterns": [
27052726
{
27062727
"include": "#type"
27072728
}
27082729
]
27092730
},
2710-
"7": {
2731+
"8": {
27112732
"name": "entity.name.variable.local.cs"
27122733
},
2713-
"8": {
2734+
"9": {
27142735
"name": "keyword.control.loop.in.cs"
27152736
}
27162737
}

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": "472c6b2030c962217cbbb26e4ddcce1b8ffe0867"
9+
"commitHash": "7d029a46f17637228b2ee85dd02e511c3e8039b3"
1010
}
1111
},
1212
"license": "MIT",

extensions/fsharp/syntaxes/fsharp.tmLanguage.json

Lines changed: 6 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/ionide/ionide-fsgrammar/commit/472c6b2030c962217cbbb26e4ddcce1b8ffe0867",
7+
"version": "https://github.com/ionide/ionide-fsgrammar/commit/7d029a46f17637228b2ee85dd02e511c3e8039b3",
88
"name": "fsharp",
99
"scopeName": "source.fsharp",
1010
"patterns": [
@@ -574,6 +574,11 @@
574574
"name": "fast-capture.comment.line.double-slash.fsharp",
575575
"match": "//"
576576
},
577+
{
578+
"comments": "Capture (*) when inside of (* *) so that it doesn't prematurely end the comment block.",
579+
"name": "fast-capture.comment.line.mul-operator.fsharp",
580+
"match": "\\(\\*\\)"
581+
},
577582
{
578583
"include": "#comments"
579584
}

extensions/go/cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
"git": {
77
"name": "go-syntax",
88
"repositoryUrl": "https://github.com/worlpaker/go-syntax",
9-
"commitHash": "4014e9376f32e5317eb0c6be286db7ffcba838f9"
9+
"commitHash": "80a9e153c018b6c3b9c52766b39d7be9d915f68b"
1010
}
1111
},
1212
"license": "MIT",
1313
"description": "The file syntaxes/go.tmLanguage.json is from https://github.com/worlpaker/go-syntax, which in turn was derived from https://github.com/jeff-hykin/better-go-syntax.",
14-
"version": "0.5.1"
14+
"version": "0.5.5"
1515
}
1616
],
1717
"version": 1

0 commit comments

Comments
 (0)