Improve rule for given declaration detecion

scala · Jul 7, 2020 · 02fe701 · 02fe701
1 parent b6e47aa
commit 02fe701
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -707,17 +707,11 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'meta.package.scala'
         },
         {
-          match: `\\b(given)\\s+(as)\\s`,
+          match: `\\b(given)\\b\\s*(?:\\b(as)\\b|(${backQuotedId}|(?!//|/\\*)${plainid})?)`,
           captures: {
             '1': { name: 'keyword.declaration.scala' },
-            '2': { name: 'keyword.declaration.scala' }
-          }
-        },
-        {
-          match: `\\b(given)\\s+(${backQuotedId}|${plainid})?`,
-          captures: {
-            '1': { name: 'keyword.declaration.scala' },
-            '2': { name: 'entity.name.declaration' }
+            '2': { name: 'keyword.declaration.scala' },
+            '3': { name: 'entity.name.declaration' }
           }
         }
       ]

diff --git a/tests/unit/#103.test.scala b/tests/unit/#103.test.scala
@@ -67,3 +67,21 @@
 //                                                                           ^^^ constant.character.literal.scala
 //                                                                               ^^^^ keyword.control.flow.scala
 //                                                                                    ^ constant.numeric.scala
+
+    given // this should be a comment
+//  ^^^^^ keyword.declaration.scala
+//        ^^ punctuation.definition.comment.scala
+//          ^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-slash.scala
+        as Foo
+//      ^^ keyword.declaration.scala
+
+    given// this should be a comment
+//  ^^^^^ keyword.declaration.scala
+//       ^^ punctuation.definition.comment.scala
+//          ^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-slash.scala
+
+    given /* this should be a comment */
+//  ^^^^^ keyword.declaration.scala
+//        ^^ punctuation.definition.comment.scala
+//          ^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.block.scala
+//                                    ^^ punctuation.definition.comment.scala