Merge pull request #275 from Jentsch/fix-operators

Stop splitting common operators
scala · Oct 11, 2024 · f92d65a · f92d65a
2 parents f450a3d + d868753
commit f92d65a
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 128 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
         "build": "npm-run-all build:syntax build:extension",
         "build:syntax": "ts-node src/typescript/GenerateTmLanguageFile.ts > ./syntaxes/Scala.tmLanguage.json",
         "build:extension": "vsce package --yarn",
-        "test": "npm-run-all test:*",
+        "test": "npm-run-all -c test:*",
         "test:unit": "vscode-tmgrammar-test -s source.scala -g syntaxes/Scala.tmLanguage.json -t 'tests/unit/**/*.test.scala'",
         "test:snap": "vscode-tmgrammar-snap -s source.scala -g syntaxes/Scala.tmLanguage.json -t 'tests/snap/**/*.test.scala'",
         "update:snapshots": "vscode-tmgrammar-snap --updateSnapshot -s source.scala -g syntaxes/Scala.tmLanguage.json -t 'tests/snap/**/*.test.scala'"

diff --git a/src/typescript/Scala.tmLanguage.ts b/src/typescript/Scala.tmLanguage.ts
@@ -9,7 +9,6 @@ const letterChars = `${upperLetterChars}${lowerLetterChars}`
 const letter = `[${letterChars}]`
 const letterOrDigitChars = `${letterChars}0-9`
 const letterOrDigit = `[${letterOrDigitChars}]`
-const alphaId = `${letter}+`
 const letterOrDigitNoDollarSign = letterOrDigit.replace("\\$", "")
 const simpleInterpolatedVariable  = `${letter}${letterOrDigitNoDollarSign}*` // see SIP-11 https://docs.scala-lang.org/sips/string-interpolation.html
 const opchar = `[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]`
@@ -677,21 +676,55 @@ export const scalaTmLanguage: TmLanguage = {
             }
           }
         },
-        {
-          match: '(==?|!=|<=|>=|<>|<|>)',
-          name: 'keyword.operator.comparison.scala'
-        },
-        {
-          match: '(\\-|\\+|\\*|/(?![/*])|%|~)',
-          name: 'keyword.operator.arithmetic.scala'
+        { // Operators with three or more characters
+          match: `(${opchar}|[\\\\]){3,}`,
+          name: 'keyword.operator.scala'
         },
-        {
-          match: `(?<!${opchar}|_)(!|&&|\\|\\|)(?!${opchar})`,
-          name: 'keyword.operator.logical.scala'
+        { // Operators with two characters
+          match: `((?:${opchar}|[\\\\]){2,}|_\\*)`,
+          captures: {
+            '1': {
+              patterns: [
+                {
+                  match: '(\\|\\||&&)',
+                  name: 'keyword.operator.logical.scala'
+                },
+                {
+                  match: '(\\!=|==|\\<=|>=)',
+                  name: 'keyword.operator.comparison.scala'
+                },
+                {
+                  match: '..',
+                  name: 'keyword.operator.scala'
+                }
+              ]
+            }
+          }
         },
-        {
-          match: '(<-|←|->|→|=>|⇒|\\?|\\:+|@|\\|)+',
-          name: 'keyword.operator.scala'
+        { // Operators with one character
+          match: `(?<!_)(${opchar}|\\\\)`,
+          captures: {
+            '1': {
+              patterns: [
+                {
+                  match: '(\\!)',
+                  name: 'keyword.operator.logical.scala'
+                },
+                {
+                  match: '(\\*|-|\\+|/|%|~)',
+                  name: 'keyword.operator.arithmetic.scala'
+                },
+                {
+                  match: '(=|\\<|>)',
+                  name: 'keyword.operator.comparison.scala'
+                },
+                {
+                  match: '.',
+                  name: 'keyword.operator.scala'
+                }
+              ]
+            }
+          }
         }
       ]
     },

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/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
@@ -114,8 +113,7 @@
 #                      ^ source.scala
 #                       ^ source.scala constant.numeric.scala
 #                        ^ source.scala
-#                         ^ source.scala keyword.operator.comparison.scala
-#                          ^ source.scala keyword.operator.comparison.scala
+#                         ^^ source.scala keyword.operator.scala
 #                           ^^^^^^^^ source.scala
 #                                   ^ source.scala meta.bracket.scala
 #                                    ^ source.scala string.quoted.double.scala punctuation.definition.string.begin.scala
@@ -126,8 +124,7 @@
 #^^^^^^^^^^^^^^^^^^ source.scala
 #                  ^^^^ source.scala keyword.control.flow.scala
 #                      ^^^ source.scala
-#                         ^ source.scala keyword.operator.comparison.scala
-#                          ^ source.scala keyword.operator.comparison.scala
+#                         ^^ source.scala keyword.operator.scala
 >               end match
 #^^^^^^^^^^^^^^^^^^^^^^^^ source.scala keyword.control.flow.end.scala
 >            finally
@@ -237,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