C#: More generic class-name highlighting. Fix #1365

PrismJS · Mar 24, 2018 · a6837d2 · a6837d2
1 parent 4a14d20
commit a6837d2
Show file tree

Hide file tree

Showing 5 changed files with 125 additions and 49 deletions.
diff --git a/components/prism-csharp.js b/components/prism-csharp.js
@@ -13,7 +13,17 @@ Prism.languages.csharp = Prism.languages.extend('clike', {
 	'number': /\b0x[\da-f]+\b|(?:\b\d+\.?\d*|\B\.\d+)f?/i
 });
 
-Prism.languages.insertBefore('csharp', 'keyword', {
+if (Prism.util.type(Prism.languages.csharp['class-name']) !== 'Array') {
+	Prism.languages.csharp['class-name'] = [Prism.languages.csharp['class-name']];
+}
+Prism.languages.csharp['class-name'].push({
+	pattern: /\b[A-Z]\w*(?:\.\w+)*\b(?!\()/,
+	inside: {
+		punctuation: /\./
+	}
+});
+
+Prism.languages.insertBefore('csharp', 'class-name', {
 	'generic-method': {
 		pattern: /[a-z0-9_]+\s*<[^>\r\n]+?>\s*(?=\()/i,
 		alias: 'function',

diff --git a/components/prism-csharp.min.js b/components/prism-csharp.min.js
diff --git a/tests/languages/csharp+aspnet/directive_feature.test b/tests/languages/csharp+aspnet/directive_feature.test
@@ -10,59 +10,65 @@
 [
 	["directive tag", [
 		["directive tag", "<%:"],
-		" Page",
-		["punctuation", "."],
-		"Title ",
+		["class-name", [
+			"Page",
+			["punctuation", "."],
+			"Title"
+		]],
 		["directive tag", "%>"]
 	]],
 
 	["directive tag", [
-        ["directive tag", "<%#:"],
-        "Item",
-        ["punctuation", "."],
-        "ProductID",
-        ["directive tag", "%>"]
-    ]],
+		["directive tag", "<%#:"],
+		["class-name", [
+			"Item",
+			["punctuation", "."],
+			"ProductID"
+		]],
+		["directive tag", "%>"]
+	]],
 
-    ["tag", [
-        ["tag", [
-            ["punctuation", "<"],
-            "a"
-        ]],
-        ["attr-name", [
-            "href"
-        ]],
-        ["attr-value", [
-            ["punctuation", "="],
-            ["punctuation", "\""],
-            "ProductDetails.aspx?productID=",
-            ["directive tag", [
-                ["directive tag", "<%#:"],
-                "Item",
-		        ["punctuation", "."],
-		        "ProductID",
-		        ["directive tag", "%>"]
-            ]],
-            ["punctuation", "\""]
-        ]],
-        ["punctuation", ">"]
-    ]],
+	["tag", [
+		["tag", [
+			["punctuation", "<"],
+			"a"
+		]],
+		["attr-name", [
+			"href"
+		]],
+		["attr-value", [
+			["punctuation", "="],
+			["punctuation", "\""],
+			"ProductDetails.aspx?productID=",
+			["directive tag", [
+				["directive tag", "<%#:"],
+				["class-name", [
+					"Item",
+					["punctuation", "."],
+					"ProductID"
+				]],
+				["directive tag", "%>"]
+			]],
+			["punctuation", "\""]
+		]],
+		["punctuation", ">"]
+	]],
 
-    ["directive tag", [
-        ["directive tag", "<%"],
-        ["keyword", "if"],
-        ["punctuation", "("],
-        "foo",
-        ["punctuation", ")"],
-        ["punctuation", "{"],
-        ["directive tag", "%>"]
-    ]],
-    "\r\n\tfoobar\r\n",
-    ["directive tag", [
-        ["directive tag", "<%"],
-        ["punctuation", "}"],
-        ["directive tag", "%>"]
-    ]]
+	["directive tag", [
+		["directive tag", "<%"],
+		["keyword", "if"],
+		["punctuation", "("],
+		"foo",
+		["punctuation", ")"],
+		["punctuation", "{"],
+		["directive tag", "%>"]
+	]],
+	"\r\n\tfoobar\r\n",
+	["directive tag", [
+		["directive tag", "<%"],
+		["punctuation", "}"],
+		["directive tag", "%>"]
+	]]
 ]
 
 ----------------------------------------------------

diff --git a/tests/languages/csharp/class-name_feature.test b/tests/languages/csharp/class-name_feature.test
@@ -0,0 +1,21 @@
+class Foo
+interface BarBaz
+Foo.Barbaz
+
+----------------------------------------------------
+
+[
+	["keyword", "class"],
+	["class-name", ["Foo"]],
+	["keyword", "interface"],
+	["class-name", ["BarBaz"]],
+	["class-name", [
+		"Foo",
+		["punctuation", "."],
+		"Barbaz"
+	]]
+]
+
+----------------------------------------------------
+
+Checks for class names.
diff --git a/tests/languages/csharp/issue1365.test b/tests/languages/csharp/issue1365.test
@@ -0,0 +1,39 @@
+interface ILogger {
+    void Init(SomeClass file);
+	void LogInfo(string message);
+}
+public class SomeClass : BaseClass {}
+
+----------------------------------------------------
+
+[
+	["keyword", "interface"],
+	["class-name", ["ILogger"]],
+	["punctuation", "{"],
+	["keyword", "void"],
+	["function", "Init"],
+	["punctuation", "("],
+	["class-name", ["SomeClass"]],
+	" file",
+	["punctuation", ")"],
+	["punctuation", ";"],
+	["keyword", "void"],
+	["function", "LogInfo"],
+	["punctuation", "("],
+	["keyword", "string"],
+	" message",
+	["punctuation", ")"],
+	["punctuation", ";"],
+	["punctuation", "}"],
+	["keyword", "public"],
+	["keyword", "class"],
+	["class-name", ["SomeClass"]],
+	["punctuation", ":"],
+	["class-name", ["BaseClass"]],
+	["punctuation", "{"],
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for class names. See #1365