tm-grammars 1.25.1 → 1.25.2

package/README.md

@@ -26,7 +26,7 @@ import { grammars } from 'tm-grammars'
 | `angular-html` |  | [onivim/vscode-exthost](https://github.com/onivim/vscode-exthost/blob/cfc2a2212de9ea10943af58ebd1817a5ad196463/extensions/html/syntaxes/html-derivative.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/onivim/vscode-exthost/master/LICENSE.txt) |  | `html` `angular-expression` `angular-let-declaration` `angular-template` `angular-template-blocks` | 701.00 B |
 | `angular-ts` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/210541906e5a96ab39f9c753f921b1bd35f4138b/extensions/typescript-basics/syntaxes/TypeScript.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `angular-expression` `angular-inline-style` `angular-inline-template` `angular-let-declaration` `angular-template` `angular-template-blocks` | 160.04 kB |
 | `apache` |  | [colinta/ApacheConf.tmLanguage](https://github.com/colinta/ApacheConf.tmLanguage/blob/1fdb47b6fe2cea20cfedbc522bff3ff1ed656c07/ApacheConf.tmLanguage) | [NOASSERTION](https://raw.githubusercontent.com/colinta/ApacheConf.tmLanguage/main/LICENSE) |  |  | 11.83 kB |
-| `apex` |  | [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage/blob/55c38da229689630908091adb87c04821eb7312a/grammars/apex.tmLanguage) | [NOASSERTION](https://raw.githubusercontent.com/forcedotcom/apex-tmLanguage/main/LICENSE) |  |  | 43.61 kB |
+| `apex` |  | [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage/blob/da22c02d8cd25e455f58e453d26f9f6281269783/grammars/apex.tmLanguage) | [NOASSERTION](https://raw.githubusercontent.com/forcedotcom/apex-tmLanguage/main/LICENSE) |  |  | 43.40 kB |
 | `apl` |  | [kimmolinna/vscode-apl-language](https://github.com/kimmolinna/vscode-apl-language/blob/13541242d9ffae225e89ebba23f9abaa4c60697e/syntaxes/apl.tmLanguage.json) |  |  | `html` `xml` `css` `javascript` `json` | 22.69 kB |
 | `applescript` |  | [textmate/applescript.tmbundle](https://github.com/textmate/applescript.tmbundle/blob/4947cad7494eba084c21cfe04689b4efce96700f/Syntaxes/AppleScript.tmLanguage) |  |  |  | 27.80 kB |
 | `ara` |  | [ara-lang/highlighting](https://github.com/ara-lang/highlighting/blob/ed1dbedcf03d0b67207e41fe2e11218cc925dc0d/syntaxes/ara.json) | [Apache-2.0](https://raw.githubusercontent.com/ara-lang/highlighting/main/LICENSE-APACHE) |  |  | 5.91 kB |

package/grammars/apex.json

@@ -992,16 +992,26 @@
       ]
     },
     "implements-class": {
-      "begin": "(implements)\\b\\s+([_[:alpha:]][_[:alnum:]]*)",
+      "begin": "(implements)\\b",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.implements.apex"
-        },
-        "2": {
-          "name": "entity.name.type.implements.apex"
         }
       },
-      "end": "(?=\\{|extends)"
+      "end": "(?=\\{|extends)",
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "entity.name.type.implements.apex"
+            },
+            "2": {
+              "name": "punctuation.separator.comma.apex"
+            }
+          },
+          "match": "([_[:alpha:]][_[:alnum:]]*)\\b\\s*(,)?"
+        }
+      ]
     },
     "indexer-declaration": {
       "begin": "(?<return_type>(?<type_name>(?:ref\\s+)?(?:(?<identifier>@?[_[:alpha:]][_[:alnum:]]*)\\s*::\\s*)?(?<name_and_type_args>\\g<identifier>\\s*(?<type_args>\\s*<(?:[^<>]|\\g<type_args>)+>\\s*)?)(?:\\s*\\.\\s*\\g<name_and_type_args>)*(?:\\s*\\?\\s*)?(?:\\s*\\[(?:\\s*,\\s*)*]\\s*)*)\\s+)(?<interface_name>\\g<type_name>\\s*\\.\\s*)?(?<indexer_name>this)\\s*(?=\\[)",
@@ -2365,7 +2375,7 @@
       ]
     },
     "switch-statement": {
-      "begin": "(switch)\\b\\s+(on)\\b\\s+(?:(['().?_[:alnum:]]+)\\s*)?(\\{)",
+      "begin": "(switch)\\b\\s+(on)\\b\\s+(.*)(\\{)",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.apex"
@@ -2940,19 +2950,20 @@
       ]
     },
     "when-string": {
-      "begin": "(when)\\b(\\s*)((')['*,._\\s[:alnum:]]+)",
+      "begin": "(when)\\b\\s*('[^\\n']*')(,)?",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
         },
         "2": {
-          "name": "punctuation.whitespace.apex"
+          "patterns": [
+            {
+              "include": "#string-literal"
+            }
+          ]
         },
         "3": {
           "patterns": [
-            {
-              "include": "#when-string-statement"
-            },
             {
               "include": "#punctuation-comma"
             }
@@ -2969,25 +2980,6 @@
         }
       ]
     },
-    "when-string-statement": {
-      "patterns": [
-        {
-          "begin": "'",
-          "beginCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.begin.apex"
-            }
-          },
-          "end": "'",
-          "endCaptures": {
-            "0": {
-              "name": "punctuation.definition.string.end.apex"
-            }
-          },
-          "name": "string.quoted.single.apex"
-        }
-      ]
-    },
     "where-clause": {
       "captures": {
         "1": {

package/index.js

@@ -122,19 +122,19 @@ export const grammars = [
     sourceApi: 'https://api.github.com/repos/colinta/ApacheConf.tmLanguage/contents/ApacheConf.tmLanguage?ref=1fdb47b6fe2cea20cfedbc522bff3ff1ed656c07',
   },
   {
-    byteSize: 44656,
+    byteSize: 44441,
     displayName: 'Apex',
     funding: [
     ],
-    hash: 'sntncG6da5fKwL0nKGu1R4B9g5820bT29fgFrgNfGKs',
-    lastUpdate: '2025-05-27T18:18:24Z',
+    hash: 'M0qEKFTpQDhyUENabySwFERcKfgtlqB_B7-vokG6HqI',
+    lastUpdate: '2025-10-27T11:53:34Z',
     license: 'NOASSERTION',
     licenseUrl: 'https://raw.githubusercontent.com/forcedotcom/apex-tmLanguage/main/LICENSE',
     name: 'apex',
     scopeName: 'source.apex',
-    sha: '55c38da229689630908091adb87c04821eb7312a',
-    source: 'https://github.com/forcedotcom/apex-tmLanguage/blob/55c38da229689630908091adb87c04821eb7312a/grammars/apex.tmLanguage',
-    sourceApi: 'https://api.github.com/repos/forcedotcom/apex-tmLanguage/contents/grammars/apex.tmLanguage?ref=55c38da229689630908091adb87c04821eb7312a',
+    sha: 'da22c02d8cd25e455f58e453d26f9f6281269783',
+    source: 'https://github.com/forcedotcom/apex-tmLanguage/blob/da22c02d8cd25e455f58e453d26f9f6281269783/grammars/apex.tmLanguage',
+    sourceApi: 'https://api.github.com/repos/forcedotcom/apex-tmLanguage/contents/grammars/apex.tmLanguage?ref=da22c02d8cd25e455f58e453d26f9f6281269783',
   },
   {
     byteSize: 23233,

package/package.json

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