Handle names ending with symbolic characters

Fixes #202
scala · Aug 16, 2021 · f9ea511 · f9ea511
1 parent 0e4f065
commit f9ea511
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -645,7 +645,7 @@ export const scalaTmLanguage: TmLanguage = {
           name: 'keyword.operator.arithmetic.scala'
         },
         {
-          match: `(?<!${opchar})(!|&&|\\|\\|)(?!${opchar})`,
+          match: `(?<!${opchar}|_)(!|&&|\\|\\|)(?!${opchar})`,
           name: 'keyword.operator.logical.scala'
         },
         {
@@ -921,7 +921,7 @@ export const scalaTmLanguage: TmLanguage = {
       comment: 'For themes: Brackets look nice when colored.'
     },
     qualifiedClassName: {
-      match: '(\\b([A-Z][\\w]*))',
+      match: `(\\b([A-Z][\\w]*)(?:(?<=_)${opchar}+)?)`,
       captures: {
         '1': {
           name: 'entity.name.class'

diff --git a/tests/unit/#202.test.scala b/tests/unit/#202.test.scala
@@ -0,0 +1,12 @@
+// SYNTAX TEST "source.scala"
+
+   defn.Any_!
+//      ^^^^^ entity.name.class
+//      ^^^^^ - keyword.operator.logical.scala
+
+   defn.any_!
+//      ^^^^^ - keyword.operator.logical.scala
+
+   def any_!:
+//     ^^^^^ entity.name.function.declaration
+//     ^^^^^ - keyword.operator.logical.scala