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
ivanz · Aug 18, 2016 · 8c77f7f · 8c77f7f
1 parent fe328c0
commit 8c77f7f
Showing 1 changed file with 20 additions and 9 deletions.
diff --git a/syntaxes/csharp.json b/syntaxes/csharp.json
@@ -8,16 +8,26 @@
   "foldingStopMarker": "^\\s*#\\s*endregion|^\\s*\\*/|^\\s*\\}",
   "patterns": [
     {
+      "include": "#using"
+    },
+    {
+      "include": "#namespace"
+    },
+    {
+      "include": "#code"
+    }
+  ],
+  "repository": {
+    "using": {
+      "begin": "^\\s*(using)\\b\\s*",
       "captures": {
         "1": {
           "name": "keyword.other.using.cs"
         }
       },
-      "begin": "^\\s*(using)\\b\\s*",
-      "end": "\\s*(?:$|(;))",
-      "name": "meta.keyword.using.cs"
+      "end": "\\s*(?:$|;)"
     },
-    {
+    "namespace": {
       "begin": "^\\s*((namespace)\\s+([\\w.]+))",
       "beginCaptures": {
         "1": {
@@ -48,18 +58,19 @@
           "end": "(?=})",
           "name": "meta.namespace.body.cs",
           "patterns": [
+            {
+              "include": "#using"
+            },
+            {
+              "include": "#namespace"
+            },
             {
               "include": "#code"
             }
           ]
         }
       ]
     },
-    {
-      "include": "#code"
-    }
-  ],
-  "repository": {
     "block": {
       "patterns": [
         {