Merge pull request #108 from nicolasstucki/fix-#104

Fix #104: Distinguish open declaration `:`

Author: anatoliykmetyuk

src/typescript/Scala.tmLanguage.ts

@@ -557,7 +557,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         {
-          match: '\\b(trait)\\s+([^\\s\\{\\(\\[]+)',
+          match: `\\b(trait)\\s+([^\\s\\{\\(\\[;]+)(?<![^${opchar}]:)`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'
@@ -568,7 +568,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         {
-          match: '\\b(?:(case|open)\\s+)?(class|object)\\s+([^\\s\\{\\(\\[;]+)',
+          match: `\\b(?:(case|open)\\s+)?(class|object)\\s+([^\\s\\{\\(\\[;]+)(?<![^${opchar}]:)`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'

tests/unit/#104.test.scala

@@ -0,0 +1,50 @@
+// SYNTAX TEST "source.scala"
+
+
+class Foo: // shares colour of stable identifier
+//    ^^^ entity.name.class.declaration
+//       ^ keyword.operator.scala
+
+class Bar : // has same colour as declarations
+//    ^^^ entity.name.class.declaration
+//        ^ keyword.operator.scala
+
+trait Foo:
+//    ^^^ entity.name.class.declaration
+//       ^ keyword.operator.scala
+
+trait Bar :
+//    ^^^ entity.name.class.declaration
+//        ^ keyword.operator.scala
+
+object Foo:
+//     ^^^ entity.name.class.declaration
+//        ^ keyword.operator.scala
+
+object Bar :
+//     ^^^ entity.name.class.declaration
+//         ^ keyword.operator.scala
+
+trait *:
+//    ^^ entity.name.class.declaration
+
+trait *: :
+//    ^^ entity.name.class.declaration
+//       ^ keyword.operator.scala
+
+trait :: :
+//    ^^ entity.name.class.declaration
+//       ^ keyword.operator.scala
+
+class ::
+//    ^^ entity.name.class.declaration
+
+class :: :
+//    ^^ entity.name.class.declaration
+//       ^ keyword.operator.scala
+
+   1 :: Nil
+//   ^^ keyword.operator.scala
+
+   1 ::
+//   ^^ keyword.operator.scala