Fix support for multi val definitions

Fixes the following two cases
```
val a, b, c = ...
var a, b, c = ...
```

Author: nicolasstucki

src/typescript/Scala.tmLanguage.ts

@@ -802,28 +802,25 @@ export const scalaTmLanguage: TmLanguage = {
             }
           }
         },
-        { // val x1, x2 = y
-          match: `\\b(?:(val)|(var))\\b\\s*${notStartOfComment}${anyId}(?=\\s*,)`,
+        { // val x1[, x2, x3, ...] = y
+          match: `\\b(val)\\b\\s*${notStartOfComment}(${anyId}(?:\\s*,\\s*${anyId})*)?`,
           captures: {
             '1': {
               name: 'keyword.declaration.stable.scala'
             },
             '2': {
-              name: 'keyword.declaration.volatile.scala'
+              name: 'variable.stable.declaration.scala'
             }
           }
         },
-        {
-          match: `\\b(?:(val)|(var))\\b\\s*${notStartOfComment}(${anyId})?`,
+        { // var x1[, x2, x3, ...] = y
+          match: `\\b(var)\\b\\s*${notStartOfComment}(${anyId}(?:\\s*,\\s*${anyId})*)?`,
           captures: {
             '1': {
-              name: 'keyword.declaration.stable.scala'
-            },
-            '2': {
               name: 'keyword.declaration.volatile.scala'
             },
-            '3': {
-              name: 'variable.other.declaration.scala'
+            '2': {
+              name: 'variable.volatile.declaration.scala'
             }
           }
         },

syntaxes/Scala.tmLanguage.json

@@ -2,22 +2,22 @@
 
    val Foo = ???
 // ^^^  keyword.declaration.stable.scala
-//     ^^^ variable.other.declaration.scala
+//     ^^^ variable.stable.declaration.scala
 
    val foo = ???
 // ^^^  keyword.declaration.stable.scala
-//     ^^^ variable.other.declaration.scala
+//     ^^^ variable.stable.declaration.scala
 
    var Foo = ???
 // ^^^ keyword.declaration.volatile.scala
-//     ^^^  variable.other.declaration.scala
+//     ^^^  variable.volatile.declaration.scala
 
    var foo = ???
 // ^^^ keyword.declaration.volatile.scala
-//     ^^^ variable.other.declaration.scala
+//     ^^^ variable.volatile.declaration.scala
 
   def Foo = ???
 //    ^^^ entity.name.function.declaration
 
-  def foo 
+  def foo
 //    ^^^ entity.name.function.declaration

tests/unit/#157.test.scala

@@ -0,0 +1,24 @@
+// SYNTAX TEST "source.scala"
+
+     val foo = Value
+//       ^^^ variable.stable.declaration.scala
+
+     val Mon = Value
+//       ^^^ variable.stable.declaration.scala
+
+     val Mon, Tue = Value
+//       ^^^ variable.stable.declaration.scala
+//            ^^^ variable.stable.declaration.scala
+
+     val Mon, Tue, Wed = Value
+//       ^^^ variable.stable.declaration.scala
+//            ^^^ variable.stable.declaration.scala
+//                 ^^^ variable.stable.declaration.scala
+
+     var Mon = Value
+//       ^^^ variable.volatile.declaration.scala
+
+     var Mon, Tue, Wed = Value
+//       ^^^ variable.volatile.declaration.scala
+//            ^^^ variable.volatile.declaration.scala
+//                 ^^^ variable.volatile.declaration.scala

tests/unit/#234.test.scala

@@ -30,14 +30,14 @@
 
    val a = 4; foo(a)
 // ^^^ keyword.declaration.stable.scala
-//     ^ variable.other.declaration.scala
+//     ^ variable.stable.declaration.scala
 //       ^ keyword.operator.comparison.scala
 //         ^ constant.numeric.scala
    s"$safeTagMarker${val a = 4; foo(a)}$safeTagMarker"
 //                 ^^^^^^^^^^^^^^^^^^^^ meta.template.expression.scala
 //                   ^^^^^^^^^^^^^^^^^ meta.embedded.line.scala
 //                   ^^^^^^^^^^^^^^^^^ - punctuation.definition.template-expression
 //                   ^^^ keyword.declaration.stable.scala
-//                       ^ variable.other.declaration.scala
+//                       ^ variable.stable.declaration.scala
 //                         ^ keyword.operator.comparison.scala
 //                           ^ constant.numeric.scala

tests/unit/#72.test.scala

@@ -12,7 +12,7 @@ class Stack[A] {
   private var elements: List[A] = Nil
 //^^^^^^^ storage.modifier.access
 //        ^^^ keyword.declaration.volatile.scala
-//            ^^^^^^^^ variable.other.declaration.scala
+//            ^^^^^^^^ variable.volatile.declaration.scala
 //                    ^ keyword.operator.scala
 //                      ^^^^ entity.name.class
 //                          ^ meta.bracket.scala
@@ -39,7 +39,7 @@ class Stack[A] {
     def pop(): A = {
       val currentTop = peek
 //    ^^^ keyword.declaration.stable.scala
-//        ^^^^^^^^^^ variable.other.declaration.scala
+//        ^^^^^^^^^^ variable.stable.declaration.scala
 //                   ^ keyword.operator.comparison.scala
 //                     ^^^^ source.scala
       elements = elements.tail

tests/unit/basic.test.scala

@@ -13,7 +13,7 @@
 // ^^^^ keyword.declaration.scala
 //      ^^^^^^^ entity.name.class.declaration
 //              ^^^ keyword.declaration.stable.scala
-//                  ^^^^^^^^^^^^^^ variable.other.declaration.scala
+//                  ^^^^^^^^^^^^^^ variable.stable.declaration.scala
 //                                  ^^^ entity.name.class
      case Unicycle extends Vehicle(1)
 //   ^^^^ source.scala keyword.control.flow.scala
@@ -23,7 +23,7 @@
 //                                ^ meta.bracket.scala
 //                                 ^ constant.numeric.scala
 //                                  ^ meta.bracket.scala
-     
+
      case Bicycle extends Vehicle(2)
 //   ^^^^ source.scala keyword.control.flow.scala
 //        ^^^^^^^ entity.name.class

tests/unit/enum.test.scala

@@ -1,33 +1,33 @@
-// SYNTAX TEST "source.scala"  
+// SYNTAX TEST "source.scala"
 
 object ExampleIdentifiers {
   val x = 3
-//    ^ variable.other.declaration.scala
-  val Object = 3        
+//    ^ variable.stable.declaration.scala
+  val Object = 3
   val maxIndex = 3
-//    ^^^^^^^^ variable.other.declaration.scala  
-  val p2p = 3      
-//    ^^^ variable.other.declaration.scala
+//    ^^^^^^^^ variable.stable.declaration.scala
+  val p2p = 3
+//    ^^^ variable.stable.declaration.scala
   val empty_? = 3
-//    ^^^^^^^ variable.other.declaration.scala
-  val + = 3       
-//    ^ variable.other.declaration.scala  
-  val `yield` = 3 
-//    ^^^^^^^ variable.other.declaration.scala      
-  val αρετη = 3     
-  val _y = 3     
-//    ^^ variable.other.declaration.scala    
+//    ^^^^^^^ variable.stable.declaration.scala
+  val + = 3
+//    ^ variable.stable.declaration.scala
+  val `yield` = 3
+//    ^^^^^^^ variable.stable.declaration.scala
+  val αρετη = 3
+  val _y = 3
+//    ^^ variable.stable.declaration.scala
   val dot_product_* = 3
-//    ^^^^^^^^^^^^^ variable.other.declaration.scala
-  val __system = 3  
-//    ^^^^^^^^ variable.other.declaration.scala
+//    ^^^^^^^^^^^^^ variable.stable.declaration.scala
+  val __system = 3
+//    ^^^^^^^^ variable.stable.declaration.scala
   val _MAX_LEN_ = 3
-//    ^^^^^^^^^ variable.other.declaration.scala
+//    ^^^^^^^^^ variable.stable.declaration.scala
 }
 
 object IntegerLiterals {
   (0, 21,  0xFFFFFFFF, -42L)
-// ^ constant.numeric.scala        
+// ^ constant.numeric.scala
 //    ^^ constant.numeric.scala
 //         ^^^^^^^^^^ constant.numeric.scala
 //                     ^ keyword.operator.arithmetic.scala
@@ -37,9 +37,9 @@ object IntegerLiterals {
 object FloatingPointLiterals {
   ( 0.0, 1e30f, 3.14159f, 1.0e-100, .1  )
 //  ^^^ constant.numeric.scala
-//              ^^^^^^^^ constant.numeric.scala 
-//                        ^^^^^^^^ constant.numeric.scala 
-//                                  ^^ constant.numeric.scala 
+//              ^^^^^^^^ constant.numeric.scala
+//                        ^^^^^^^^ constant.numeric.scala
+//                                  ^^ constant.numeric.scala
 }
 
 object Boolean {
@@ -54,9 +54,9 @@ object CharacterLiterals {
 //   ^^^ constant.character.literal.scala
 //     ^ punctuation.definition.character.end.scala
 //           ^^^^^^^^  constant.character.literal.scala
-//            ^^^^^^   constant.character.escape.scala  
+//            ^^^^^^   constant.character.escape.scala
 //                         ^^ constant.character.escape.scala
-//                                  ^^ constant.character.escape.scala                                        
+//                                  ^^ constant.character.escape.scala
 }
 
 object StringLiterals {
@@ -65,14 +65,14 @@ object StringLiterals {
 //   ^^^^^^^^^^^^^^^^ string.quoted.double.scala
 //          ^^ constant.character.escape.scala
 //                  ^ punctuation.definition.string.end.scala
-//                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.quoted.double.scala                                        
+//                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ string.quoted.double.scala
     """the present string
 //  ^^^ punctuation.definition.string.begin.scala
 //  ^^^^^^^^^^^^^^^^^^^^^ string.quoted.triple.scala
      spans three
 //   ^^^^^^^^^^^ string.quoted.triple.scala
      lines."""
-//   ^^^^^^^^^ string.quoted.triple.scala 
+//   ^^^^^^^^^ string.quoted.triple.scala
 //         ^^^ punctuation.definition.string.end.scala
 
     """the present string
@@ -86,8 +86,8 @@ object StringLiterals {
 
   s"$x plain ${val x = y}"
 //^ keyword.interpolation.scala
-// ^ punctuation.definition.string.begin.scala 
-//  ^ punctuation.definition.template-expression.begin.scala 
+// ^ punctuation.definition.string.begin.scala
+//  ^ punctuation.definition.template-expression.begin.scala
 //   ^ - string.quoted.double.interpolated.scala string.quoted.double.scala
 //    ^^^^^^^ string.quoted.double.interpolated.scala
 //           ^^^^^^^^^^^^ meta.template.expression.scala
@@ -96,12 +96,12 @@ object StringLiterals {
 //             ^^^ keyword.declaration.stable.scala
 //             ^^^^^^^^^   - string.quoted.double.interpolated.scala string.quoted.double.scala
 //                      ^ punctuation.definition.template-expression.end.scala
-//                       ^   string.quoted.double.interpolated.scala  punctuation.definition.string.end.scala                   
+//                       ^   string.quoted.double.interpolated.scala  punctuation.definition.string.end.scala
 
   custom"$x plain ${val x = y}"
 //^^^^^^ keyword.interpolation.scala
-//      ^ punctuation.definition.string.begin.scala 
-//       ^ punctuation.definition.template-expression.begin.scala 
+//      ^ punctuation.definition.string.begin.scala
+//       ^ punctuation.definition.template-expression.begin.scala
 //        ^ - string.quoted.double.interpolated.scala string.quoted.double.scala
 //         ^^^^^^^ string.quoted.double.interpolated.scala
 //                ^^^^^^^^^^^^ meta.template.expression.scala
@@ -110,26 +110,26 @@ object StringLiterals {
 //                  ^^^ keyword.declaration.stable.scala
 //                  ^^^^^^^^^   - string.quoted.double.interpolated.scala string.quoted.double.scala
 //                           ^ punctuation.definition.template-expression.end.scala
-//                            ^   string.quoted.double.interpolated.scala  punctuation.definition.string.end.scala   
+//                            ^   string.quoted.double.interpolated.scala  punctuation.definition.string.end.scala
 
 object Symbols {
     ('x, 'X, 'αρετη, '=, '+ )
 //   ^^ constant.other.symbol.scala
 //       ^^ constant.other.symbol.scala
-//           ^^^^^^ constant.other.symbol.scala 
+//           ^^^^^^ constant.other.symbol.scala
 }
 
     // single line comment
-//  ^^ punctuation.definition.comment.scala 
-//  ^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-slash.scala    
+//  ^^ punctuation.definition.comment.scala
+//  ^^^^^^^^^^^^^^^^^^^^^^ comment.line.double-slash.scala
 
    /*
 // ^^   punctuation.definition.comment.scala
     multiline comment*/
 //  ^^^^^^^^^^^^^^^^^^^ comment.block.scala
   /**
    * Scaladoc comment
-   * @scaladoc @param 
+   * @scaladoc @param
    */
 
    /*  nested /* multi-line */ comment */

tests/unit/lexical.test.scala

@@ -1,6 +1,6 @@
 // SYNTAX TEST "source.scala"
 
-class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) { 
+class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
 // <-----  keyword.declaration.scala
 //    ^^^^^  entity.name.class.declaration
 //         ^  meta.bracket.scala
@@ -11,11 +11,11 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
 //                        ^  meta.colon.scala
 //                          ^^^  entity.name.class
 //                               ^^^  keyword.declaration.stable.scala
-//                                   ^  variable.other.declaration.scala
+//                                   ^  variable.stable.declaration.scala
 //                                    ^  keyword.operator.scala
 //                                      ^^^  entity.name.class
 //                                           ^^^  keyword.declaration.stable.scala
-//                                               ^^  variable.other.declaration.scala
+//                                               ^^  variable.stable.declaration.scala
 //                                                 ^  keyword.operator.scala
 //                                                   ^^^  entity.name.class
 //                                                      ^  meta.bracket.scala
@@ -27,11 +27,11 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
 //          ^  keyword.operator.comparison.scala
   val δφξ = 4
 //^^^  keyword.declaration.stable.scala
-//    ^^^  variable.other.declaration.scala
+//    ^^^  variable.stable.declaration.scala
 //        ^  keyword.operator.comparison.scala
   var δφξ = 5
 //^^^  keyword.declaration.volatile.scala
-//    ^^^  variable.other.declaration.scala
+//    ^^^  variable.volatile.declaration.scala
 //        ^  keyword.operator.comparison.scala
   def δφξ(δφξκξ: Int) = ()
 //^^^  keyword.declaration.scala
@@ -56,13 +56,13 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
 
   val Constant = 3
 //^^^  keyword.declaration.stable.scala
-//    ^^^^^^^^  variable.other.declaration.scala
+//    ^^^^^^^^  variable.stable.declaration.scala
 //             ^  keyword.operator.comparison.scala
   val Константа = 4
 //^^^  keyword.declaration.stable.scala
-//    ^^^^^^^^^  variable.other.declaration.scala
+//    ^^^^^^^^^  variable.stable.declaration.scala
 //              ^  keyword.operator.comparison.scala
-  
+
 }