Fix #139: Add given as a possible inline definition

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -577,18 +577,18 @@ export const scalaTmLanguage: TmLanguage = {
     inline: {
       patterns: [
         {
-          match: `\\b(inline)\\b(?=(\\s+(?:${plainid}|${backQuotedId})\\s*:)|(.*(val|def)))`,
+          match: `\\b(inline)\\b(?=(?:.(?!val|def|given))*(if|match))`,
           captures: {
             '1': {
-              name: 'storage.modifier.other'
+              name: 'keyword.control.flow.scala'
             }
           }
         },
         {
-          match: `\\b(inline)\\b(?=.*(if|match))`,
+          match: `\\b(inline)\\s+(?=(([\\w\\s]*(val|def|given))|(${plainid}|${backQuotedId})\\s*:))`,
           captures: {
             '1': {
-              name: 'keyword.control.flow.scala'
+              name: 'storage.modifier.other'
             }
           }
         }

tests/unit/#133.test.scala

@@ -39,3 +39,15 @@ val x = inline[T]
 //             ^^^^^^ entity.name.function.declaration
 //                    ^^^^^^ storage.modifier.other
 //                           ^^^^^^ variable.parameter.scala
+
+   inline if (n == 0) 1 else 2; val x = 2
+// ^^^^^^ keyword.control.flow.scala
+//        ^^ keyword.control.flow.scala
+
+   inline if (n == 0) 1 else 2; def x = 2
+// ^^^^^^ keyword.control.flow.scala
+//        ^^ keyword.control.flow.scala
+
+    inline f[X](x: X) match {
+//  ^^^^^^ keyword.control.flow.scala
+//                    ^^^^^ keyword.control.flow.scala

tests/unit/#139.test.scala

@@ -0,0 +1,10 @@
+// SYNTAX TEST "source.scala"
+
+
+    inline def mkDefaultTypeable[T]: Typeable[T] = ${ TypeableMacros.impl[T] }
+//  ^^^^^^ storage.modifier.other
+//         ^^^ keyword.declaration.scala
+
+    inline given [T] as Typeable[T] = mkDefaultTypeable[T]
+//  ^^^^^^ storage.modifier.other
+//         ^^^^^ keyword.declaration.scala