Merge pull request #191 from DustinCampbell/ivanz-fix-89

Improved generic method and parameters syntax highlighting
dotnet · Apr 15, 2016 · 0f89ee4 · 0f89ee4
2 parents a29e1aa + 8adbbe7
commit 0f89ee4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/syntaxes/csharp.json b/syntaxes/csharp.json
@@ -363,7 +363,7 @@
               "include": "#builtinTypes"
             },
             {
-              "begin": "([\\w.]+)\\s*\\(",
+              "begin": "([\\w]+\\s*(?:<[\\w<>\\s,`?]*>)?)\\s*\\(",
               "beginCaptures": {
                 "1": {
                   "name": "entity.name.function.cs"
@@ -502,7 +502,7 @@
       ]
     },
     "parameters": {
-      "begin": "\\b(ref|params|out)?\\s*\\b([\\w.\\[\\]]+)\\s+(\\w+)\\s*(=)?",
+      "begin": "\\b(ref|params|out)?\\s*\\b([\\w?\\[\\]]+(?:\\s*<.*?>)?)\\s+(\\w+)\\s*(=)?",
       "beginCaptures": {
         "1": {
           "name": "storage.type.modifier.cs"