tm-grammars 1.25.3 → 1.26.0

package/NOTICE

@@ -2847,7 +2847,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 =========================================================================================================
 Files:   fish.json
-License: https://raw.githubusercontent.com/bmalehorn/vscode-fish/master/LICENSE
+License: https://raw.githubusercontent.com/bmalehorn/vscode-fish/main/LICENSE
 SPDX:    MIT
 ---------------------------------------------------------------------------------------------------------
 MIT License
@@ -5658,6 +5658,32 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
+=========================================================================================================
+Files:   markdown-nix.json, nix.json
+License: https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE
+SPDX:    MIT
+---------------------------------------------------------------------------------------------------------
+MIT License
+
+Copyright (c) 2020 noor
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 =========================================================================================================
 Files:   markdown-vue.json, vue.json, vue-directives.json, vue-interpolations.json, vue-sfc-style-variable-injection.json
 License: https://raw.githubusercontent.com/vuejs/language-tools/master/LICENSE
@@ -6590,32 +6616,6 @@ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMA
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH 
 THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-=========================================================================================================
-Files:   nix.json
-License: https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE
-SPDX:    MIT
----------------------------------------------------------------------------------------------------------
-MIT License
-
-Copyright (c) 2020 noor
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
 =========================================================================================================
 Files:   nushell.json
 License: https://raw.githubusercontent.com/nushell/vscode-nushell-lang/main/LICENSE
