tm-grammars 1.32.13 → 1.32.15

package/NOTICE

@@ -8115,9 +8115,182 @@ Files:   nsis.json
 License: https://raw.githubusercontent.com/idleberg/vscode-nsis/main/LICENSE
 SPDX:    NOASSERTION
 ---------------------------------------------------------------------------------------------------------
-If not otherwise specified, files in this repository fall under [The MIT License](https://opensource.org/licenses/MIT).
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
 
-An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
 
 =========================================================================================================
 Files:   nushell.json

package/README.md

@@ -237,10 +237,10 @@ import { grammars } from 'tm-grammars'
 | `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 |
 | `tsx` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/210541906e5a96ab39f9c753f921b1bd35f4138b/extensions/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 156.31 kB |
 | `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/b4f2809d6f75850ee7350b03f8b1d439d741ebf5/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` | 20.17 kB |
+| `twig` |  | [mblode/vscode-twig-language-2](https://github.com/mblode/vscode-twig-language-2/blob/73f4e2729ce5f490e294dd158c82c22a35cf96de/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) | `javascript` `css` `scss` `php` `python` `ruby` | 23.40 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/64f7850fb6e6069965ba8774643241b6a74f881c/grammars/typespec.json) | [MIT](https://raw.githubusercontent.com/microsoft/typespec/main/LICENSE) |  |  | 23.94 kB |
-| `typst` | `typ` | [Myriad-Dreamin/tinymist](https://github.com/Myriad-Dreamin/tinymist/blob/766f1ec0edcfef620c70baac7fd2790a01baa324/editors/vscode/package.json) | [Apache-2.0](https://raw.githubusercontent.com/Myriad-Dreamin/tinymist/main/LICENSE) |  | `bat` `bibtex` `c` `clojure` `coffee` `cpp` `css` `csharp` `dart` `diff` `docker` `elixir` `erlang` `fsharp` `git-commit` `git-rebase` `go` `groovy` `handlebars` `html` `ini` `java` `javascript` `jsonc` `json` `julia` `latex` `less` `log` `lua` `make` `markdown` `objective-c` `perl` `raku` `php` `powershell` `pug` `r` `regexp` `ruby` `scss` `sql` `swift` `xml` `xsl` `yaml` `python` `rust` `scala` `shellscript` `typescript` `tsx` `twig` `verilog` `system-verilog` `vb` | 151.64 kB |
+| `typst` | `typ` | [Myriad-Dreamin/tinymist](https://github.com/Myriad-Dreamin/tinymist/blob/3040faef70f5598783e3aab779f961ba97cf7cfa/editors/vscode/package.json) | [Apache-2.0](https://raw.githubusercontent.com/Myriad-Dreamin/tinymist/main/LICENSE) |  | `bat` `bibtex` `c` `clojure` `coffee` `cpp` `css` `csharp` `dart` `diff` `docker` `elixir` `erlang` `fsharp` `git-commit` `git-rebase` `go` `groovy` `handlebars` `html` `ini` `java` `javascript` `jsonc` `json` `julia` `latex` `less` `log` `lua` `make` `markdown` `objective-c` `perl` `raku` `php` `powershell` `pug` `r` `regexp` `ruby` `scss` `sql` `swift` `xml` `xsl` `yaml` `python` `rust` `scala` `shellscript` `typescript` `tsx` `twig` `verilog` `system-verilog` `vb` | 151.64 kB |
 | `v` |  | [vlang/vscode-vlang](https://github.com/vlang/vscode-vlang/blob/cc6dee79af1fc1332084a263b952489aaed7e884/syntaxes/v.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/vlang/vscode-vlang/master/LICENSE) |  |  | 12.56 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 |
 | `vb` |  | [microsoft/vscode](https://github.com/microsoft/vscode/blob/35d97bc7e439fce0f50f42074041ab2d8571b20a/extensions/vb/syntaxes/asp-vb-net.tmLanguage.json) | [MIT](https://raw.githubusercontent.com/microsoft/vscode/main/LICENSE.txt) |  |  | 5.70 kB |

package/grammars/twig.json

@@ -7,10 +7,112 @@
   "firstLineMatch": "<!(?i:DOCTYPE)|<(?i:html)|<\\?(?i:php)|\\{\\{|\\{%|\\{#",
   "foldingStartMarker": "(<(?i:body|div|dl|fieldset|form|head|li|ol|script|select|style|table|tbody|tfoot|thead|tr|ul)\\b.*?>|<!--(?!.*--\\s*>)|^<!-- #tminclude (?>.*?-->)$|\\{%\\s+(autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim))",
   "foldingStopMarker": "(</(?i:body|div|dl|fieldset|form|head|li|ol|script|select|style|table|tbody|tfoot|thead|tr|ul)>|^(?!.*?<!--).*?--\\s*>|^<!-- end tminclude -->$|\\{%\\s+end(autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim))",
+  "injections": {
+    "L:text.html.twig -meta.tag.template -comment.block.twig -string.unquoted.verbatim.twig": {
+      "patterns": [
+        {
+          "include": "#twig-verbatim"
+        },
+        {
+          "include": "#twig-embedded-blocks"
+        },
+        {
+          "include": "#twig-comment-tag"
+        },
+        {
+          "include": "#twig-print-tag"
+        },
+        {
+          "include": "#twig-injected-statement"
+        }
+      ]
+    }
+  },
   "name": "twig",
   "patterns": [
     {
-      "begin": "(<)([0-:A-Za-z]++)(?=[^>]*></\\2>)",
+      "include": "#twig-verbatim"
+    },
+    {
+      "begin": "(\\{%[-~]?)\\s*(js|includejs|javascript)\\s*([-~]?%})",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.tag.twig"
+        },
+        "2": {
+          "name": "keyword.control.twig"
+        },
+        "3": {
+          "name": "punctuation.section.tag.twig"
+        }
+      },
+      "contentName": "source.js.embedded.twig",
+      "end": "(\\{%[-~]?)\\s*end\\2\\s*([-~]?%})",
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.twig"
+        }
+      },
+      "patterns": [
+        {
+          "include": "source.js"
+        }
+      ]
+    },
+    {
+      "begin": "(\\{%[-~]?)\\s*((?:|include|includehires)css)\\s*([-~]?%})",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.tag.twig"
+        },
+        "2": {
+          "name": "keyword.control.twig"
+        },
+        "3": {
+          "name": "punctuation.section.tag.twig"
+        }
+      },
+      "contentName": "source.css.embedded.twig",
+      "end": "(\\{%[-~]?)\\s*end\\2\\s*([-~]?%})",
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.twig"
+        }
+      },
+      "patterns": [
+        {
+          "include": "source.css"
+        }
+      ]
+    },
+    {
+      "begin": "(\\{%[-~]?)\\s*((?:|include|includehires)scss)\\s*([-~]?%})",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.tag.twig"
+        },
+        "2": {
+          "name": "keyword.control.twig"
+        },
+        "3": {
+          "name": "punctuation.section.tag.twig"
+        }
+      },
+      "contentName": "source.css.scss.embedded.twig",
+      "end": "(\\{%[-~]?)\\s*end\\2\\s*([-~]?%})",
+      "endCaptures": {
+        "0": {
+          "name": "keyword.control.twig"
+        }
+      },
+      "patterns": [
+        {
+          "include": "source.css.scss"
+        }
+      ]
+    },
+    {
+      "begin": "(<)([-.0-:A-Za-z]++)(?=[^>]*></\\2>)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.html"
@@ -233,36 +335,6 @@
         }
       ]
     },
-    {
-      "begin": "(?i)(?<=\\{%\\s(?:|include)js\\s%})",
-      "end": "(?i)(?=\\{%\\send(?:|include)js\\s%})",
-      "name": "source.js.embedded.twig",
-      "patterns": [
-        {
-          "include": "source.js"
-        }
-      ]
-    },
-    {
-      "begin": "(?i)(?<=\\{%\\s(?:|include|includehires)css\\s%})",
-      "end": "(?i)(?=\\{%\\send(?:|include|includehires)css\\s%})",
-      "name": "source.css.embedded.twig",
-      "patterns": [
-        {
-          "include": "source.css"
-        }
-      ]
-    },
-    {
-      "begin": "(?i)(?<=\\{%\\s(?:|include|includehires)scss\\s%})",
-      "end": "(?i)(?=\\{%\\send(?:|include|includehires)scss\\s%})",
-      "name": "source.css.scss.embedded.twig",
-      "patterns": [
-        {
-          "include": "source.css.scss"
-        }
-      ]
-    },
     {
       "begin": "(</?)((?i:body|head|html))\\b",
       "captures": {
@@ -328,7 +400,7 @@
       ]
     },
     {
-      "begin": "(</?)([0-:A-Za-z]+)",
+      "begin": "(</?)([-.0-:A-Za-z]+)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -377,6 +449,9 @@
   "repository": {
     "embedded-code": {
       "patterns": [
+        {
+          "include": "#twig-verbatim"
+        },
         {
           "include": "#ruby"
         },
@@ -613,6 +688,21 @@
     },
     "tag-stuff": {
       "patterns": [
+        {
+          "begin": "(=)\\s*(?=[^\"'<=>`\\s])",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.separator.key-value.html"
+            }
+          },
+          "contentName": "string.unquoted.html",
+          "end": "(?=[>\\s])",
+          "patterns": [
+            {
+              "include": "#embedded-code"
+            }
+          ]
+        },
         {
           "include": "#tag-id-attribute"
         },
