Skip to content

Commit c778cc6

Browse files
authored
Update grammars (microsoft#186752)
1 parent 69cd143 commit c778cc6

19 files changed

+474
-165
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": "2918bd69cfcc658bd5b4ec1b106bb008e5c21120"
9+
"commitHash": "878aefe73f942ac68dc4a46a0f154661bcb9eff4"
1010
}
1111
},
1212
"license": "MIT",

extensions/csharp/syntaxes/csharp.tmLanguage.json

Lines changed: 25 additions & 10 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/2918bd69cfcc658bd5b4ec1b106bb008e5c21120",
7+
"version": "https://github.com/dotnet/csharp-tmLanguage/commit/878aefe73f942ac68dc4a46a0f154661bcb9eff4",
88
"name": "C#",
99
"scopeName": "source.cs",
1010
"patterns": [
@@ -381,13 +381,19 @@
381381
"using-directive": {
382382
"patterns": [
383383
{
384-
"begin": "\\b(using)\\b\\s+(static)\\s+",
384+
"begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(static)\\b\\s+(\\b(unsafe)\\b\\s+)?",
385385
"beginCaptures": {
386-
"1": {
386+
"2": {
387+
"name": "keyword.other.global.cs"
388+
},
389+
"3": {
387390
"name": "keyword.other.using.cs"
388391
},
389-
"2": {
392+
"4": {
390393
"name": "keyword.other.static.cs"
394+
},
395+
"6": {
396+
"name": "storage.modifier.cs"
391397
}
392398
},
393399
"end": "(?=;)",
@@ -398,12 +404,18 @@
398404
]
399405
},
400406
{
401-
"begin": "\\b(using)\\s+(?=(@?[_[:alpha:]][_[:alnum:]]*)\\s*=)",
407+
"begin": "(\\b(global)\\b\\s+)?\\b(using)\\b\\s+(\\b(unsafe)\\b\\s+)?(?=(@?[_[:alpha:]][_[:alnum:]]*)\\s*=)",
402408
"beginCaptures": {
403-
"1": {
409+
"2": {
410+
"name": "keyword.other.global.cs"
411+
},
412+
"3": {
404413
"name": "keyword.other.using.cs"
405414
},
406-
"2": {
415+
"5": {
416+
"name": "storage.modifier.cs"
417+
},
418+
"6": {
407419
"name": "entity.name.type.alias.cs"
408420
}
409421
},
@@ -421,9 +433,12 @@
421433
]
422434
},
423435
{
424-
"begin": "\\b(using)\\s*(?!\\(|\\s|var)",
436+
"begin": "(\\b(global)\\b\\s+)?\\b(using)\\s*(?!\\(|\\s|var)",
425437
"beginCaptures": {
426-
"1": {
438+
"2": {
439+
"name": "keyword.other.global.cs"
440+
},
441+
"3": {
427442
"name": "keyword.other.using.cs"
428443
}
429444
},
@@ -574,7 +589,7 @@
574589
},
575590
"storage-modifier": {
576591
"name": "storage.modifier.cs",
577-
"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required)\\b"
592+
"match": "(?<!\\.)\\b(new|public|protected|internal|private|abstract|virtual|override|sealed|static|partial|readonly|volatile|const|extern|async|unsafe|ref|required|file)\\b"
578593
},
579594
"class-declaration": {
580595
"begin": "(?=(\\brecord\\b\\s+)?\\bclass\\b)",

extensions/dart/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"git": {
77
"name": "dart-lang/dart-syntax-highlight",
88
"repositoryUrl": "https://github.com/dart-lang/dart-syntax-highlight",
9-
"commitHash": "4a321c4e0756a840b71d03290da8c736d73dbaa1"
9+
"commitHash": "4670ad8a1f742ccfb122c2b01e588af78f3fc120"
1010
}
1111
},
1212
"licenseDetail": [

extensions/dart/syntaxes/dart.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/dart-lang/dart-syntax-highlight/commit/4a321c4e0756a840b71d03290da8c736d73dbaa1",
7+
"version": "https://github.com/dart-lang/dart-syntax-highlight/commit/4670ad8a1f742ccfb122c2b01e588af78f3fc120",
88
"name": "Dart",
99
"scopeName": "source.dart",
1010
"patterns": [
@@ -332,7 +332,7 @@
332332
},
333333
{
334334
"name": "keyword.declaration.dart",
335-
"match": "(?<!\\$)\\b(abstract|sealed|base|interface|class|enum|extends|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)"
335+
"match": "(?<!\\$)\\b(abstract|sealed|base|interface|inline class|class|enum|extends|extension|external|factory|implements|get(?!\\()|mixin|native|operator|set(?!\\()|typedef|with|covariant)\\b(?!\\$)"
336336
},
337337
{
338338
"name": "storage.modifier.dart",

extensions/fsharp/syntaxes/fsharp.tmLanguage.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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 are allowed",
317+
"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
318318
"captures": {
319319
"1": {
320320
"name": "entity.name.type.fsharp"
@@ -677,7 +677,7 @@
677677
},
678678
{
679679
"match": "(?!with|get|set\\b)\\b([\\w0-9'`^._]+)",
680-
"comments": "Here we need the \\w modifier in order to check that the words are allowed",
680+
"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
681681
"captures": {
682682
"1": {
683683
"name": "entity.name.type.fsharp"
@@ -1658,7 +1658,7 @@
16581658
},
16591659
{
16601660
"match": "([\\w0-9'`^._]+)",
1661-
"comments": "Here we need the \\w modifier in order to check that the words are allowed",
1661+
"comments": "Here we need the \\w modifier in order to check that the words isn't blacklisted",
16621662
"captures": {
16631663
"1": {
16641664
"name": "entity.name.type.fsharp"

0 commit comments

Comments
 (0)