From b71f4c66073d03e062aa6f8e2109326ebbde6795 Mon Sep 17 00:00:00 2001 From: Siavash Askari Nasr Date: Sun, 15 Aug 2021 15:56:48 +0430 Subject: [PATCH] Raku: Fix incorrectly matching closing brackets as opening --- lexers/r/raku.go | 7 +++---- lexers/testdata/raku.actual | 2 +- lexers/testdata/raku.expected | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lexers/r/raku.go b/lexers/r/raku.go index 5b5c8a7..88d1f23 100644 --- a/lexers/r/raku.go +++ b/lexers/r/raku.go @@ -1156,12 +1156,11 @@ func rakuRules() Rules { } } -// Joins keys and values of rune map +// Joins keys of rune map func joinRuneMap(m map[rune]rune) string { - runes := make([]rune, 0, len(m)*2) - for k, v := range m { + runes := make([]rune, 0, len(m)) + for k := range m { runes = append(runes, k) - runes = append(runes, v) } return string(runes) diff --git a/lexers/testdata/raku.actual b/lexers/testdata/raku.actual index f95e434..26b18e4 100644 --- a/lexers/testdata/raku.actual +++ b/lexers/testdata/raku.actual @@ -21,7 +21,7 @@ fmt.Println("Hello from Go") say $=pod[0].config; sub f1($a) { - $a+1; + $a+1; #=> Comment looking like a pod declaration, but with a closing bracket! } 2.&f1; diff --git a/lexers/testdata/raku.expected b/lexers/testdata/raku.expected index fcc9407..4ae4b69 100644 --- a/lexers/testdata/raku.expected +++ b/lexers/testdata/raku.expected @@ -67,6 +67,8 @@ {"type":"Operator","value":"+"}, {"type":"LiteralNumberInteger","value":"1"}, {"type":"Punctuation","value":";"}, + {"type":"Text","value":" "}, + {"type":"CommentSingle","value":"#=\u003e Comment looking like a pod declaration, but with a closing bracket!"}, {"type":"Text","value":"\n"}, {"type":"Punctuation","value":"}"}, {"type":"Text","value":"\n\n"},