Fix issue #8 and update the tests, which now pass

Raku · Dec 14, 2016 · d350c1a · d350c1a
1 parent 44e54e0
commit d350c1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/grammars/perl6fe.cson b/grammars/perl6fe.cson
@@ -910,7 +910,7 @@
 
   # Dual functions and methods
   {
-    'match': '(?x)\\b(?<![\\-:]|\\\\)(
+    'match': '(?x)\\b(?<![\\-:\\\\])( :: )?(
        eager|hyper|substr|index|rindex|grep|map|sort|join|lines|hints
       |chmod|split|reduce|min|max|reverse|truncate|zip|cat|roundrobin
       |classify|first|sum|keys|values|pairs|defined|delete|exists
@@ -943,6 +943,9 @@
       |starts-with|ends-with|put|append|tail|\\x{03C0}|\\x{03C4}|\\x{212F}
       |get|words|new-from-pairs|uniname|uninames|uniprop|uniprops
     )(?!\\-)\\b(?!\\s*=>)'
+    'captures':
+      '1':
+        'name': 'keyword.operator.colon.perl6fe'
     'name': 'support.function.perl6fe'
   }
   # Methods Only

diff --git a/spec/grammar-perl6fe-spec.coffee b/spec/grammar-perl6fe-spec.coffee
@@ -17,13 +17,17 @@ describe "Perl 6 FE grammar", ->
   #it "# =begin pod works", ->
   #  line = " =comment Perl 6 is the Best!"
   #  expect(grammar.firstLineRegex.scanner.findNextMatchSync(line)).not.toBeNull()
-  it "FQ private methods are highlighted properly Issue #8", ->
+  it "FQ private methods are highlighted properly Issue 8", ->
     {tokens} = grammar.tokenizeLine "self.List::perl;"
     expect(tokens[0]).toEqual value : 'self',
     scopes : [ 'source.perl6fe', 'variable.language.perl6fe' ]
     expect(tokens[1]).toEqual value : '.',
     scopes : [ 'source.perl6fe', 'keyword.operator.generic.perl6fe' ]
     expect(tokens[2]).toEqual value : 'List',
+    scopes : [ 'source.perl6fe', 'support.type.perl6fe' ]
+    expect(tokens[3]).toEqual value : '::',
+    scopes : [ 'source.perl6fe', 'support.function.perl6fe', 'keyword.operator.colon.perl6fe' ]
+    expect(tokens[4]).toEqual value : 'perl',
     scopes : [ 'source.perl6fe', 'support.function.perl6fe' ]
   it "self.perl highlights", ->
     {tokens} = grammar.tokenizeLine "self.perl"