Merge pull request #56 from scala/add-given-imports

Fix #55: Add given imports syntax

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -49,6 +49,10 @@ export const scalaTmLanguage: TmLanguage = {
         {
           include: '#comments'
         },
+        {
+          match: `(given)(?=\\s)`,
+          name: 'keyword.given.import.scala'
+        },
         {
           match: `(${backQuotedId}|${plainid})`,
           name: 'entity.name.import.scala'
@@ -80,6 +84,17 @@ export const scalaTmLanguage: TmLanguage = {
                 }
               }
             },
+            {
+              match: `(given)(\\s+${plainid})?(?=\\s*[,}])`,
+              captures: {
+                '1': {
+                  name: 'keyword.given.import.scala'
+                },
+                '2': {
+                  name: 'entity.name.type.import.scala'
+                }
+              }
+            },
             {
               match: '([^\\s.,}]+)',
               name: 'entity.name.import.scala'