Skip to content

Commit 8c77f7f

Browse files
committed
Fix highlighting of nested namespaces and using statements.
Fixes dotnet#282, dotnet#849, dotnet#381 Also the below which are tracked here: dotnet#101 microsoft/vscode#849 microsoft/vscode#848
1 parent fe328c0 commit 8c77f7f

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

syntaxes/csharp.json

+20-9
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,26 @@
88
"foldingStopMarker": "^\\s*#\\s*endregion|^\\s*\\*/|^\\s*\\}",
99
"patterns": [
1010
{
11+
"include": "#using"
12+
},
13+
{
14+
"include": "#namespace"
15+
},
16+
{
17+
"include": "#code"
18+
}
19+
],
20+
"repository": {
21+
"using": {
22+
"begin": "^\\s*(using)\\b\\s*",
1123
"captures": {
1224
"1": {
1325
"name": "keyword.other.using.cs"
1426
}
1527
},
16-
"begin": "^\\s*(using)\\b\\s*",
17-
"end": "\\s*(?:$|(;))",
18-
"name": "meta.keyword.using.cs"
28+
"end": "\\s*(?:$|;)"
1929
},
20-
{
30+
"namespace": {
2131
"begin": "^\\s*((namespace)\\s+([\\w.]+))",
2232
"beginCaptures": {
2333
"1": {
@@ -48,18 +58,19 @@
4858
"end": "(?=})",
4959
"name": "meta.namespace.body.cs",
5060
"patterns": [
61+
{
62+
"include": "#using"
63+
},
64+
{
65+
"include": "#namespace"
66+
},
5167
{
5268
"include": "#code"
5369
}
5470
]
5571
}
5672
]
5773
},
58-
{
59-
"include": "#code"
60-
}
61-
],
62-
"repository": {
6374
"block": {
6475
"patterns": [
6576
{

0 commit comments

Comments
 (0)