Fix #69: Do not use type definitions to highlight .type

scala · Jun 29, 2020 · 3400412 · 3400412
1 parent 6c995f9
commit 3400412
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -174,6 +174,9 @@ export const scalaTmLanguage: TmLanguage = {
         {
           include: '#scala-symbol'
         },
+        {
+          include: '#singleton-type'
+        },
         {
           include: '#scala-quoted'
         },
@@ -431,6 +434,14 @@ export const scalaTmLanguage: TmLanguage = {
         }
       ]
     },
+    'singleton-type': {
+      match: `\\.(type)(?!${idrest}|[0-9])`,
+      captures: {
+        '1': {
+          name: 'keyword.type.scala'
+        }
+      }
+    },
     'scala-quoted': {
       match: "('\\{|'\\[)(?!')",
       name: 'constant.other.quoted.scala'
@@ -494,7 +505,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         {
-          match: `\\b(type)\\s+(${backQuotedId}|${plainid})`,
+          match: `(?<!\\.)\\b(type)\\s+(${backQuotedId}|${plainid})`,
           captures: {
             '1': {
               name: 'keyword.declaration.scala'

diff --git a/tests/unit/#69.test.scala b/tests/unit/#69.test.scala
@@ -0,0 +1,11 @@
+// SYNTAX TEST "source.scala"
+
+val x = ???
+trait Foo[T <: x.type]
+//               ^^^^ keyword.type.scala
+
+val a: x.type = ???
+//       ^^^^ keyword.type.scala
+
+val b: Foo[x.type] = ???
+//           ^^^^ keyword.type.scala