Parse Twig string literals with escaped quotes and backslash escapes

Author: fabpot

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Parse Twig string literals with escaped quotes and backslash escapes
 - Decode static Twig helper arguments with Twig string semantics
 - Decode escaped Twig literals in template, route and PHP symbol references
 - Ignore unrelated named arguments in positional Doctrine and Metadata call slots

THIRD_PARTY_NOTICES.md

@@ -37,7 +37,7 @@ The Tree-sitter parser ships compiled into the server binaries.
 | Component | Revision | License |
 | --- | --- | --- |
 | tree-sitter | `64402de2857cc197ecc4ca3bc144ea91fda7e72e` | MIT License |
-| tree-sitter-twig | `0afd9a6d808944e65a7be393e31868b85345735f` | WTFPL |
+| tree-sitter-twig | `0afd9a6d808944e65a7be393e31868b85345735f` with a local string-escape fix | WTFPL |
 | tree-sitter-yaml | `a1c4812a73ec5e089de8e441fdea3a921e8d5079` | MIT License |
 | Unicode data used by tree-sitter | Unicode License V3 |
 

ext/tree_sitter/README.md

@@ -7,11 +7,13 @@ The vendored sources are pinned to:
 | Source | Revision | License |
 | --- | --- | --- |
 | `tree-sitter/tree-sitter` | `v0.26.11` (`64402de2857cc197ecc4ca3bc144ea91fda7e72e`) | MIT |
-| `gbprod/tree-sitter-twig` | `0afd9a6d808944e65a7be393e31868b85345735f` | WTFPL |
+| `gbprod/tree-sitter-twig` | `0afd9a6d808944e65a7be393e31868b85345735f` with `vendor/twig/string-escapes.patch` | WTFPL |
 | `tree-sitter-grammars/tree-sitter-yaml` | `a1c4812a73ec5e089de8e441fdea3a921e8d5079` | MIT |
 
 The Twig grammar was selected because it recognizes extension tags generically, preserves useful nodes around incomplete Twig, has a maintained parser corpus, and has a substantially smaller generated parser than the evaluated alternative. The YAML grammar accepts Symfony custom tags without application-specific grammar changes.
 
+The vendored Twig parser is regenerated from the pinned revision plus `vendor/twig/string-escapes.patch`, which fixes double-escaped string regexes so escaped quotes and generic backslash escapes lex like Twig's own lexer. To regenerate after changing the patch: clone the pinned revision, apply the patch, run `tree-sitter generate --abi 14`, verify `tree-sitter test` still passes the full corpus, and copy `src/parser.c` and `src/tree_sitter/*.h` into `vendor/twig/src/`.
+
 Build the extension from the repository root:
 
 ```console