Fix handling of \ as an operator

scala · Oct 9, 2024 · 5315ea3 · 5315ea3
1 parent f87ee45
commit 5315ea3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 4 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -677,11 +677,11 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         { // Operators with three or more characters
-          match: `(${opchar}${opchar}${opchar}+)`,
+          match: `(${opchar}|[\\\\]){3,}`,
           name: 'keyword.operator.scala'
         },
         { // Operators with two characters
-          match: `(${opchar}${opchar}|\\\\${opchar})`,
+          match: `((?:${opchar}|[\\\\]){2,})`,
           captures: {
             '1': {
               patterns: [
@@ -702,7 +702,7 @@ export const scalaTmLanguage: TmLanguage = {
           }
         },
         { // Operators with one character
-          match: `(?<!${letter}_)(${opchar})`,
+          match: `(?<!${letter}_)(${opchar}|\\\\)`,
           captures: {
             '1': {
               patterns: [

diff --git a/syntaxes/Scala.tmLanguage.json b/syntaxes/Scala.tmLanguage.json
diff --git a/tests/snap/#191.test.scala b/tests/snap/#191.test.scala
@@ -0,0 +1,3 @@
+a \\\ b
+
+a \+\ b
diff --git a/tests/snap/#191.test.scala.snap b/tests/snap/#191.test.scala.snap
@@ -0,0 +1,10 @@
+>a \\\ b
+#^^ source.scala
+#  ^^^ source.scala keyword.operator.scala
+#     ^^^ source.scala
+>
+>a \+\ b
+#^^ source.scala
+#  ^^^ source.scala keyword.operator.scala
+#     ^^^ source.scala
+>
diff --git a/tests/unit/#191.test.scala b/tests/unit/#191.test.scala
@@ -34,3 +34,18 @@
 //   ^^^ keyword.operator.scala
    a &= b
 //   ^^ keyword.operator.scala
+
+   a \ b
+//   ^ keyword.operator.scala
+
+   a \\ b
+//   ^^ keyword.operator.scala
+
+   a \/ b
+//   ^^ keyword.operator.scala
+
+   a /\ b
+//   ^^ keyword.operator.scala
+
+   a \\\ b
+//   ^^^ keyword.operator.scala