E131: indent_chances overwritten #972
Open
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
asottile
reviewed
Dec 9, 2020
pycodestyle.py
Outdated
| @@ -706,6 +706,8 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing, | |||
| # ignore token lined up with matching one from a | |||
| # previous line | |||
| pass | |||
| elif isinstance(visual_indent, list) and text in visual_indent: | |||
There was a problem hiding this comment.
hmm so now this variable can be None, True, False, bytes, str, or a list of str? this seems like we're trying to do too much with dynamicism here -- is there any way to make this easier to understand than overloading the type further?
pycodestyle.py
Outdated
| @@ -778,6 +780,13 @@ def continued_indentation(logical_line, tokens, indent_level, hang_closing, | |||
| if start[1] not in indent_chances: | |||
| # allow lining up tokens | |||
| indent_chances[start[1]] = text | |||
| else: | |||
| v = indent_chances[start[1]] | |||
| if not isinstance(v, (bool, type(None))): | |||
There was a problem hiding this comment.
I'd rather see:
if list:
...
elif str / bytes:
...
are all of these branches covered by your tests?
added 2 commits
December 15, 2020 12:14
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.
Relates to #953