Fix #157: Highlight val with upper case

src/typescript/Scala.tmLanguage.ts

@@ -668,19 +668,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         {
-          match: `\\b(val)\\s+(${idUpper}(\\s*,\\s*${idUpper})*)\\b`,
-          captures: {
-            '1': {
-              name: 'keyword.declaration.stable.scala'
-            }
-            ,
-            '2': {
-              name: 'constant.other.declaration.scala'
-            }
-          }
-        },
-        {
-          match: `\\b(?:(val)|(var))\\s+(?:(${backQuotedId}|${plainid})|(?=\\())`,
+          match: `\\b(?:(val)|(var))\\s+(?:(${idUpper}(\\s*,\\s*${idUpper})*|${backQuotedId}|${plainid})|(?=\\())`,
           captures: {
             '1': {
               name: 'keyword.declaration.stable.scala'

tests/snap/lexical.test.scala.snap

@@ -18,7 +18,7 @@
 #^^ source.scala
 #  ^^^ source.scala keyword.declaration.stable.scala
 #     ^ source.scala
-#      ^^^^^^ source.scala constant.other.declaration.scala
+#      ^^^^^^ source.scala variable.other.declaration.scala
 #            ^ source.scala
 #             ^ source.scala keyword.operator.comparison.scala
 #              ^ source.scala

tests/snap/scala_spec.test.scala.snap

@@ -949,7 +949,7 @@
 #^^ source.scala
 #  ^^^ source.scala keyword.declaration.stable.scala
 #     ^ source.scala
-#      ^^^^ source.scala constant.other.declaration.scala
+#      ^^^^ source.scala variable.other.declaration.scala
 #          ^ source.scala meta.bracket.scala
 #           ^ source.scala
 #            ^ source.scala meta.bracket.scala

tests/unit/#157.test.scala

@@ -0,0 +1,23 @@
+// SYNTAX TEST "source.scala"
+
+   val Foo = ???
+// ^^^  keyword.declaration.stable.scala
+//     ^^^ variable.other.declaration.scala
+
+   val foo = ???
+// ^^^  keyword.declaration.stable.scala
+//     ^^^ variable.other.declaration.scala
+
+   var Foo = ???
+// ^^^ keyword.declaration.volatile.scala
+//     ^^^  variable.other.declaration.scala
+
+   var foo = ???
+// ^^^ keyword.declaration.volatile.scala
+//     ^^^ variable.other.declaration.scala
+
+  def Foo = ???
+//    ^^^ entity.name.function.declaration
+
+  def foo 
+//    ^^^ entity.name.function.declaration

tests/unit/#51.test.scala

@@ -3,9 +3,9 @@
   object Enum extends Enumeration {
     val Foo, Bar, Baz = Value
 //  ^^^ keyword.declaration.stable.scala
-//      ^^^ constant.other.declaration.scala
-//           ^^^ constant.other.declaration.scala
-//                ^^^ constant.other.declaration.scala
+//      ^^^ variable.other.declaration.scala
+//           ^^^ variable.other.declaration.scala
+//                ^^^ variable.other.declaration.scala
 //                      ^^^^^ entity.name.class
 
   }

tests/unit/unicode.identifiers.test.scala

@@ -56,11 +56,11 @@ class Φδφκξ(x : Int, δφξκξ: Int, val y: Int, val φξ: Int) {
 
   val Constant = 3
 //^^^  keyword.declaration.stable.scala
-//    ^^^^^^^^  constant.other.declaration.scala
+//    ^^^^^^^^  variable.other.declaration.scala
 //             ^  keyword.operator.comparison.scala
   val Константа = 4
 //^^^  keyword.declaration.stable.scala
-//    ^^^^^^^^^  constant.other.declaration.scala
+//    ^^^^^^^^^  variable.other.declaration.scala
 //              ^  keyword.operator.comparison.scala
 
 }