@@ -6849,6 +6849,32 @@ SPDX:    Apache-2.0
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+=========================================================================================================
+Files:   openscad.json
+License: https://raw.githubusercontent.com/tbuser/openscad.tmbundle/master/LICENSE
+SPDX:    MIT
+---------------------------------------------------------------------------------------------------------
+Copyright (c) 2017 Tony Buser
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 =========================================================================================================
 Files:   pascal.json
 License: https://raw.githubusercontent.com/alefragnani/vscode-language-pascal/master/LICENSE.md

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/da22c02d8cd25e455f58e453d26f9f6281269783/grammars/apex.tmLanguage) | [NOASSERTION](https://raw.githubusercontent.com/forcedotcom/apex-tmLanguage/main/LICENSE) |  |  | 43.40 kB |
+| `apex` |  | [forcedotcom/apex-tmLanguage](https://github.com/forcedotcom/apex-tmLanguage/blob/a6af49217b1ddc6475deefe4dff409637aadffcc/grammars/apex.tmLanguage) | [NOASSERTION](https://raw.githubusercontent.com/forcedotcom/apex-tmLanguage/main/LICENSE) |  |  | 44.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 |
@@ -37,7 +37,7 @@ import { grammars } from 'tm-grammars'
 | `ballerina` |  | [ballerina-platform/ballerina-grammar](https://github.com/ballerina-platform/ballerina-grammar/blob/4bf70d328ae9e5a93219e44c031ab3776c76727a/syntaxes/ballerina.tmLanguage) | [Apache-2.0](https://raw.githubusercontent.com/ballerina-platform/ballerina-grammar/master/LICENSE) |  |  | 55.03 kB |
 | `bat` | `batch` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/df15c8e832a341633acd2e9bb26e1b275d09cfe0/extensions/bat/syntaxes/batchfile.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 12.29 kB |
 | `beancount` |  | [Lencerf/vscode-beancount](https://github.com/Lencerf/vscode-beancount/blob/75fc29960fcf6666e4b06310fac4d49a16c57ca0/syntaxes/beancount.tmLanguage) | [MIT](https://raw.githubusercontent.com/Lencerf/vscode-beancount/master/LICENSE) |  |  | 9.90 kB |
-| `berry` | `be` | [berry-lang/berry](https://github.com/berry-lang/berry/blob/a0f5c044a3b593deaf87292ca6f04c2343e53dc8/tools/plugins/vscode/skiars.berry-1.1.0/syntaxes/berry.json) | [MIT](https://raw.githubusercontent.com/berry-lang/berry/master/LICENSE) |  |  | 2.06 kB |
+| `berry` | `be` | [berry-lang/berry](https://github.com/berry-lang/berry/blob/74611286b8d2d2c2ee16ea187029f2a9c4257f5f/tools/plugins/vscode/skiars.berry-1.2.0/syntaxes/berry.json) | [MIT](https://raw.githubusercontent.com/berry-lang/berry/master/LICENSE) |  |  | 2.63 kB |
 | `bibtex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9a2c94d213696a4453b6d9988b003d98e7646e75/extensions/latex/syntaxes/Bibtex.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 4.51 kB |
 | `bicep` |  | [Azure/bicep](https://github.com/Azure/bicep/blob/6252abb94141fc6e774a53652404be30f1cb9000/src/textmate/bicep.tmlanguage) | [MIT](https://raw.githubusercontent.com/Azure/bicep/main/LICENSE) |  |  | 4.92 kB |
 | `blade` |  | [laravel/vs-code-extension](https://github.com/laravel/vs-code-extension/blob/fa52467b5f7393407c9acc9b95d3794f67e266da/syntaxes/blade.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/laravel/vs-code-extension/main/LICENSE.md) |  | `html-derivative` `html` `xml` `sql` `javascript` `json` `css` | 98.91 kB |
@@ -56,7 +56,7 @@ import { grammars } from 'tm-grammars'
 | `coq` |  | [coq-community/vscoq](https://github.com/coq-community/vscoq/blob/201351854c2f8397701d8cf51d923f5a7946a8a2/client/syntax/coq.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/rocq-prover/vsrocq/main/LICENSE) |  |  | 5.11 kB |
 | `cpp` | `c++` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/6ac83c7c7dda9f27ca1fe9d98675253e010b75d1/extensions/cpp/syntaxes/cpp.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `cpp-macro` `regexp` `glsl` `sql` | 372.71 kB |
 | `crystal` |  | [crystal-lang-tools/vscode-crystal-lang](https://github.com/crystal-lang-tools/vscode-crystal-lang/blob/c920b0931ec5f05b78447dbff31b172c64f1d734/syntaxes/crystal.json) | [MIT](https://raw.githubusercontent.com/crystal-lang-tools/vscode-crystal-lang/master/LICENSE) |  | `html` `sql` `css` `c` `javascript` `shellscript` | 27.39 kB |
-| `csharp` | `c#` `cs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e6cffb21362b6d7addb977ff7db14f0681228780/extensions/csharp/syntaxes/csharp.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 80.42 kB |
+| `csharp` | `c#` `cs` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/2716852bf1179651402288d6363b5b63873bb36e/extensions/csharp/syntaxes/csharp.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 82.44 kB |
 | `css` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/210541906e5a96ab39f9c753f921b1bd35f4138b/extensions/css/syntaxes/css.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 46.93 kB |
 | `csv` |  | [mechatroner/vscode_rainbow_csv](https://github.com/mechatroner/vscode_rainbow_csv/blob/3bdafafa12940a75166089b64bdd80b1d3b071db/syntaxes/csv.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/mechatroner/vscode_rainbow_csv/master/LICENSE) |  |  | 1017.00 B |
 | `cue` |  | [cue-lang/vscode-cue](https://github.com/cue-lang/vscode-cue/blob/a9ee96a7e61fb8acd39f7403144d0b6f45652987/extension/syntaxes/cue.tmLanguage.json) | [NOASSERTION](https://raw.githubusercontent.com/cue-lang/vscode-cue/master/LICENSE) |  |  | 15.09 kB |
@@ -76,7 +76,7 @@ import { grammars } from 'tm-grammars'
 | `erb` |  | [textmate/ruby.tmbundle](https://github.com/textmate/ruby.tmbundle/blob/ecf0f1df23984bcff9b51552e35d9696cb0d9539/Syntaxes/HTML%20(Ruby%20-%20ERB).tmLanguage) |  |  | `html` `ruby` | 1.90 kB |
 | `erlang` | `erl` | [erlang-ls/grammar](https://github.com/erlang-ls/grammar/blob/fe898becd3004bcb4947ab50d6b6b830fbfb9228/Erlang.plist) | [Apache-2.0](https://raw.githubusercontent.com/erlang-ls/grammar/main/LICENSE) |  | `markdown` | 35.64 kB |
 | `fennel` |  | [kongeor/vsc-fennel](https://github.com/kongeor/vsc-fennel/blob/664148923d7bd72531120d0cba712c6dba6f698d/syntaxes/fennel.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/kongeor/vsc-fennel/master/LICENSE) |  |  | 4.53 kB |
-| `fish` |  | [bmalehorn/vscode-fish](https://github.com/bmalehorn/vscode-fish/blob/8288b88c46ebe1ef2876fd4275450fc80c5a176a/syntaxes/fish.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/bmalehorn/vscode-fish/master/LICENSE) |  |  | 12.27 kB |
+| `fish` |  | [bmalehorn/vscode-fish](https://github.com/bmalehorn/vscode-fish/blob/8288b88c46ebe1ef2876fd4275450fc80c5a176a/syntaxes/fish.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/bmalehorn/vscode-fish/main/LICENSE) |  |  | 12.27 kB |
 | `fluent` | `ftl` | [macabeus/vscode-fluent](https://github.com/macabeus/vscode-fluent/blob/8544ea296a7769a359f43ddff4dc4b6c61f5cf59/syntaxes/fluent.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/macabeus/vscode-fluent/master/LICENSE) |  |  | 3.38 kB |
 | `fortran-fixed-form` | `f` `for` `f77` | [fortran-lang/vscode-fortran-support](https://github.com/fortran-lang/vscode-fortran-support/blob/e642012094fc0a7379f204bb4e61243005afb1da/syntaxes/fortran_fixed-form.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fortran-lang/vscode-fortran-support/main/LICENSE) |  | `fortran-free-form` | 903.00 B |
 | `fortran-free-form` | `f90` `f95` `f03` `f08` `f18` | [fortran-lang/vscode-fortran-support](https://github.com/fortran-lang/vscode-fortran-support/blob/f7fb41579770a0d8c75b9f295d167b31147b4f33/syntaxes/fortran_free-form.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fortran-lang/vscode-fortran-support/main/LICENSE) |  |  | 82.16 kB |
@@ -128,7 +128,7 @@ import { grammars } from 'tm-grammars'
 | `kotlin` | `kt` `kts` | [fwcd/vscode-kotlin](https://github.com/fwcd/vscode-kotlin/blob/626e20d5c51a4379c4c0ee293aa89e58b5232aec/syntaxes/kotlin.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/fwcd/vscode-kotlin/main/LICENSE) |  |  | 8.19 kB |
 | `kusto` | `kql` | [rosshamish/kuskus](https://github.com/rosshamish/kuskus/blob/2628495122cd3b0cc4b4c6ba6e0f6efd621ed9f6/kusto-syntax-highlighting/syntaxes/kusto.tmLanguage.json) |  |  |  | 14.28 kB |
 | `latex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e6cffb21362b6d7addb977ff7db14f0681228780/extensions/latex/syntaxes/LaTeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `tex` `shellscript` `css` `gnuplot` `haskell` `html` `java` `julia` `javascript` `lua` `python` `ruby` `rust` `typescript` `xml` `yaml` `scala` | 67.56 kB |
-| `lean` | `lean4` | [leanprover/vscode-lean4](https://github.com/leanprover/vscode-lean4/blob/7071db855efdc3286a22376704b2279633cba614/vscode-lean4/syntaxes/lean4.json) | [Apache-2.0](https://raw.githubusercontent.com/leanprover/vscode-lean4/master/LICENSE) |  |  | 5.42 kB |
+| `lean` | `lean4` | [leanprover/vscode-lean4](https://github.com/leanprover/vscode-lean4/blob/21bb405859c856b869e517f479546e1b365037a5/vscode-lean4/syntaxes/lean4.json) | [Apache-2.0](https://raw.githubusercontent.com/leanprover/vscode-lean4/master/LICENSE) |  |  | 5.42 kB |
 | `less` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/03dc55030b3b2b5c4779d4ac1e2e46cd1f5a6b7c/extensions/less/syntaxes/less.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 92.58 kB |
 | `liquid` |  | [Shopify/liquid-tm-grammar](https://github.com/Shopify/liquid-tm-grammar/blob/099adcf0d4beacd078a22432eaeab08d6f1e6da5/grammars/liquid.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/Shopify/liquid-tm-grammar/main/LICENSE.md) |  | `html` `css` `json` `javascript` | 16.94 kB |
 | `llvm` |  | [llvm/llvm-project](https://github.com/llvm/llvm-project/blob/224873d7acab430d29c978136418c40fa028a40d/llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml) | [NOASSERTION](https://raw.githubusercontent.com/llvm/llvm-project/main/LICENSE.TXT) |  |  | 4.55 kB |
@@ -147,14 +147,15 @@ import { grammars } from 'tm-grammars'
 | `mojo` |  | [modularml/mojo-syntax](https://github.com/modularml/mojo-syntax/blob/46eccdaeda2b1587e9b82808cdb35670f359d16d/syntaxes/mojo.syntax.json) | [MIT](https://raw.githubusercontent.com/modular/mojo-syntax/main/LICENSE) |  |  | 65.93 kB |
 | `move` |  | [damirka/move-syntax](https://github.com/damirka/move-syntax/blob/8b90e571e35f7bbda165a1ddd1794e5176831a90/syntaxes/move.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/damirka/move-syntax/main/LICENSE) |  |  | 16.42 kB |
 | `narrat` | `nar` | [liana-p/narrat-syntax-highlighting-vscode](https://github.com/liana-p/narrat-syntax-highlighting-vscode/blob/00d4b410338fc50ca0ce77a1f7e873c1fb66d376/syntaxes/narrat.tmLanguage.yaml) | [MIT](https://raw.githubusercontent.com/liana-p/narrat-syntax-highlighting-vscode/main/LICENSE) |  |  | 3.38 kB |
-| `nextflow` | `nf` | [nextflow-io/vscode-language-nextflow](https://github.com/nextflow-io/vscode-language-nextflow/blob/165b1a3b8d4f25b1eebc81976c62eae44e2d5dd2/syntaxes/nextflow.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nextflow-io/vscode-language-nextflow/main/LICENSE.md) |  |  | 3.86 kB |
+| `nextflow` | `nf` | [nextflow-io/vscode-language-nextflow](https://github.com/nextflow-io/vscode-language-nextflow/blob/720a2bd501837ca815acf4a225d9f3ba71a2adb0/syntaxes/nextflow.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nextflow-io/vscode-language-nextflow/main/LICENSE.md) |  |  | 4.11 kB |
 | `nginx` |  | [hangxingliu/vscode-nginx-conf-hint](https://github.com/hangxingliu/vscode-nginx-conf-hint/blob/49159c02fd09dce264ded7802c9499a0f09646f5/src/syntax/nginx.tmLanguage) | [GPL-3.0](https://raw.githubusercontent.com/hangxingliu/vscode-nginx-conf-hint/main/LICENSE) |  | `lua` | 33.88 kB |
 | `nim` |  | [pragmagic/vscode-nim](https://github.com/pragmagic/vscode-nim/blob/0272a0544ddf147fde98f8a8f2b624b7dcb19eb3/syntaxes/nim.json) | [NOASSERTION](https://raw.githubusercontent.com/pragmagic/vscode-nim/master/LICENSE) |  | `c` `html` `xml` `javascript` `css` `glsl` `markdown` | 20.78 kB |
-| `nix` |  | [nix-community/vscode-nix-ide](https://github.com/nix-community/vscode-nix-ide/blob/fe0a5763cbe937ffcb00846b053b9928fc919f7e/syntaxes/nix.YAML-tmLanguage) | [MIT](https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE) | [GitHub Sponsors: **@nix-community**](https://github.com/sponsors/nix-community) [Open Collective: **nix-community**](https://opencollective.com/nix-community) |  | 13.79 kB |
+| `nix` |  | [nix-community/vscode-nix-ide](https://github.com/nix-community/vscode-nix-ide/blob/effbf3494a43250a537834805b305793994b9ca8/dist/nix.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE) | [GitHub Sponsors: **@nix-community**](https://github.com/sponsors/nix-community) [Open Collective: **nix-community**](https://opencollective.com/nix-community) | `markdown-nix` | 13.87 kB |
 | `nushell` | `nu` | [nushell/vscode-nushell-lang](https://github.com/nushell/vscode-nushell-lang/blob/544de244f118d57d78f0971c1797d427e90d2cb6/syntaxes/nushell.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nushell/vscode-nushell-lang/main/LICENSE) |  |  | 19.24 kB |
 | `objective-c` | `objc` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/bd1abe08c38bb5deccf65610f8f3c03d2338d20d/extensions/objective-c/syntaxes/objective-c.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 100.65 kB |
 | `objective-cpp` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/bd1abe08c38bb5deccf65610f8f3c03d2338d20d/extensions/objective-c/syntaxes/objective-c++.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 163.50 kB |
 | `ocaml` |  | [reasonml-editor/vscode-reasonml](https://github.com/reasonml-editor/vscode-reasonml/blob/14af625ec50ed9968b957b4d6336c5338d81af45/syntaxes/ocaml.json) | [Apache-2.0](https://raw.githubusercontent.com/reasonml-editor/vscode-reasonml/master/LICENSE) |  |  | 58.98 kB |
+| `openscad` | `scad` | [tbuser/openscad.tmbundle](https://github.com/tbuser/openscad.tmbundle/blob/5962175ed355c2d58dc1991801c229809363e999/Syntaxes/OpenSCAD.tmLanguage) | [MIT](https://raw.githubusercontent.com/tbuser/openscad.tmbundle/master/LICENSE) |  |  | 2.58 kB |
 | `pascal` |  | [alefragnani/vscode-language-pascal](https://github.com/alefragnani/vscode-language-pascal/blob/f2d6345bd9fe83932f4d04fcacf98ce7d74b8034/syntaxes/pascal.tmLanguage) | [MIT](https://raw.githubusercontent.com/alefragnani/vscode-language-pascal/master/LICENSE.md) | [GitHub Sponsors: **@alefragnani**](https://github.com/sponsors/alefragnani) [Patreon: **alefragnani**](https://patreon.com/alefragnani) [paypal.com](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=EP57F3B6FXKTU&lc=US&item_name=Alessandro%20Fragnani&item_number=vscode%20extensions&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted) |  | 3.89 kB |
 | `perl` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/e637ff1bf7f481134849625e982ec80df9b35bc8/extensions/perl/syntaxes/perl.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `html` `xml` `css` `javascript` `sql` | 40.89 kB |
 | `php` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/0ac234bbd0b6dd67efa40d1b593f9808f9dfdaf4/extensions/php/syntaxes/php.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `html` `xml` `sql` `javascript` `json` `css` | 104.80 kB |
@@ -197,7 +198,7 @@ import { grammars } from 'tm-grammars'
 | `shellscript` | `bash` `sh` `shell` `zsh` | [microsoft/vscode](https://github.com/microsoft/vscode/blob/9473445f7d3dcb5c579f42ece8b6c18c43c63ed3/extensions/shellscript/syntaxes/shell-unix-bash.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 38.98 kB |
 | `shellsession` | `console` | [hronro/sublime-linguist-syntax](https://github.com/hronro/sublime-linguist-syntax/blob/9c84f1d69dbe89bc23292f129cf2d408a9c7afe1/syntaxes/ShellSession.tmLanguage) | [MIT](https://raw.githubusercontent.com/hronro/sublime-linguist-syntax/master/LICENSE) |  | `shellscript` | 513.00 B |
 | `smalltalk` |  | [leocamello/vscode-smalltalk](https://github.com/leocamello/vscode-smalltalk/blob/15ff58e2236127f682a33da12e931d74e0d17979/syntaxes/smalltalk.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/leocamello/vscode-smalltalk/master/LICENSE) |  |  | 6.22 kB |
-| `solidity` |  | [juanfranblanco/vscode-solidity](https://github.com/juanfranblanco/vscode-solidity/blob/00abfad973f7a2f4fd105e05641344e160020369/syntaxes/solidity.json) | [MIT](https://raw.githubusercontent.com/juanfranblanco/vscode-solidity/master/License.txt) |  |  | 15.21 kB |
+| `solidity` |  | [juanfranblanco/vscode-solidity](https://github.com/juanfranblanco/vscode-solidity/blob/4c71312a6cfa3ddd7124e8dcad129705fa9d35d0/syntaxes/solidity.json) | [MIT](https://raw.githubusercontent.com/juanfranblanco/vscode-solidity/master/License.txt) |  |  | 15.05 kB |
 | `soy` | `closure-templates` | [mthadley/language-closure-templates](https://github.com/mthadley/language-closure-templates/blob/7caf3a1fad0245c4196d3766ba0f481762fbc92e/grammars/closure-templates.json) | [MIT](https://raw.githubusercontent.com/mthadley/language-closure-templates/master/LICENSE) |  | `html` | 6.40 kB |
 | `sparql` |  | [stardog-union/stardog-vsc](https://github.com/stardog-union/stardog-vsc/blob/a1963c610cde0eab23c44fc01ab36652565524de/stardog-rdf-grammars/syntaxes/sparql.tmLanguage.json) |  |  | `turtle` | 1.30 kB |
 | `splunk` | `spl` | [arcsector/vscode-splunk-search-syntax](https://github.com/arcsector/vscode-splunk-search-syntax/blob/b1f68ff035950e6a98e0db4af1a338cb1c3c1858/syntaxes/splunk_search.tmLanguage) | [MIT](https://raw.githubusercontent.com/arcsector/vscode-splunk-search-syntax/master/LICENSE.txt) |  |  | 3.18 kB |
@@ -214,7 +215,7 @@ import { grammars } from 'tm-grammars'
 | `tcl` |  | [sleutho/tcl](https://github.com/sleutho/tcl/blob/f18820ad14678bc033f0a35524820c90fe50f18b/syntaxes/tcl.tmLanguage) |  |  |  | 4.12 kB |
 | `templ` |  | [templ-go/templ-vscode](https://github.com/templ-go/templ-vscode/blob/d0af70c97ed384e93892c46b93d622ffaba5d93c/syntaxes/templ.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/templ-go/templ-vscode/main/LICENSE) |  | `go` `javascript` `css` | 23.04 kB |
 | `terraform` | `tf` `tfvars` | [hashicorp/syntax](https://github.com/hashicorp/syntax/blob/cc2b4d4fe389f14b8a13937f4e0d7b2811b57588/syntaxes/terraform.tmGrammar.json) | [MPL-2.0](https://raw.githubusercontent.com/hashicorp/syntax/main/LICENSE) |  |  | 10.79 kB |
-| `tex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/0af4f80b051adfb7a46f3bb9499bcc1aa4ba0665/extensions/latex/syntaxes/TeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `r` | 9.10 kB |
+| `tex` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/2716852bf1179651402288d6363b5b63873bb36e/extensions/latex/syntaxes/TeX.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `r` | 9.11 kB |
 | `toml` |  | [textmate/toml.tmbundle](https://github.com/textmate/toml.tmbundle/blob/e82b64c1e86396220786846201e9aa3f0a2d9ca2/Syntaxes/TOML.tmLanguage) |  |  |  | 5.98 kB |
 | `ts-tags` | `lit` | - |  |  | `typescript` `es-tag-css` `es-tag-glsl` `es-tag-html` `es-tag-sql` `es-tag-xml` | 121.00 B |
 | `tsv` |  | [mechatroner/vscode_rainbow_csv](https://github.com/mechatroner/vscode_rainbow_csv/blob/00d4c947f1bbe6a4a73599bd97fb31bdfbe262f3/syntaxes/tsv.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/mechatroner/vscode_rainbow_csv/master/LICENSE) |  |  | 633.00 B |
@@ -222,7 +223,7 @@ import { grammars } from 'tm-grammars'
 | `turtle` |  | [stardog-union/stardog-vsc](https://github.com/stardog-union/stardog-vsc/blob/3f1364b08bdbf4b4d77f123682db7d2b708b2f6e/stardog-rdf-grammars/syntaxes/turtle.tmLanguage.json) |  |  |  | 3.49 kB |
 | `twig` |  | [mblode/vscode-twig-language-2](https://github.com/mblode/vscode-twig-language-2/blob/82ae07ffe96656181ad8265c1fff008c8d1cdbba/src/syntaxes/twig.tmLanguage) | [MIT](https://raw.githubusercontent.com/mblode/vscode-twig-language-2/master/LICENSE.md) | [GitHub Sponsors: **@mblode**](https://github.com/sponsors/mblode) | `css` `javascript` `scss` `php` `python` `ruby` | 19.59 kB |
 | `typescript` | `ts` `cts` `mts` | [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) |  |  | 160.03 kB |
-| `typespec` | `tsp` | [microsoft/typespec](https://github.com/microsoft/typespec/blob/b4b7705c61f186590c6a6d086a131cd71ee4c48c/grammars/typespec.json) | [MIT](https://raw.githubusercontent.com/microsoft/typespec/main/LICENSE) |  |  | 22.22 kB |
+| `typespec` | `tsp` | [microsoft/typespec](https://github.com/microsoft/typespec/blob/2894420921882652a568ed22d5e245b26781b398/grammars/typespec.json) | [MIT](https://raw.githubusercontent.com/microsoft/typespec/main/LICENSE) |  |  | 22.57 kB |
 | `typst` | `typ` | [nvarner/typst-lsp](https://github.com/nvarner/typst-lsp/blob/6972d4b9c2cbcb0551e203067f09ec84ca8f9df3/editors/vscode/typst.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/nvarner/typst-lsp/master/LICENSE-MIT.txt) |  |  | 7.83 kB |
 | `v` |  | [vlang/vscode-vlang](https://github.com/vlang/vscode-vlang/blob/dd675d51adac26ca3154938de18eaaecbbcbffd9/syntaxes/v.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/vlang/vscode-vlang/master/LICENSE) |  |  | 12.43 kB |
 | `vala` |  | [vala-lang/vala-vscode](https://github.com/vala-lang/vala-vscode/blob/8f825e95648326df2572d0522632251cdff4a43b/syntaxes/vala.YAML-tmLanguage) | [MIT](https://raw.githubusercontent.com/vala-lang/vala-vscode/master/LICENSE) |  |  | 3.12 kB |
@@ -230,7 +231,7 @@ import { grammars } from 'tm-grammars'
 | `verilog` |  | [mshr-h/vscode-verilog-hdl-support](https://github.com/mshr-h/vscode-verilog-hdl-support/blob/26cc4a3ec01b12aea5b8ffb7edeee3373eb71d77/syntaxes/verilog.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/mshr-h/vscode-verilog-hdl-support/main/LICENSE) | [buymeacoffee.com](https://www.buymeacoffee.com/mshr.h) |  | 5.60 kB |
 | `vhdl` |  | [jonasjj/awesome-vhdl](https://github.com/jonasjj/awesome-vhdl/blob/b787559a47d64c7baf2a9ac0f4cac8e2e721cddc/syntaxes/vhdl.tmLanguage) | [MIT](https://raw.githubusercontent.com/jonasjj/awesome-vhdl/master/LICENSE.txt) |  |  | 22.98 kB |
 | `viml` | `vim` `vimscript` | [dunstontc/viml](https://github.com/dunstontc/viml/blob/8762570fc7d6f1009a3c93efd2a337330d88b88e/syntaxes/viml.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/dunstontc/viml/master/LICENSE) |  |  | 19.58 kB |
-| `vue` |  | [vuejs/language-tools](https://github.com/vuejs/language-tools/blob/68d98dc57f8486c2946ae28dc86bf8e91d45da4d/extensions/vscode/syntaxes/vue.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/vuejs/language-tools/master/LICENSE) | [GitHub Sponsors: **@johnsoncodehk**](https://github.com/sponsors/johnsoncodehk) | `markdown` `pug` `stylus` `sass` `css` `scss` `less` `javascript` `typescript` `jsx` `tsx` `coffee` `json` `jsonc` `json5` `yaml` `toml` `graphql` `html-derivative` `html` `markdown-vue` `vue-directives` `vue-interpolations` `vue-sfc-style-variable-injection` | 17.10 kB |
+| `vue` |  | [vuejs/language-tools](https://github.com/vuejs/language-tools/blob/d937a84e41bdf3b64b6f0330dc2ddf1e3240c09d/extensions/vscode/syntaxes/vue.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/vuejs/language-tools/master/LICENSE) | [GitHub Sponsors: **@johnsoncodehk**](https://github.com/sponsors/johnsoncodehk) | `markdown` `pug` `stylus` `sass` `css` `scss` `less` `javascript` `typescript` `jsx` `tsx` `coffee` `json` `jsonc` `json5` `yaml` `toml` `graphql` `html-derivative` `html` `markdown-vue` `vue-directives` `vue-interpolations` `vue-sfc-style-variable-injection` | 17.14 kB |
 | `vue-html` |  | [vuejs/vetur](https://github.com/vuejs/vetur/blob/53ee52746b1f26f44391c3764bc7bd06d4ddaa46/syntaxes/vue-html.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/vuejs/vetur/master/LICENSE) | [GitHub Sponsors: **@octref**](https://github.com/sponsors/octref) [IssueHunt: **vuejs/vetur**](https://issuehunt.io/r/vuejs/vetur) | `vue` `javascript` | 8.04 kB |
 | `vue-vine` |  | [vue-vine/assets](https://github.com/vue-vine/assets/blob/2921493f703bfcf64aed5644f275e7e65f2e0a48/grammars/vue-vine.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/vue-vine/assets/main/LICENSE) |  | `css` `scss` `less` `stylus` `postcss` `vue` `javascript` | 169.46 kB |
 | `vyper` | `vy` | [tintinweb/vscode-vyper](https://github.com/tintinweb/vscode-vyper/blob/3df08ea46fc7df1a5e7f35365e615624849d1c1b/syntaxes/vyper.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/tintinweb/vscode-vyper/master/LICENSE) |  |  | 71.02 kB |
@@ -244,7 +245,7 @@ import { grammars } from 'tm-grammars'
 | `xsl` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/8fdf170a0850c1cc027382f31650aaf300d3ae2a/extensions/xml/syntaxes/xsl.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  | `xml` | 1.20 kB |
 | `yaml` | `yml` | [textmate/yaml.tmbundle](https://github.com/textmate/yaml.tmbundle/blob/e54ceae3b719506dba7e481a77cea4a8b576ae46/Syntaxes/YAML.tmLanguage) |  |  |  | 9.75 kB |
 | `zenscript` |  | [CraftTweaker/ZenScript-tmLanguage](https://github.com/CraftTweaker/ZenScript-tmLanguage/blob/5a7bcb775a6fb37470e56f904e70d8b8b9e6b047/zenscript.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/CraftTweaker/ZenScript-tmLanguage/master/LICENSE) |  |  | 3.62 kB |
-| `zig` |  | [ziglang/vscode-zig](https://github.com/ziglang/vscode-zig/blob/9c7bb7631f3af99331475b633aaf5b70345c6713/syntaxes/zig.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/ziglang/vscode-zig/master/LICENSE) | [GitHub Sponsors: **@ziglang**](https://github.com/sponsors/ziglang) |  | 4.93 kB |
+| `zig` |  | [ziglang/vscode-zig](https://github.com/ziglang/vscode-zig/blob/9c7bb7631f3af99331475b633aaf5b70345c6713/syntaxes/zig.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/ziglang/vscode-zig/master/LICENSE) | [ziglang.org](https://ziglang.org/zsf) |  | 4.93 kB |
 
 ## Injections
 
@@ -265,6 +266,7 @@ Injections are grammars that are embedded in other grammars. They are used to ag
 | `es-tag-sql` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-sql.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `typescript` `sql` | 1.45 kB |
 | `es-tag-xml` |  | [0x00000001A/es6-string-html](https://github.com/0x00000001A/es6-string-html/blob/b8f51210b53ce64e789949d4be33b7ecb42cf177/syntaxes/es6-inline-xml.json) | [MIT](https://raw.githubusercontent.com/0x00000001A/es6-string-html/master/LICENSE) | [Buy Me A Coffee: **nonholy**](https://www.buymeacoffee.com/nonholy) | `xml` | 1.04 kB |
 | `jinja-html` |  | [samuelcolvin/jinjahtml-vscode](https://github.com/samuelcolvin/jinjahtml-vscode/blob/64ad369cd167bba2e614944db6d925b7dc6483b4/syntaxes/jinja-html.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/samuelcolvin/jinjahtml-vscode/main/LICENSE) | [GitHub Sponsors: **@samuelcolvin**](https://github.com/sponsors/samuelcolvin) | `html` | 465.00 B |
+| `markdown-nix` |  | [nix-community/vscode-nix-ide](https://github.com/nix-community/vscode-nix-ide/blob/effbf3494a43250a537834805b305793994b9ca8/dist/injection.json) | [MIT](https://raw.githubusercontent.com/nix-community/vscode-nix-ide/main/LICENSE) | [GitHub Sponsors: **@nix-community**](https://github.com/sponsors/nix-community) [Open Collective: **nix-community**](https://opencollective.com/nix-community) |  | 758.00 B |
 | `markdown-vue` |  | [vuejs/language-tools](https://github.com/vuejs/language-tools/blob/e85556a2e4bf0d6c981bdbd95c8a0b1e85e7ae8a/extensions/vscode/syntaxes/markdown-vue.json) | [MIT](https://raw.githubusercontent.com/vuejs/language-tools/master/LICENSE) | [GitHub Sponsors: **@johnsoncodehk**](https://github.com/sponsors/johnsoncodehk) |  | 679.00 B |
 | `vue-directives` |  | [vuejs/language-tools](https://github.com/vuejs/language-tools/blob/d5ab9edcf4a18d9c25c143a37cc3ec95229fc6b1/extensions/vscode/syntaxes/vue-directives.json) | [MIT](https://raw.githubusercontent.com/vuejs/language-tools/master/LICENSE) | [GitHub Sponsors: **@johnsoncodehk**](https://github.com/sponsors/johnsoncodehk) |  | 366.00 B |
 | `vue-interpolations` |  | [vuejs/language-tools](https://github.com/vuejs/language-tools/blob/e85556a2e4bf0d6c981bdbd95c8a0b1e85e7ae8a/extensions/vscode/syntaxes/vue-interpolations.json) | [MIT](https://raw.githubusercontent.com/vuejs/language-tools/master/LICENSE) | [GitHub Sponsors: **@johnsoncodehk**](https://github.com/sponsors/johnsoncodehk) |  | 349.00 B |

package/grammars/apex.json

@@ -343,6 +343,9 @@
         {
           "include": "#method-declaration"
         },
+        {
+          "include": "#initializer-block"
+        },
         {
           "include": "#punctuation-semicolon"
         }
@@ -513,6 +516,23 @@
         }
       ]
     },
+    "dml-expression": {
+      "begin": "\\b(delete|insert|undelete|update|upsert)\\b\\s+(?!new\\b)",
+      "beginCaptures": {
+        "1": {
+          "name": "support.function.apex"
+        }
+      },
+      "end": "(?<=;)",
+      "patterns": [
+        {
+          "include": "#expression"
+        },
+        {
+          "include": "#punctuation-semicolon"
+        }
+      ]
+    },
     "do-statement": {
       "begin": "(?<!\\.)\\b(do)\\b",
       "beginCaptures": {
@@ -653,6 +673,9 @@
         {
           "include": "#comment"
         },
+        {
+          "include": "#dml-expression"
+        },
         {
           "include": "#merge-expression"
         },
@@ -772,16 +795,35 @@
       ]
     },
     "extends-class": {
-      "begin": "(extends)\\b\\s+([_[:alpha:]][_[:alnum:]]*)",
+      "begin": "(extends)\\b\\s+",
       "beginCaptures": {
         "1": {
           "name": "keyword.other.extends.apex"
-        },
-        "2": {
-          "name": "entity.name.type.extends.apex"
         }
       },
-      "end": "(?=\\{|implements)"
+      "end": "(?=\\{|implements)",
+      "patterns": [
+        {
+          "begin": "(?=[_[:alpha:]][_[:alnum:]]*\\s*\\.)",
+          "end": "(?=\\{|implements)",
+          "patterns": [
+            {
+              "include": "#support-type"
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "entity.name.type.extends.apex"
+            }
+          },
+          "match": "([_[:alpha:]][_[:alnum:]]*)"
+        }
+      ]
     },
     "field-declaration": {
       "begin": "(?<type_name>(?:(?<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+(\\g<identifier>)\\s*(?!=[=>])(?=[,;=]|$)",
@@ -1000,6 +1042,18 @@
       },
       "end": "(?=\\{|extends)",
       "patterns": [
+        {
+          "begin": "(?=[_[:alpha:]][_[:alnum:]]*\\s*\\.)",
+          "end": "(?=\\{|extends|,)",
+          "patterns": [
+            {
+              "include": "#support-type"
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
         {
           "captures": {
             "1": {
@@ -1010,6 +1064,9 @@
             }
           },
           "match": "([_[:alpha:]][_[:alnum:]]*)\\b\\s*(,)?"
+        },
+        {
+          "include": "#punctuation-comma"
         }
       ]
     },
@@ -1053,6 +1110,25 @@
         }
       ]
     },
+    "initializer-block": {
+      "begin": "\\{",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.curlybrace.open.apex"
+        }
+      },
+      "end": "}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.curlybrace.close.apex"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#statement"
+        }
+      ]
+    },
     "initializer-expression": {
       "begin": "\\{",
       "beginCaptures": {
@@ -1680,7 +1756,7 @@
           "name": "entity.name.variable.parameter.apex"
         }
       },
-      "match": "(?:\\b(this)\\b\\s+)?(?<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+(\\g<identifier>)"
+      "match": "(?:\\b(this|final)\\b\\s+)?(?<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+(\\g<identifier>)"
     },
     "parenthesized-expression": {
       "begin": "\\(",
@@ -2739,7 +2815,7 @@
           "name": "keyword.type.apex"
         }
       },
-      "match": "\\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|ID|Integer|Long|Object|String|Time|void)\\b"
+      "match": "\\b(Blob|Boolean|byte|Date|Datetime|Decimal|Double|Id|ID|Integer|Long|Object|String|Time|void)\\b"
     },
     "type-declarations": {
       "patterns": [
@@ -2875,7 +2951,7 @@
           "name": "keyword.control.switch.else.apex"
         }
       },
-      "end": "(?<=})",
+      "end": "(?=})|(?=when\\b)",
       "patterns": [
         {
           "include": "#block"
@@ -2892,13 +2968,16 @@
           "name": "keyword.control.switch.when.apex"
         }
       },
-      "end": "(?<=})",
+      "end": "(?=})|(?=when\\b)",
       "patterns": [
         {
           "include": "#block"
         },
         {
           "include": "#expression"
+        },
+        {
+          "include": "#punctuation-comma"
         }
       ]
     },
@@ -2915,7 +2994,7 @@
           "name": "entity.name.variable.local.apex"
         }
       },
-      "end": "(?<=})",
+      "end": "(?=})|(?=when\\b)",
       "patterns": [
         {
           "include": "#block"
@@ -2926,7 +3005,7 @@
       ]
     },
     "when-statement": {
-      "begin": "(when)\\b\\s+([-'_[:alnum:]]+)\\s*",
+      "begin": "(when)\\b\\s+([-_[:alnum:]]+)\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
@@ -2939,7 +3018,7 @@
           ]
         }
       },
-      "end": "(?<=})",
+      "end": "(?=})|(?=when\\b)",
       "patterns": [
         {
           "include": "#block"
@@ -2950,7 +3029,7 @@
       ]
     },
     "when-string": {
-      "begin": "(when)\\b\\s*('[^\\n']*')(,)?",
+      "begin": "(when)\\b\\s*('[^\\n']*')(\\s*(,)\\s*('[^\\n']*'))*\\s*",
       "beginCaptures": {
         "1": {
           "name": "keyword.control.switch.when.apex"
@@ -2962,15 +3041,22 @@
             }
           ]
         },
-        "3": {
+        "4": {
           "patterns": [
             {
               "include": "#punctuation-comma"
             }
           ]
+        },
+        "5": {
+          "patterns": [
+            {
+              "include": "#string-literal"
+            }
+          ]
         }
       },
-      "end": "(?<=})",
+      "end": "(?=})|(?=when\\b)",
       "patterns": [
         {
           "include": "#block"

package/grammars/berry.json

@@ -115,54 +115,100 @@
     "strings": {
       "patterns": [
         {
-          "begin": "([\"'])",
-          "end": "\\1",
-          "name": "string.quoted.double.berry",
+          "begin": "f(?=[\"'])",
           "patterns": [
             {
-              "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
-              "name": "constant.character.escape.berry"
-            }
-          ]
-        },
-        {
-          "begin": "f([\"'])",
-          "end": "\\1",
-          "name": "string.quoted.other.berry",
-          "patterns": [
-            {
-              "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
-              "name": "constant.character.escape.berry"
-            },
-            {
-              "match": "\\{\\{[^}]*}}",
-              "name": "string.quoted.other.berry"
-            },
-            {
-              "begin": "\\{",
-              "end": "}",
-              "name": "keyword.other.unit.berry",
+              "begin": "\"",
+              "end": "\"",
+              "name": "string.quoted.other.berry",
               "patterns": [
                 {
-                  "include": "#keywords"
+                  "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
+                  "name": "constant.character.escape.berry"
                 },
                 {
-                  "include": "#numbers"
+                  "match": "\\{\\{[^}]*}}",
+                  "name": "string.quoted.other.berry"
                 },
                 {
-                  "include": "#identifier"
-                },
+                  "begin": "\\{",
+                  "end": "}",
+                  "name": "keyword.other.unit.berry",
+                  "patterns": [
+                    {
+                      "include": "#keywords"
+                    },
+                    {
+                      "include": "#numbers"
+                    },
+                    {
+                      "include": "#identifier"
+                    },
+                    {
+                      "include": "#operator"
+                    },
+                    {
+                      "include": "#member"
+                    },
+                    {
+                      "include": "#function"
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              "begin": "'",
+              "end": "'",
+              "name": "string.quoted.other.berry",
+              "patterns": [
                 {
-                  "include": "#operator"
+                  "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
+                  "name": "constant.character.escape.berry"
                 },
                 {
-                  "include": "#member"
+                  "match": "\\{\\{[^}]*}}",
+                  "name": "string.quoted.other.berry"
                 },
                 {
-                  "include": "#function"
+                  "begin": "\\{",
+                  "end": "}",
+                  "name": "keyword.other.unit.berry",
+                  "patterns": [
+                    {
+                      "include": "#keywords"
+                    },
+                    {
+                      "include": "#numbers"
+                    },
+                    {
+                      "include": "#identifier"
+                    },
+                    {
+                      "include": "#operator"
+                    },
+                    {
+                      "include": "#member"
+                    },
+                    {
+                      "include": "#function"
+                    }
+                  ]
                 }
               ]
             }
+          ],
+          "while": "\\G|^[\\t ]*(?=[\"'])"
+        },
+        {
+          "begin": "([\"'])",
+          "end": "\\1",
+          "name": "string.quoted.double.berry",
+          "patterns": [
+            {
+              "match": "(\\\\x\\h{2})|(\\\\[0-7]{3})|(\\\\\\\\)|(\\\\\")|(\\\\')|(\\\\a)|(\\\\b)|(\\\\f)|(\\\\n)|(\\\\r)|(\\\\t)|(\\\\v)",
+              "name": "constant.character.escape.berry"
+            }
           ]
         }
       ]