Raku: Fix Match hash access, $<variable><key>

alecthomas · Aug 28, 2021 · 22fac1f · 22fac1f
1 parent 2535d1a
commit 22fac1f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/lexers/r/raku.go b/lexers/r/raku.go
@@ -1043,7 +1043,7 @@ func rakuRules() Rules {
 		"variable": {
 			{variablePattern, NameVariable, Push("name-adverb")},
 			{globalVariablePattern, NameVariableGlobal, Push("name-adverb")},
-			{`[$@](?:<.*?>)+`, NameVariable, nil},
+			{`[$@]<[^>]+>`, NameVariable, nil},
 			{`\$/`, NameVariable, nil},
 			{`\$!`, NameVariable, nil},
 			{`[$@%]`, NameVariable, nil},

diff --git a/lexers/testdata/raku.actual b/lexers/testdata/raku.actual
@@ -261,6 +261,8 @@ rx/:i
         \d ** 1..3 <?{ $/.Int <= 255 && $/.Int >= 0 }>
         $/;
 
+$<variable><key>;
+
 constant \something:some<adverb> = 'something';
 
 my %hash = %(

diff --git a/lexers/testdata/raku.expected b/lexers/testdata/raku.expected
@@ -2004,6 +2004,11 @@
   {"type":"NameEntity","value":"$"},
   {"type":"Punctuation","value":"/;"},
   {"type":"Text","value":"\n\n"},
+  {"type":"NameVariable","value":"$\u003cvariable\u003e"},
+  {"type":"Punctuation","value":"\u003c"},
+  {"type":"LiteralString","value":"key"},
+  {"type":"Punctuation","value":"\u003e;"},
+  {"type":"Text","value":"\n\n"},
   {"type":"Keyword","value":"constant"},
   {"type":"Text","value":" "},
   {"type":"NameVariable","value":"\\something"},