Move whitespace in front of verbatim block in Blade templates #51195
Conversation
This file contains 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
Closes laravel#51146 If a PHP end tag `?>` is followed by a newline, that newline is not shown in the output. To counteract this, CompilesEchos detects whether an echo is followed by a newline and then doubles that newline. However, if the newline is part of a verbatim block, it is already replaced by a placeholder and CompilesEchos won't detect it correctly. This change moves the whitespace in front of the verbatim block. The whitespace remains outside of the placeholder and CompilesEchos can correctly detect it. This assumes that whitespace is not modified by Blade in a manner that it would be necessary to put whitespace in a verbatim block to change its meaning. Only the final assertion in the testNewlinesAreInsertedCorrectlyAfterEcho test actually tests for what we want. The first two are more of an introduction for the reader, to show that what we test in the last assertion really makes sense. It first tests a verbatim block, then an echo statement, and then the combination of the two, what is what we are really interested in.
Sjord
force-pushed
the
blade-verbatim-move-whitespace
branch
from
94e6877
to
3f2b7e0
Compare
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.
Closes #51146
If a PHP end tag
?>is followed by a newline, that newline is not shown in the output. To counteract this, CompilesEchos detects whether an echo is followed by a newline and then doubles that newline. However, if the newline is part of a verbatim block, it is already replaced by a placeholder and CompilesEchos won't detect it correctly.This change moves the whitespace in front of the verbatim block. The whitespace remains outside of the placeholder and CompilesEchos can correctly detect it.
This assumes that whitespace is not modified by Blade in a manner that it would be necessary to put whitespace in a verbatim block to change its meaning.
Only the final assertion in the testNewlinesAreInsertedCorrectlyAfterEcho test actually tests for what we want. The first two are more of an introduction for the reader, to show that what we test in the last assertion really makes sense. It first tests a verbatim block, then an echo statement, and then the combination of the two, what is what we are really interested in.