Raku: Fix operators that come after <

CIAvash · alecthomas · commit 2535d1a99ead · 2021-08-29T07:10:23.000+10:00
diff --git a/lexers/r/raku.go b/lexers/r/raku.go
@@ -791,7 +791,7 @@ func rakuRules() Rules {
 			},
 			// <{code}>
 			{
-				`(?<!(?<!\\)\\)(<)([?!])?((?<!(?<!\\)\\){)(.*?)(}>)`,
+				`(?<!(?<!\\)\\)(<)([?!.]*)((?<!(?<!\\)\\){)(.*?)(}>)`,
 				ByGroups(Punctuation, Operator, Punctuation, UsingSelf("root"), Punctuation),
 				nil,
 			},
@@ -807,7 +807,7 @@ func rakuRules() Rules {
 			{`#[^\n]*\n`, CommentSingle, nil},
 			// Lookaround
 			{
-				`(?<!(?<!\\)\\)(<)(\s*)([?!.])(\s*)(after|before)`,
+				`(?<!(?<!\\)\\)(<)(\s*)([?!.]+)(\s*)(after|before)`,
 				ByGroups(Punctuation, Text, Operator, Text, OperatorWord),
 				Push("regex"),
 			},
@@ -818,8 +818,8 @@ func rakuRules() Rules {
 			},
 			// <$variable>
 			{
-				`(?<!(?<!\\)\\)(<)([$@]\w[\w-:]*)(>)`,
-				ByGroups(Punctuation, NameVariable, Punctuation),
+				`(?<!(?<!\\)\\)(<)([?!.]*)([$@]\w[\w-:]*)(>)`,
+				ByGroups(Punctuation, Operator, NameVariable, Punctuation),
 				nil,
 			},
 			// Capture markers
@@ -841,6 +841,7 @@ func rakuRules() Rules {
 			{`(?<!(?<!\\)\\)>`, Punctuation, Pop(1)},
 			Include("regex-class-builtin"),
 			Include("variable"),
+			{`(?<=<)[|!?.]+`, Operator, nil},
 			// <regexfunc> | <regexfunc(parameter)> | <variable=regexfunc>
 			{
 				`(?:(\w[\w-:]*)(=\.?))?(&?\w[\w'-:]+?)(\(.+?\))?(?=>)`,
@@ -861,7 +862,6 @@ func rakuRules() Rules {
 			{`(?<!(?<!\\)\\)\[`, Punctuation, Push("regex-character-class")},
 			{`\+|\-`, Operator, nil},
 			{`@[\w'-:]+`, NameVariable, nil},
-			{`(?<=<)[|!?.]`, Operator, nil},
 			{`.+?`, StringRegex, nil},
 		},
 		"regex-escape-class": {
diff --git a/lexers/testdata/raku.actual b/lexers/testdata/raku.actual
@@ -233,6 +233,10 @@ rx/:i
 
         $<myname> = [ \w+ ]
 
+        <!!{ $*LANG := $*LEAF := $/.clone_braid_from(self); 1 }>
+
+        <?before <.[\)\]\}]>>
+
         $<string>=( [ $<part>=[abc] ]* % '-' )
         $<variable>=\w+ '=' $<value>=\w+
         a <( b )> c
diff --git a/lexers/testdata/raku.expected b/lexers/testdata/raku.expected
@@ -1699,6 +1699,39 @@
   {"type":"LiteralStringRegex","value":" "},
   {"type":"Punctuation","value":"]"},
   {"type":"LiteralStringRegex","value":"\n\n        "},
+  {"type":"Punctuation","value":"\u003c"},
+  {"type":"Operator","value":"!!"},
+  {"type":"Punctuation","value":"{"},
+  {"type":"Text","value":" "},
+  {"type":"NameVariableGlobal","value":"$*LANG"},
+  {"type":"Text","value":" "},
+  {"type":"Operator","value":":="},
+  {"type":"Text","value":" "},
+  {"type":"NameVariableGlobal","value":"$*LEAF"},
+  {"type":"Text","value":" "},
+  {"type":"Operator","value":":="},
+  {"type":"Text","value":" "},
+  {"type":"NameVariable","value":"$/"},
+  {"type":"Operator","value":"."},
+  {"type":"NameFunction","value":"clone_braid_from"},
+  {"type":"Punctuation","value":"("},
+  {"type":"NameBuiltin","value":"self"},
+  {"type":"Punctuation","value":");"},
+  {"type":"Text","value":" "},
+  {"type":"LiteralNumberInteger","value":"1"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"}\u003e"},
+  {"type":"LiteralStringRegex","value":"\n\n        "},
+  {"type":"Punctuation","value":"\u003c"},
+  {"type":"Operator","value":"?"},
+  {"type":"OperatorWord","value":"before"},
+  {"type":"LiteralStringRegex","value":" "},
+  {"type":"Punctuation","value":"\u003c"},
+  {"type":"Operator","value":"."},
+  {"type":"Punctuation","value":"["},
+  {"type":"LiteralStringRegex","value":"\\)\\]\\}"},
+  {"type":"Punctuation","value":"]\u003e\u003e"},
+  {"type":"LiteralStringRegex","value":"\n\n        "},
   {"type":"NameVariable","value":"$\u003cstring\u003e"},
   {"type":"Operator","value":"="},
   {"type":"Punctuation","value":"("},
