Fix indentation error when trailing quotes are not on separate line (… #13372
+102
−1
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
|
MichaReiser
requested changes
Sep 17, 2024
| // When a non-space character is on the last line, the trailing quotes are also on the same line. | ||
| // No diagnostic is added if the indentation difference equals the indent size. | ||
| if last.chars().any(|c| !c.is_whitespace()) { | ||
| let prev_line_indent = leading_space(&lines[lines.len() - 2]); |
There was a problem hiding this comment.
I think this might panic if there are fewer than 3 lines because it then results in an out of bound access.
We should also consider the case where there's a number of blank lines between the last and previous line
def right_indent_quotes_same_line(a: int) -> None:
"""Foo.
Parameters
----------
a : int
A parameter."""
pass| let mut offset_len = line_indent.text_len(); | ||
| // When a non-space character is on the last line, the trailing quotes are also on the same line. | ||
| // No diagnostic is added if the indentation difference equals the indent size. | ||
| if last.chars().any(|c| !c.is_whitespace()) { |
There was a problem hiding this comment.
I think we can simplify this by testing if the line_indent.text_len() == last.text_len()`. If the condition is true, then the last line is either all whitespace or empty
Comment on lines
299
to
303
| let prev_line_indent_size = prev_line_indent.chars().count(); | ||
| if line_indent_size - prev_line_indent_size == docstring_indent_size { | ||
| return; | ||
| } | ||
| offset_len = line_indent.text_len() - prev_line_indent.text_len(); |
There was a problem hiding this comment.
Not sure about this, but could we possibly use over_indented_size?
MichaReiser
added
bug
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.
…D208)
Summary
This PR is to fix an unexpected change of the D208 rule when trailing quotes are not on a separate line.
Related issue: #13260
Test Plan
Add more test cases to D208.py and update the snapshot file.