Allow whitespace around colon in slices for whitespace-before-punctuation (E203)#8654
Merged
charliermarsh merged 1 commit intomainfrom Nov 13, 2023
Merged
Allow whitespace around colon in slices for whitespace-before-punctuation (E203)#8654charliermarsh merged 1 commit intomainfrom
whitespace-before-punctuation (E203)#8654charliermarsh merged 1 commit intomainfrom
Conversation
Contributor
|
| code | total | + violation | - violation | + fix | - fix |
|---|---|---|---|---|---|
| E203 | 132 | 0 | 132 | 0 | 0 |
e112f61 to
8816092
Compare
ofek
reviewed
Nov 13, 2023
Comment on lines
+105
to
+106
| #: Okay | ||
| release_lines = history_file_lines[history_file_lines.index('## Unreleased') + 1: -1] |
Contributor
There was a problem hiding this comment.
Wouldn't this now be not okay, since the spacing is different on the other side?
Member
Author
There was a problem hiding this comment.
The intent was to allow either this or the variant with the space.
MichaReiser
reviewed
Nov 27, 2023
| TokenKind::FStringStart => fstrings += 1, | ||
| TokenKind::FStringEnd => fstrings = fstrings.saturating_sub(1), | ||
| TokenKind::Lsqb if fstrings == 0 => { | ||
| brackets.push(kind); |
Member
There was a problem hiding this comment.
I don't fully understand what has changed or how the new detection should work, which is why I'm unable to come up with a good example.
Is it possible that this change does not work as intended for parenthesized expressions inside f-strings because they are in between the start end token (fstrings > 0)?
f"start of f-string {a[(the_paren_logic) :b]} end of fstring"
MichaReiser
reviewed
Nov 27, 2023
Comment on lines
+140
to
+151
| TokenKind::Lsqb if fstrings == 0 => { | ||
| brackets.push(kind); | ||
| } | ||
| TokenKind::Rsqb if fstrings == 0 => { | ||
| brackets.pop(); | ||
| } | ||
| TokenKind::Lbrace if fstrings == 0 => { | ||
| brackets.push(kind); | ||
| } | ||
| TokenKind::Rbrace if fstrings == 0 => { | ||
| brackets.pop(); | ||
| } |
Member
There was a problem hiding this comment.
Nit
Suggested change
| TokenKind::Lsqb if fstrings == 0 => { | |
| brackets.push(kind); | |
| } | |
| TokenKind::Rsqb if fstrings == 0 => { | |
| brackets.pop(); | |
| } | |
| TokenKind::Lbrace if fstrings == 0 => { | |
| brackets.push(kind); | |
| } | |
| TokenKind::Rbrace if fstrings == 0 => { | |
| brackets.pop(); | |
| } | |
| TokenKind::Lsqb | TokenKind::Lbrace if fstrings == 0 => { | |
| brackets.push(kind); | |
| } | |
| TokenKind::Rsqb | TokenKind::Rbrace if fstrings == 0 => { | |
| brackets.pop(); | |
| } |
MichaReiser
reviewed
Nov 27, 2023
Comment on lines
+201
to
+203
| && brackets | ||
| .last() | ||
| .is_some_and(|kind| matches!(kind, TokenKind::Lsqb)) |
Member
There was a problem hiding this comment.
Nit:
brackets.last() == Some(TokenKind::Lsqb)
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
3 participants
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.
Summary
This PR makes
whitespace-before-punctuation(E203) compatible with the formatter by relaxing the rule a bit, as compared to the pycodestyle implementation. It's also more consistent with PEP 8, which says:Closes #7259.
Closes #8642.
Test Plan
cargo test