Identify enum as a declaration

scala · Jul 8, 2020 · 55c670d · 55c670d
1 parent 77042c6
commit 55c670d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -612,7 +612,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         {
-          match: `\\b(?:(case|open)\\s+)?(class|object)\\s+([^\\s\\{\\(\\[;]+)(?<![^${opchar}]:)`,
+          match: `\\b(?:(case|open)\\s+)?(class|object|enum)\\s+([^\\s\\{\\(\\[;]+)(?<![^${opchar}]:)`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'
@@ -816,7 +816,7 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'storage.modifier.access'
         },
         {
-          match: '\\b(synchronized|@volatile|abstract|final|lazy|sealed|implicit|enum|inline |opaque |override|@transient|@native)\\b',
+          match: '\\b(synchronized|@volatile|abstract|final|lazy|sealed|implicit|inline |opaque |override|@transient|@native)\\b',
           name: 'storage.modifier.other'
         }
       ]

diff --git a/tests/unit/enum.test.scala b/tests/unit/enum.test.scala
@@ -1,17 +1,17 @@
 // SYNTAX TEST "source.scala"
 
    enum Color:
-// ^^^^ storage.modifier.other
-//      ^^^^ entity.name.class
+// ^^^^ keyword.declaration.scala
+//      ^^^^^ entity.name.class.declaration
     case Red, Green, Blue, Magenta
 //  ^^^^ keyword.control.flow.scala
 //            ^^^^^ entity.name.class
 //                   ^^^^ entity.name.class
 //                         ^^^^^^^ entity.name.class
 
    enum Vehicle(val numberOfWheels: Int):
-// ^^^^ storage.modifier.other
-//      ^^^^^^^ entity.name.class
+// ^^^^ keyword.declaration.scala
+//      ^^^^^^^ entity.name.class.declaration
 //              ^^^ keyword.declaration.stable.scala
 //                  ^^^^^^^^^^^^^^ variable.other.declaration.scala
 //                                  ^^^ entity.name.class