Fix indent filter ignoring blank=False for empty first line#2181
Closed
sapirbaruch wants to merge 2 commits into
Closed
Fix indent filter ignoring blank=False for empty first line#2181sapirbaruch wants to merge 2 commits into
sapirbaruch wants to merge 2 commits into
Conversation
When first=True is set, the indent filter was unconditionally prepending the indentation to the whole string, even when blank=False and the first line was empty. Now the first-line indentation is skipped when blank=False and the first line has no content. Fixes pallets#2176
Author
|
The PyPy failure is a pre-existing |
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.
Fixes #2176.
When
first=Trueis passed to theindentfilter, the code wasunconditionally prepending the indentation string to the output, without
checking whether
blank=Falseshould suppress it when the first line isempty.
Before:
After:
The fix is a one-liner in
do_indent: instead ofif first:, checkif first and (blank or rv.split("\n", 1)[0]):so that an empty firstline is only indented when
blank=Trueis explicitly requested.A new test (
test_indent_first_blank) covers the three cases:first=True→ no indentationfirst=True→ blank line left alone, rest indentedfirst=True, blank=True→ indentation applied