@@ -694,13 +784,13 @@
       ]
     },
     "twig-comment-tag": {
-      "begin": "\\{#-?",
+      "begin": "\\{#[-~]?",
       "beginCaptures": {
         "0": {
           "name": "punctuation.definition.comment.begin.twig"
         }
       },
-      "end": "-?#}",
+      "end": "[-~]?#}",
       "endCaptures": {
         "0": {
           "name": "punctuation.definition.comment.end.twig"
@@ -720,13 +810,95 @@
         }
       ]
     },
+    "twig-embedded-blocks": {
+      "patterns": [
+        {
+          "begin": "(\\{%[-~]?)\\s*(js|includejs|javascript)\\s*([-~]?%})",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.tag.twig"
+            },
+            "2": {
+              "name": "keyword.control.twig"
+            },
+            "3": {
+              "name": "punctuation.section.tag.twig"
+            }
+          },
+          "contentName": "source.js.embedded.twig",
+          "end": "(\\{%[-~]?)\\s*end\\2\\s*([-~]?%})",
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control.twig"
+            }
+          },
+          "patterns": [
+            {
+              "include": "source.js"
+            }
+          ]
+        },
+        {
+          "begin": "(\\{%[-~]?)\\s*((?:|include|includehires)css)\\s*([-~]?%})",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.tag.twig"
+            },
+            "2": {
+              "name": "keyword.control.twig"
+            },
+            "3": {
+              "name": "punctuation.section.tag.twig"
+            }
+          },
+          "contentName": "source.css.embedded.twig",
+          "end": "(\\{%[-~]?)\\s*end\\2\\s*([-~]?%})",
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control.twig"
+            }
+          },
+          "patterns": [
+            {
+              "include": "source.css"
+            }
+          ]
+        },
+        {
+          "begin": "(\\{%[-~]?)\\s*((?:|include|includehires)scss)\\s*([-~]?%})",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.tag.twig"
+            },
+            "2": {
+              "name": "keyword.control.twig"
+            },
+            "3": {
+              "name": "punctuation.section.tag.twig"
+            }
+          },
+          "contentName": "source.css.scss.embedded.twig",
+          "end": "(\\{%[-~]?)\\s*end\\2\\s*([-~]?%})",
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control.twig"
+            }
+          },
+          "patterns": [
+            {
+              "include": "source.css.scss"
+            }
+          ]
+        }
+      ]
+    },
     "twig-filters": {
       "captures": {
         "1": {
           "name": "support.function.twig"
         }
       },
-      "match": "(?<=[]\"')0-9A-Z_a-z\\x7F-ÿ]\\||\\{%\\sfilter\\s)(abs|capitalize|e(?:scape)?|first|join|(?:json|url)_encode|keys|last|length|lower|nl2br|number_format|raw|reverse|round|sort|striptags|title|trim|upper)(?=[]),:|}\\s]|\\.\\.|\\*\\*)"
+      "match": "(?<=[]\"')0-9A-Z_a-z\\x7F-ÿ]\\||\\{%\\sfilter\\s)(default|abs|capitalize|e(?:scape)?|first|join|(?:json|url)_encode|keys|last|length|lower|nl2br|number_format|raw|reverse|round|sort|striptags|title|trim|upper)(?=[]),:|}\\s]|\\.\\.|\\*\\*)"
     },
     "twig-filters-ud": {
       "captures": {
@@ -991,8 +1163,70 @@
         }
       ]
     },
