Merge pull request #150 from nicolasstucki/fix-#133-2

Prioritize matching of inline parameters

Author: MaximeKjaer

src/typescript/Scala.tmLanguage.ts

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

tests/unit/#133.test.scala

@@ -71,6 +71,12 @@ val x = inline[T]
 //                                        ^^^^^^ storage.modifier.other
 //                                               ^^^^^^ variable.parameter.scala
 
+    inline def inline(inline x: Int): Double = if
+//  ^^^^^^ storage.modifier.other
+//             ^^^^^^ 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