tm-grammars 1.18.1 → 1.18.2

package/README.md

@@ -181,7 +181,7 @@ import { grammars } from 'tm-grammars'
 | `rust` | `rs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/03dc55030b3b2b5c4779d4ac1e2e46cd1f5a6b7c/extensions/rust/syntaxes/rust.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | 16.81 kB |
 | `sas` |  | [rpardee/sas](https://github.com/rpardee/sas/blob/49f6e733c6c0b918a2a825ca2f63dba704f3e8c0/syntaxes/sas.tmLanguage) | [MIT](https://raw.githubusercontent.com/rpardee/sas/master/LICENSE) | `sql` | 9.30 kB |
 | `sass` |  | [TheRealSyler/vscode-sass-indented](https://github.com/TheRealSyler/vscode-sass-indented/blob/7b0bd6bbbb768c0cf21b2aa0899cb872ee42fd50/syntaxes/sass.tmLanguage.json) | [NOASSERTION](https://raw.githubusercontent.com/TheRealSyler/vscode-sass-indented/master/LICENSE) |  | 8.83 kB |
-| `scala` |  | [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/blob/9a238a51aec6abdfa221e9b84e93122a8af965f8/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) |  | 26.73 kB |
+| `scala` |  | [scala/vscode-scala-syntax](https://github.com/scala/vscode-scala-syntax/blob/d868753f29b0281fdf221785d3530d5066f5b77d/syntaxes/Scala.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md) |  | 27.05 kB |
 | `scheme` |  | [sjhuangx/vscode-scheme](https://github.com/sjhuangx/vscode-scheme/blob/4e21683666e1e2edfa21d040ecd427f628e7b5ff/syntaxes/scheme.tmLanguage) | [MIT](https://raw.githubusercontent.com/sjhuangx/vscode-scheme/master/LICENSE.md) |  | 8.08 kB |
 | `scss` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/cf8d61ebd2f022f4ce8280171f0360d1fe0a206d/extensions/scss/syntaxes/scss.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `css` | 25.96 kB |
 | `shaderlab` | `shader` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/shaderlab/syntaxes/shaderlab.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) | `hlsl` | 5.80 kB |

package/grammars/scala.json

@@ -743,20 +743,54 @@
           "match": "^\\s*(end)\\s+(`[^`]+`|(?:[A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}][A-Z\\p{Lt}\\p{Lu}_a-z$\\p{Lo}\\p{Nl}\\p{Ll}0-9]*(?:(?<=_)[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+)?|[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]+))?(?=\\s*(//.*|/\\*(?!.*\\*/\\s*\\S.*).*)?$)"
         },
         {
-          "match": "(==?|!=|<=|>=|<>|<|>)",
-          "name": "keyword.operator.comparison.scala"
-        },
-        {
-          "match": "(-|\\+|\\*|/(?![/*])|%|~)",
-          "name": "keyword.operator.arithmetic.scala"
+          "match": "([!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|[\\\\]){3,}",
+          "name": "keyword.operator.scala"
         },
         {
-          "match": "(?<![!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|_)(!|&&|\\|\\|)(?![!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}])",
-          "name": "keyword.operator.logical.scala"
+          "captures": {
+            "1": {
+              "patterns": [
+                {
+                  "match": "(\\|\\||&&)",
+                  "name": "keyword.operator.logical.scala"
+                },
+                {
+                  "match": "(!=|==|<=|>=)",
+                  "name": "keyword.operator.comparison.scala"
+                },
+                {
+                  "match": "..",
+                  "name": "keyword.operator.scala"
+                }
+              ]
+            }
+          },
+          "match": "((?:[!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|[\\\\]){2,}|_\\*)"
         },
         {
-          "match": "(<-|←|->|→|=>|⇒|\\?|:+|@|\\|)+",
-          "name": "keyword.operator.scala"
+          "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"
+                }
+              ]
+            }
+          },
+          "match": "(?<!_)([!#%&*+\\-\\/:<>=?@^|~\\p{Sm}\\p{So}]|\\\\)"
         }
       ]
     },

package/index.js

@@ -2770,16 +2770,16 @@ export const grammars = [
     source: 'https://github.com/TheRealSyler/vscode-sass-indented/blob/7b0bd6bbbb768c0cf21b2aa0899cb872ee42fd50/syntaxes/sass.tmLanguage.json',
   },
   {
-    byteSize: 27376,
+    byteSize: 27698,
     displayName: 'Scala',
-    hash: 'YOJ8W0TR8t',
-    lastUpdate: '2024-10-09T18:57:37Z',
+    hash: 'TXBe2fD11I',
+    lastUpdate: '2024-10-09T13:56:15Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/scala/vscode-scala-syntax/main/LICENSE.md',
     name: 'scala',
     scopeName: 'source.scala',
-    sha: '9a238a51aec6abdfa221e9b84e93122a8af965f8',
-    source: 'https://github.com/scala/vscode-scala-syntax/blob/9a238a51aec6abdfa221e9b84e93122a8af965f8/syntaxes/Scala.tmLanguage.json',
+    sha: 'd868753f29b0281fdf221785d3530d5066f5b77d',
+    source: 'https://github.com/scala/vscode-scala-syntax/blob/d868753f29b0281fdf221785d3530d5066f5b77d/syntaxes/Scala.tmLanguage.json',
   },
   {
     byteSize: 8270,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tm-grammars",
   "type": "module",
-  "version": "1.18.1",
+  "version": "1.18.2",
   "description": "Collecton of TextMate grammars in JSON",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",