+    "twig-injected-statement": {
+      "begin": "\\{%(?![-~]?\\s*end(?:js|javascript|includejs|css|includecss|includehirescss|scss|includescss|includehiresscss)\\b)[-~]?",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.section.tag.twig"
+        }
+      },
+      "end": "[-~]?%}",
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.section.tag.twig"
+        }
+      },
+      "name": "meta.tag.template.block.twig",
+      "patterns": [
+        {
+          "include": "#twig-constants"
+        },
+        {
+          "include": "#twig-keywords"
+        },
+        {
+          "include": "#twig-operators"
+        },
+        {
+          "include": "#twig-functions-warg"
+        },
+        {
+          "include": "#twig-functions"
+        },
+        {
+          "include": "#twig-macros"
+        },
+        {
+          "include": "#twig-filters-warg"
+        },
+        {
+          "include": "#twig-filters"
+        },
+        {
+          "include": "#twig-filters-warg-ud"
+        },
+        {
+          "include": "#twig-filters-ud"
+        },
+        {
+          "include": "#twig-objects"
+        },
+        {
+          "include": "#twig-properties"
+        },
+        {
+          "include": "#twig-strings"
+        },
+        {
+          "include": "#twig-arrays"
+        },
+        {
+          "include": "#twig-hashes"
+        }
+      ]
+    },
     "twig-keywords": {
-      "match": "(?<=\\s)((?:end)?(?:autoescape|block|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim)|as|do|else|elseif|extends|flush|from|ignore missing|import|include|only|types|use|with)(?=\\s)",
+      "match": "\\b(?:(?:end)?(?:apply|autoescape|block|cache|deprecated|embed|filter|for|if|macro|raw|sandbox|set|spaceless|trans|verbatim|with)|as|do|else|elseif|extends|flush|from|import|include|only|types|use)\\b",
       "name": "keyword.control.twig"
     },
     "twig-macros": {
@@ -1073,6 +1307,10 @@
     },
     "twig-operators": {
       "patterns": [
+        {
+          "match": "\\?\\?|\\?:|\\?\\.|<=>|=>|===|!==",
+          "name": "keyword.operator.twig"
+        },
         {
           "captures": {
             "1": {
@@ -1132,13 +1370,13 @@
       ]
     },
     "twig-print-tag": {
-      "begin": "\\{\\{-?",
+      "begin": "\\{\\{[-~]?",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.tag.twig"
         }
       },
-      "end": "-?}}",
+      "end": "[-~]?}}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.tag.twig"
@@ -1297,13 +1535,13 @@
       ]
     },
     "twig-statement-tag": {
-      "begin": "\\{%-?",
+      "begin": "\\{%[-~]?",
       "beginCaptures": {
         "0": {
           "name": "punctuation.section.tag.twig"
         }
       },
-      "end": "-?%}",
+      "end": "[-~]?%}",
       "endCaptures": {
         "0": {
           "name": "punctuation.section.tag.twig"
@@ -1361,39 +1599,51 @@
     "twig-strings": {
       "patterns": [
         {
-          "begin": "(?:(?<!\\\\)|(?<=\\\\\\\\))'",
+          "begin": "'",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.twig"
             }
           },
-          "end": "(?:(?<!\\\\)|(?<=\\\\\\\\))'",
+          "end": "'",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.twig"
             }
           },
-          "name": "string.quoted.single.twig"
+          "name": "string.quoted.single.twig",
+          "patterns": [
+            {
+              "match": "\\\\.",
+              "name": "constant.character.escape.twig"
+            }
+          ]
         },
         {
-          "begin": "(?:(?<!\\\\)|(?<=\\\\\\\\))\"",
+          "begin": "\"",
           "beginCaptures": {
             "0": {
               "name": "punctuation.definition.string.begin.twig"
             }
           },
-          "end": "(?:(?<!\\\\)|(?<=\\\\\\\\))\"",
+          "end": "\"",
           "endCaptures": {
             "0": {
               "name": "punctuation.definition.string.end.twig"
             }
           },
-          "name": "string.quoted.double.twig"
+          "name": "string.quoted.double.twig",
+          "patterns": [
+            {
+              "match": "\\\\.",
+              "name": "constant.character.escape.twig"
+            }
+          ]
         }
       ]
     },
     "twig-verbatim": {
-      "begin": "(\\{%-?)\\s*(verbatim)\\s*(-?%})",
+      "begin": "(\\{%[-~]?)\\s*(verbatim)\\s*([-~]?%})",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.twig"
@@ -1406,7 +1656,7 @@
         }
       },
       "contentName": "string.unquoted.verbatim.twig",
