Fix operators starting with an arithmetic operator

Fixes #191
scala · Oct 9, 2024 · 7db8560 · 7db8560
1 parent cdf46b5
commit 7db8560
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -681,6 +681,11 @@ export const scalaTmLanguage: TmLanguage = {
           match: `(<-|←|->|→|=>|⇒|\\?|\\:|@)+${opchar}*`,
           name: 'keyword.operator.scala'
         },
+        { // Arithmetic operators directly follower by another symbol are
+          // just operators like +:, /:, ++
+          match: `(\\-|\\+|\\*|/(?![/*])|%|~)${opchar}+`,
+          name: 'keyword.operator.scala'
+        },
         {
           match: '(==?|!=|<=|>=|<>|<|>)',
           name: 'keyword.operator.comparison.scala'

diff --git a/syntaxes/Scala.tmLanguage.json b/syntaxes/Scala.tmLanguage.json
diff --git a/tests/snap/end.test.scala.snap b/tests/snap/end.test.scala.snap
@@ -96,8 +96,7 @@
 #                        ^ source.scala meta.bracket.scala
 >               y -= 1
 #^^^^^^^^^^^^^^^^^ source.scala
-#                 ^ source.scala keyword.operator.arithmetic.scala
-#                  ^ source.scala keyword.operator.comparison.scala
+#                 ^^ source.scala keyword.operator.scala
 #                   ^ source.scala
 #                    ^ source.scala constant.numeric.scala
 >            end while
@@ -235,8 +234,7 @@
 #                    ^ source.scala
 #                     ^ source.scala keyword.operator.comparison.scala
 #                      ^^^^^ source.scala
-#                           ^ source.scala keyword.operator.arithmetic.scala
-#                            ^ source.scala keyword.operator.arithmetic.scala
+#                           ^^ source.scala keyword.operator.scala
 #                             ^^^^^ source.scala
 >   end extension
 #^^^ source.scala

diff --git a/tests/snap/scala_spec.test.scala.snap b/tests/snap/scala_spec.test.scala.snap
@@ -724,8 +724,7 @@
 #               ^^^^^ source.scala
 #                    ^ source.scala meta.bracket.scala
 #                     ^^^^^^^^ source.scala
-#                             ^ source.scala keyword.operator.arithmetic.scala
-#                              ^ source.scala keyword.operator.comparison.scala
+#                             ^^ source.scala keyword.operator.scala
 #                               ^^^^^ source.scala
 >    result
 #^^^^^^^^^^^ source.scala
@@ -1440,8 +1439,7 @@
 #                        ^ source.scala meta.bracket.scala
 #                         ^ source.scala constant.numeric.scala
 #                          ^ source.scala
-#                           ^ source.scala keyword.operator.arithmetic.scala
-#                            ^ source.scala keyword.operator.scala
+#                           ^^ source.scala keyword.operator.scala
 #                             ^^^ source.scala
 #                                ^ source.scala meta.bracket.scala
 #                                 ^ source.scala
@@ -1673,8 +1671,7 @@
 #                                              ^ source.scala meta.bracket.scala
 >              k += 1
 #^^^^^^^^^^^^^^^^ source.scala
-#                ^ source.scala keyword.operator.arithmetic.scala
-#                 ^ source.scala keyword.operator.comparison.scala
+#                ^^ source.scala keyword.operator.scala
 #                  ^ source.scala
 #                   ^ source.scala constant.numeric.scala
 >            }
@@ -1693,17 +1690,15 @@
 #                       ^^^^^ source.scala
 >            j += 1
 #^^^^^^^^^^^^^^ source.scala
-#              ^ source.scala keyword.operator.arithmetic.scala
-#               ^ source.scala keyword.operator.comparison.scala
+#              ^^ source.scala keyword.operator.scala
 #                ^ source.scala
 #                 ^ source.scala constant.numeric.scala
 >          }
 #^^^^^^^^^^ source.scala
 #          ^ source.scala punctuation.section.block.end.scala
 >          i += 1
 #^^^^^^^^^^^^ source.scala
-#            ^ source.scala keyword.operator.arithmetic.scala
-#             ^ source.scala keyword.operator.comparison.scala
+#            ^^ source.scala keyword.operator.scala
 #              ^ source.scala
 #               ^ source.scala constant.numeric.scala
 >        }
@@ -1771,8 +1766,7 @@
 #      ^ source.scala
 #       ^ source.scala punctuation.section.block.begin.scala
 #        ^^ source.scala
-#          ^ source.scala keyword.operator.arithmetic.scala
-#           ^ source.scala keyword.operator.comparison.scala
+#          ^^ source.scala keyword.operator.scala
 #            ^ source.scala
 #             ^ source.scala constant.numeric.scala
 #              ^ source.scala punctuation.section.block.end.scala
@@ -2183,8 +2177,7 @@
 #^^^^^^^^ source.scala
 #        ^^^^ source.scala keyword.control.flow.scala
 #            ^^^^^^^ source.scala
-#                   ^ source.scala keyword.operator.arithmetic.scala
-#                    ^ source.scala keyword.operator.scala
+#                   ^^ source.scala keyword.operator.scala
 #                     ^^^^^^ source.scala
 #                           ^^ source.scala keyword.operator.scala
 >        case 3 | 5 | 6 =>

diff --git a/tests/unit/#191.test.scala b/tests/unit/#191.test.scala
@@ -18,3 +18,8 @@
 //   ^^^ keyword.operator.scala
    a |+ b
 //   ^^ keyword.operator.scala
+
+   element +: seq
+//         ^^ keyword.operator.scala
+   i -= 1
+//   ^^ keyword.operator.scala