Improve parameter type matching regex

seraku24 · web-flow · commit f057e7a8a4d6 · 2016-08-18T02:41:23.000-07:00
Fixes (again) dotnet#657 as well as issues brought up in dotnet#670. - Corrects the order of type, template arguments, nullable type specification and array specifications. - Ensures array specification support all forms (simple arrays, multi-dimensional arrays, arrays of arrays).
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+(\\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+(\\w+)\\s*(=)?",`
`506`	`506`	`"beginCaptures": {`
`507`	`507`	`"1": {`
`508`	`508`	`"name": "storage.type.modifier.cs"`