Merge pull request #680 from seraku24/fix-parameter-syntax-highlighting

DustinCampbell · web-flow · commit dc8cd65e87ef · 2016-08-18T09:42:50.000-07:00
Improve parameter type matching regex
diff --git a/syntaxes/csharp.json b/syntaxes/csharp.json
@@ -502,7 +502,7 @@
       ]
     },
     "parameters": {
-      "begin": "\\b(ref|params|out)?\\s*\\b([\\w?]+(?:\\s*\\[\\s*,?\\s*\\])?(?:\\s*<.*?>)?)\\s+(\\w+)\\s*(=)?",
+      "begin": "\\b(ref|params|out)?\\s*\\b(\\w+(?:\\s*<.*?>)?(?:\\s*\\*)*(?:\\s*\\?)?(?:\\s*\\[.*?\\])?)\\s+(@?\\w+)\\s*(=)?",
       "beginCaptures": {
         "1": {
           "name": "storage.type.modifier.cs"

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@`
`502`	`502`	`]`
`503`	`503`	`},`
`504`	`504`	`"parameters": {`
`505`		`- "begin": "\\b(ref\|params\|out)?\\s\\b([\\w?]+(?:\\s\\[\\s,?\\s\\])?(?:\\s<.?>)?)\\s+(\\w+)\\s*(=)?",`
	`505`	`+ "begin": "\\b(ref\|params\|out)?\\s\\b(\\w+(?:\\s<.?>)?(?:\\s\\)(?:\\s\\?)?(?:\\s\\[.?\\])?)\\s+(@?\\w+)\\s(=)?",`
`506`	`506`	`"beginCaptures": {`
`507`	`507`	`"1": {`
`508`	`508`	`"name": "storage.type.modifier.cs"`