C#: Fixed keywords in type lists blocking type names (#2277)

components/prism-csharp.js

@@ -246,6 +246,7 @@
 				'keyword': keywords,
 				'class-name': {
 					pattern: RegExp(typeExpression),
+					greedy: true,
 					inside: typeInside
 				},
 				'punctuation': /,/

tests/languages/csharp/generic-constraint_feature.test

@@ -44,6 +44,7 @@ readonly struct Foo<T> where T : unmanaged {}
 	]],
 	["punctuation", "{"],
 	["punctuation", "}"],
+
 	["keyword", "delegate"],
 	["return-type", [
 		["keyword", "void"]
@@ -76,6 +77,7 @@ readonly struct Foo<T> where T : unmanaged {}
 		]]
 	]],
 	["punctuation", ";"],
+
 	["keyword", "class"],
 	["class-name", [
 		"Foo",
@@ -88,14 +90,15 @@ readonly struct Foo<T> where T : unmanaged {}
 	["punctuation", ":"],
 	["type-list", [
 		["class-name", [
-			"IFoo"
-		]],
-		"<",
-		["keyword", "int"],
-		">"
+			"IFoo",
+			["punctuation", "<"],
+			["keyword", "int"],
+			["punctuation", ">"]
+		]]
 	]],
 	["punctuation", "{"],
 	["punctuation", "}"],
+
 	["keyword", "readonly"],
 	["keyword", "struct"],
 	["class-name", [

tests/languages/csharp/preprocessor_feature.test

@@ -18,18 +18,18 @@
 	["preprocessor", ["#", ["directive", "define"], " DEBUG"]],
 	["preprocessor", ["#", ["directive", "if"], " DEBUG"]],
 	["preprocessor", ["#", ["directive", "endif"]]],
-	
+
 	["preprocessor", ["#", ["directive", "elif"]]],
-    ["preprocessor", ["#", ["directive", "else"]]],
-    ["preprocessor", ["#", ["directive", "endregion"]]],
-    ["preprocessor", ["#", ["directive", "error"]]],
-    ["preprocessor", ["#", ["directive", "line"]]],
-    ["preprocessor", ["#", ["directive", "pragma"]]],
-    ["preprocessor", ["#", ["directive", "region"]]],
-    ["preprocessor", ["#", ["directive", "undef"]]],
-    ["preprocessor", ["#", ["directive", "warning"]]]
+	["preprocessor", ["#", ["directive", "else"]]],
+	["preprocessor", ["#", ["directive", "endregion"]]],
+	["preprocessor", ["#", ["directive", "error"]]],
+	["preprocessor", ["#", ["directive", "line"]]],
+	["preprocessor", ["#", ["directive", "pragma"]]],
+	["preprocessor", ["#", ["directive", "region"]]],
+	["preprocessor", ["#", ["directive", "undef"]]],
+	["preprocessor", ["#", ["directive", "warning"]]]
 ]
 
 ----------------------------------------------------
 
-Checks for preprocessor directives.
+Checks for preprocessor directives.

tests/languages/csharp/type-list_feature.test

@@ -1,6 +1,8 @@
 class Foo<T> : Bar<IList<Bar>, T>, IBar<Bar, T>, IFoo
 	where T : class, IBar<IFoo>, IFoo<Bar> {}
 
+public class Foo : IBar<int> {}
+
 public delegate ErrorCode GetInfoMethod<H, A, I>(H handle, A value, I paramName,
 	Size_t paramValueSize, IntPtr paramValue, out Size_t paramValueSizeRet)
 	where H : unmanaged, IInfoHandle<A, I> where A : unmanaged where I : unmanaged, Enum;
@@ -65,6 +67,23 @@ public delegate ErrorCode GetInfoMethod<H, A, I>(H handle, A value, I paramName,
 	["punctuation", "{"],
 	["punctuation", "}"],
 
+	["keyword", "public"],
+	["keyword", "class"],
+	["class-name", [
+		"Foo"
+	]],
+	["punctuation", ":"],
+	["type-list", [
+		["class-name", [
+			"IBar",
+			["punctuation", "<"],
+			["keyword", "int"],
+			["punctuation", ">"]
+		]]
+	]],
+	["punctuation", "{"],
+	["punctuation", "}"],
+
 	["keyword", "public"],
 	["keyword", "delegate"],
 	["return-type", [