Commit 9c8911bdca589e87023d93d953b03c647ea6cca4
2021-07-19T17:01:49
Hoon: Fixed mixed-case aura tokenization (#3002)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
diff --git a/components/prism-hoon.js b/components/prism-hoon.js
index 1e0025a..a3d4082 100644
--- 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
index ea3a370..01eb598 100644
--- a/components/prism-hoon.min.js
+++ b/components/prism-hoon.min.js
@@ -1 +1 @@
-Prism.languages.hoon={constant:/%(?:\.[ny]|[\w-]+)/,comment:{pattern:/::.*/,greedy:!0},function:/(?:\+[-+] {2})?(?:[a-z](?:[a-z0-9-]*[a-z0-9])?)/,"class-name":[{pattern:/@(?:[A-Za-z0-9-]*[A-Za-z0-9])?/},/\*/],string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},keyword:/:_|\.[\^\+\*=\?]|![><:\.=\?!]|=[>|:,\.\-\^<+;/~\*\?]|\?[>|:\.\-\^<\+&~=@!]|\|[\$_%:\.\-\^~\*=@\?]|\+[|\$\+\*]|:[_\-\^\+~\*]|%[_:\.\-\^\+~\*=]|\^[|:\.\-\+&~\*=\?]|\$[|_%:<>\-\^&~@=\?]|;[:<\+;\/~\*=]|~[>|\$_%<\+\/&=\?!]|--|==/};
\ No newline at end of file
+Prism.languages.hoon={constant:/%(?:\.[ny]|[\w-]+)/,comment:{pattern:/::.*/,greedy:!0},"class-name":[{pattern:/@(?:[A-Za-z0-9-]*[A-Za-z0-9])?/},/\*/],function:/(?:\+[-+] {2})?(?:[a-z](?:[a-z0-9-]*[a-z0-9])?)/,string:{pattern:/"[^"]*"|'[^']*'/,greedy:!0},keyword:/:_|\.[\^\+\*=\?]|![><:\.=\?!]|=[>|:,\.\-\^<+;/~\*\?]|\?[>|:\.\-\^<\+&~=@!]|\|[\$_%:\.\-\^~\*=@\?]|\+[|\$\+\*]|:[_\-\^\+~\*]|%[_:\.\-\^\+~\*=]|\^[|:\.\-\+&~\*=\?]|\$[|_%:<>\-\^&~@=\?]|;[:<\+;\/~\*=]|~[>|\$_%<\+\/&=\?!]|--|==/};
\ No newline at end of file
diff --git a/tests/languages/hoon/comments_and_leaves.test b/tests/languages/hoon/comments_and_leaves.test
index 943354c..17f61a6 100644
--- 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
index fcf6213..b2ca9dd 100644
--- 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", "?:"],
" &((",