Hoon: Fixed mixed-case aura tokenization (#3002)

matildepark · web-flow · commit 9c8911bdca58 · 2021-07-19T23:01:49.000+02:00
diff --git a/components/prism-hoon.js b/components/prism-hoon.js
@@ -4,13 +4,13 @@ Prism.languages.hoon = {
 		pattern: /::.*/,
 		greedy: true
 	},
-	'function': /(?:\+[-+] {2})?(?:[a-z](?:[a-z0-9-]*[a-z0-9])?)/,
 	'class-name': [
 		{
-			pattern: /@(?:[A-Za-z0-9-]*[A-Za-z0-9])?/,
+			pattern: /@(?:[A-Za-z0-9-]*[A-Za-z0-9])?/
 		},
 		/\*/
 	],
+	'function': /(?:\+[-+] {2})?(?:[a-z](?:[a-z0-9-]*[a-z0-9])?)/,
 	'string': {
 		pattern: /"[^"]*"|'[^']*'/,
 		greedy: true
diff --git a/components/prism-hoon.min.js b/components/prism-hoon.min.js
diff --git a/tests/languages/hoon/comments_and_leaves.test b/tests/languages/hoon/comments_and_leaves.test
@@ -31,8 +31,7 @@
 	"  [",
 	["function", "now"],
 	"=",
-	["class-name", "@"],
-	["function", "da"],
+	["class-name", "@da"],
 	["function", "ovo"],
 	"=",
 	["class-name", "*"],
diff --git a/tests/languages/hoon/nested_strings.test b/tests/languages/hoon/nested_strings.test
@@ -48,9 +48,7 @@ c
 	["keyword", "|="],
 	["function", "c"],
 	"=",
-	["class-name", "@"],
-	["function", "t"],
-	"D\r\n",
+	["class-name", "@tD"],
 
 	["keyword", "?:"],
 	"  &((",
