Re-used the "#type" template for types in field declarations and added test for generic fields.

Author: ivanz

syntaxes/csharp.json

@@ -78,7 +78,7 @@
           "end": "(?=;)",
           "patterns": [
             {
-              "match": "^\\s*((?:(?:private|public|volatile|internal|protected|static|readonly|const)\\s*)*)\\s*([\\w\\s,<>\\[\\]]+?)\\s*([\\w]+)\\s*(?=;|=)",
+              "match": "^\\s*((?:(?:private|public|volatile|internal|protected|static|readonly|const)\\s*)*)\\s*(.+?)\\s*([\\w]+)\\s*(?=;|=)",
               "captures": {
                 "1" : {
                   "patterns": [
@@ -88,7 +88,11 @@
                   ]
                 },
                 "2" : {
-                  "name": "storage.type.cs"
+                  "patterns": [
+                    {
+                      "include": "#type"
+                    }
+                  ]
                 },
                 "3": {
                   "name": "entity.name.variable.cs"

test/syntaxes/field.tests.ts

@@ -28,6 +28,21 @@ public class Tester
             tokens.should.contain(Tokens.FieldIdentifier("field123", 6, 18));
         });
 
+        it("generic", function () {
+
+            const input = `
+public class Tester
+{
+    private Dictionary< List<T>, Dictionary<T, D>> _field;
+}`;
+
+            let tokens: Token[] = TokenizerUtil.tokenize(input);
+
+            tokens.should.contain(Tokens.StorageModifierKeyword("private", 4, 5));
+            tokens.should.contain(Tokens.Type("Dictionary< List<T>, Dictionary<T, D>>", 4, 13));
+            tokens.should.contain(Tokens.FieldIdentifier("_field", 4, 52));
+        });
+
 
         it("modifiers", function() {