[TwigComponent] Fix PreLexer confusing {# inside output expressions with comments#3518
Draft
Amoifr wants to merge 1 commit into
Draft
[TwigComponent] Fix PreLexer confusing {# inside output expressions with comments#3518Amoifr wants to merge 1 commit into
{# inside output expressions with comments#3518Amoifr wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
TwigPreLexerwas treating any{#it encountered as the opening of a Twig comment, even when that{#actually lived inside a Twig output expression (e.g. inside a string literal passed to|trans). When the matching#}was missing — typically the case for ICU MessageFormat plural strings like{count, plural, one {# item} other {# items}}— the lexer consumed the rest of the template as a fake comment, swallowing any<twig:…>tags after it.This PR adds a top-level handler for
{{ … }}in the PreLexer's main loop. The new helperconsumeTwigExpressionContent()walks the expression body with string-literal awareness (single quotes, double quotes,\\-escapes), so that}}or{#appearing inside a string don't end the expression early or trigger comment mode. The implicit{% block content %}injection still kicks in when the expression appears as content inside a component.5 regression tests added covering:
}}inside a string literal in{{ … }}{#…#}inside a double-quoted string{{ … }}inside a component (default-block injection)Marking as draft pending @Kocal's input on the scope question raised in #3514: should this same protection be extended to
{% … %}(where{% set foo = '{# bar #}' %}has the same latent issue), or kept focused on{{ … }}?