Skip to content

Commit 3eea0ff

Browse files
Merge pull request #682 from ivanz/fix-highlighting-reserved-keywords
Fix highlighting issues caused by escaped reserved keywords (e.g. @Class)
2 parents 5996626 + f91fc2e commit 3eea0ff

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

syntaxes/csharp.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"end": "\\s*(?:$|;)"
2929
},
3030
"namespace": {
31-
"begin": "^\\s*((namespace)\\s+([\\w.]+))",
31+
"begin": "^\\s*[^@]((namespace)\\s+([\\w.]+))",
3232
"beginCaptures": {
3333
"1": {
3434
"name": "meta.namespace.identifier.cs"
@@ -104,7 +104,7 @@
104104
]
105105
},
106106
"class": {
107-
"begin": "(?=\\w?[\\w\\s]*(?:class|struct|interface|enum)\\s+\\w+)",
107+
"begin": "(?=\\w?[\\w\\s]*[^@](?:class|struct|interface|enum)\\s+\\w+)",
108108
"end": "}",
109109
"endCaptures": {
110110
"0": {
@@ -324,7 +324,7 @@
324324
"name": "storage.type.var.cs"
325325
},
326326
{
327-
"match": "[@]\\b(var|event|delegate|add|remove|set|get|value|new|is|as|using|checked|unchecked|typeof|sizeof|nameof|when|override|readonly|stackalloc|from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending |if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await)\\b",
327+
"match": "[@]\\b(namespace|class|var|event|delegate|add|remove|set|get|value|new|is|as|using|checked|unchecked|typeof|sizeof|nameof|when|override|readonly|stackalloc|from|where|select|group|into|orderby|join|let|on|equals|by|ascending|descending|if|else|while|for|foreach|in|do|return|continue|break|switch|case|default|goto|throw|try|catch|finally|lock|yield|await|internal|public|protected|private|static|const|sealed|abstract|virtual|extern|unsafe|volatile|implicit|explicit|operator|async|partial|bool|byte|sbyte|char|decimal|double|float|int|uint|long|ulong|object|short|ushort|string|void|struct|enum|interface)\\b",
328328
"name": "meta.class.body.cs"
329329
}
330330
]

0 commit comments

Comments
 (0)