Fix for twigphp/Twig/issues/3685 (markdown leading linebreaks and indentation) #3688
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
stof
suggested changes
Apr 20, 2022
This is correct. Twig follows the same policy than Symfony: fixes are merged in the lowest maintained branch, and then the maintainers are merging branches up. |
fabpot
requested changes
Dec 26, 2022
|
|
||
| private function minIndentations(string $body): int | ||
| { | ||
| $non_empty_lines = preg_split('%(\r|\n)%', $body, -1, PREG_SPLIT_NO_EMPTY); |
There was a problem hiding this comment.
Suggested change
| $non_empty_lines = preg_split('%(\r|\n)%', $body, -1, PREG_SPLIT_NO_EMPTY); | |
| $nonEmptyLines = preg_split('%(\r|\n)%', $body, -1, PREG_SPLIT_NO_EMPTY); |
| if ($white = substr($body, 0, strspn($body, " \t\r\n\0\x0B"))) { | ||
| $body = preg_replace("{^$white}m", '', $body); | ||
| } | ||
| $body = $this->commonWhitespace($body); |
There was a problem hiding this comment.
I don't think we should change the content, except for maybe the beginning of the lines. Here, you are removing all occurrences.
| public function load($c) | ||
| { | ||
| if (MarkdownRuntime::class === $c) | ||
| { |
There was a problem hiding this comment.
Should be on the previous line
| { | ||
| if (MarkdownRuntime::class === $c) | ||
| { | ||
| return new $c(new $this->class()); |
| [<<<EOF | ||
| {% apply markdown_to_html %} | ||
| Hello |
There was a problem hiding this comment.
Can we keep this example in the tests?
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.
Fix for #3685.
Reworked the "remove indentation" to properly account for all lines, work with leading linebreaks, and retain codeblocks at start of markdown.
Reworked the tests, to among other things compare with the markdown generated by the markdown library directly.
I forked
2.xassuming it can then be merged into3.xas well. Let me know if this is incorrect (I didn't see aCONTRIBUTING.md).