Fix imports of packages or members with names starting with given

Fixes #189

Author: MaximeKjaer

src/typescript/Scala.tmLanguage.ts

@@ -53,7 +53,7 @@ export const scalaTmLanguage: TmLanguage = {
           include: '#comments'
         },
         {
-          match: 'given',
+          match: '\\b(given)\\b',
           name: 'keyword.other.import.given.scala'
         },
         {
@@ -101,7 +101,7 @@ export const scalaTmLanguage: TmLanguage = {
               }
             },
             {
-              match: 'given',
+              match: '\\b(given)\\b',
               name: 'keyword.other.import.given.scala'
             },
             {

tests/unit/imports.test.scala

@@ -127,3 +127,17 @@
 //                                    ^ meta.import.scala meta.import.selector.scala
 //                                     ^^^^^^^^^^^^^^^^ meta.import.scala entity.name.class.import.scala
 //                                                     ^ meta.import.scala meta.import.selector.scala
+
+    import A.givenSomething
+//  ^^^^^^ meta.import.scala keyword.other.import.scala
+//        ^ meta.import.scala
+//         ^ meta.import.scala entity.name.class.import.scala
+//          ^ meta.import.scala punctuation.definition.import
+//           ^^^^^^^^^^^^^^ meta.import.scala entity.name.import.scala
+
+    import givenPackage.x
+//  ^^^^^^ meta.import.scala keyword.other.import.scala
+//        ^ meta.import.scala
+//         ^^^^^^^^^^^^ meta.import.scala entity.name.import.scala
+//                     ^ meta.import.scala punctuation.definition.import
+//                      ^ meta.import.scala entity.name.import.scala