Simplify code in lines.py #4167
Merged
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
This has been getting a little messy. These changes neaten things up, we don't have to keep guarding against `self.previous_line is not None`, we make it clearer what logic has side effects, we reduce the amount of code that tricky `before` could touch, etc
hauntsaninja
added
the
skip news
src/black/lines.py
Outdated
Comment on lines
626
to
628
| if current_line.is_decorator or current_line.is_def or current_line.is_class: | ||
| if not current_line.is_decorator: | ||
| self.previous_defs.append(current_line) |
There was a problem hiding this comment.
Suggested change
| if current_line.is_decorator or current_line.is_def or current_line.is_class: | |
| if not current_line.is_decorator: | |
| self.previous_defs.append(current_line) | |
| if current_line.is_def or current_line.is_class: | |
| self.previous_defs.append(current_line) |
This should be equivalent unless I'm missing something
There was a problem hiding this comment.
Thanks, fixed. Logic was previously inside _maybe_empty_lines_for_class_or_def and I'd just copied the guard around that function call.
JelleZijlstra
approved these changes
Jan 25, 2024
cobaltt7
pushed a commit
to cobaltt7/black
that referenced
this pull request
Jan 26, 2024
This has been getting a little messy. These changes neaten things up, we don't have to keep guarding against `self.previous_line is not None`, we make it clearer what logic has side effects, we reduce the amount of code that tricky `before` could touch, etc
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.
This has been getting a little messy. These changes neaten things up, we don't have to keep guarding against
self.previous_line is not None, we make it clearer what logic has side effects, we reduce the amount of code that trickybeforecould touch, etcThis change is intended to be a no-op