Highlight body of C# 6 expression bodied members properly.

Fixes dotnet#638 and dotnet#403
ivanz · Aug 18, 2016 · 5613797 · 5613797
1 parent fe328c0
commit 5613797
Showing 1 changed file with 31 additions and 1 deletion.
diff --git a/syntaxes/csharp.json b/syntaxes/csharp.json
@@ -405,6 +405,21 @@
                 }
               ]
             },
+            {
+              "begin": "=>(?!\\s*{)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.method.begin.cs"
+                }
+              },
+              "end": "(?=;)",
+              "name": "meta.method.body.cs",
+              "patterns": [
+                {
+                  "include": "#code"
+                }
+              ]
+            },
             {
               "begin": "{",
               "beginCaptures": {
@@ -423,7 +438,7 @@
           ]
         },
         {
-          "begin": "(?!new)(?=[\\w<].*\\s+)(?=[^=]+\\{)",
+          "begin": "(?!new)(?=[\\w<].*\\s+)(?=[^=\\(]+\\{)",
           "end": "}",
           "endCaptures": {
             "0": {
@@ -469,6 +484,21 @@
                   "include": "#code"
                 }
               ]
+            },
+            {
+              "begin": "=>(?!\\s*{)",
+              "beginCaptures": {
+                "0": {
+                  "name": "punctuation.section.property.begin.cs"
+                }
+              },
+              "end": "(?=;)",
+              "name": "meta.method.body.cs",
+              "patterns": [
+                {
+                  "include": "#code"
+                }
+              ]
             }
           ]
         }