-      "end": "(\\{%-?)\\s*(endverbatim)\\s*(-?%})",
+      "end": "(\\{%[-~]?)\\s*(endverbatim)\\s*([-~]?%})",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.twig"

package/index.js

@@ -4596,11 +4596,11 @@ export const grammars = [
     sourceApi: 'https://api.github.com/repos/stardog-union/stardog-vsc/contents/stardog-rdf-grammars/syntaxes/turtle.tmLanguage.json?ref=3f1364b08bdbf4b4d77f123682db7d2b708b2f6e',
   },
   {
-    byteSize: 20659,
+    byteSize: 23963,
     displayName: 'Twig',
     embedded: [
-      'css',
       'javascript',
+      'css',
       'scss',
       'php',
       'python',
@@ -4613,15 +4613,15 @@ export const grammars = [
         url: 'https://github.com/sponsors/mblode',
       },
     ],
-    hash: 'iYUAYAHc_ZeEM82sba06S9PQ2YmXSivgEg7AzwtllVU',
-    lastUpdate: '2026-06-12T06:29:41Z',
+    hash: 'Aqgs4QkLBjiQWXjwblh057r9aoHMROoMV9ZJdw0y-ds',
+    lastUpdate: '2026-09-07T22:27:57Z',
     license: 'MIT',
     licenseUrl: 'https://raw.githubusercontent.com/mblode/vscode-twig-language-2/master/LICENSE.md',
     name: 'twig',
     scopeName: 'text.html.twig',
-    sha: 'b4f2809d6f75850ee7350b03f8b1d439d741ebf5',
-    source: 'https://github.com/mblode/vscode-twig-language-2/blob/b4f2809d6f75850ee7350b03f8b1d439d741ebf5/src/syntaxes/twig.tmLanguage',
-    sourceApi: 'https://api.github.com/repos/mblode/vscode-twig-language-2/contents/src/syntaxes/twig.tmLanguage?ref=b4f2809d6f75850ee7350b03f8b1d439d741ebf5',
+    sha: '73f4e2729ce5f490e294dd158c82c22a35cf96de',
+    source: 'https://github.com/mblode/vscode-twig-language-2/blob/73f4e2729ce5f490e294dd158c82c22a35cf96de/src/syntaxes/twig.tmLanguage',
+    sourceApi: 'https://api.github.com/repos/mblode/vscode-twig-language-2/contents/src/syntaxes/twig.tmLanguage?ref=73f4e2729ce5f490e294dd158c82c22a35cf96de',
   },
   {
     aliases: [
@@ -4733,15 +4733,15 @@ export const grammars = [
     ],
     funding: [
     ],
-    hash: 'WDSimVIgDFZbEUTdtpYkzf27C3676d4xbpuNO5n9pLs',
-    lastUpdate: '2026-09-04T07:26:36Z',
+    hash: 'O-DMrddkD-0qqYKqVzxQZKi2yGXu_L_V1Ao4qADAXCU',
+    lastUpdate: '2026-09-07T09:50:49Z',
     license: 'Apache-2.0',
     licenseUrl: 'https://raw.githubusercontent.com/Myriad-Dreamin/tinymist/main/LICENSE',
     name: 'typst',
     scopeName: 'source.typst',
-    sha: '766f1ec0edcfef620c70baac7fd2790a01baa324',
-    source: 'https://github.com/Myriad-Dreamin/tinymist/blob/766f1ec0edcfef620c70baac7fd2790a01baa324/editors/vscode/package.json',
-    sourceApi: 'https://api.github.com/repos/Myriad-Dreamin/tinymist/contents/editors/vscode/package.json?ref=766f1ec0edcfef620c70baac7fd2790a01baa324',
+    sha: '3040faef70f5598783e3aab779f961ba97cf7cfa',
+    source: 'https://github.com/Myriad-Dreamin/tinymist/blob/3040faef70f5598783e3aab779f961ba97cf7cfa/editors/vscode/package.json',
+    sourceApi: 'https://api.github.com/repos/Myriad-Dreamin/tinymist/contents/editors/vscode/package.json?ref=3040faef70f5598783e3aab779f961ba97cf7cfa',
   },
   {
     byteSize: 12858,

package/package.json

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