Allow empty lines at beginning of blocks (again) #4060
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
|
diff-shades results comparing this PR (6ff017b) to main (be336bb). The full diff is available in the logs under the "Generate HTML diff report" step. |
hauntsaninja
approved these changes
Nov 24, 2023
| @@ -684,18 +684,14 @@ def _maybe_empty_lines(self, current_line: Line) -> Tuple[int, int]: | |||
| return 0, 1 | |||
| return before, 1 | |||
|
|
|||
| # In preview mode, always allow blank lines, except right before a function | |||
There was a problem hiding this comment.
Btw a few lines up we have and current_line.is_triple_quoted_string. Should that also use is_docstring? Seems preferable to have consistent behaviour for single quote docstrings as well
There was a problem hiding this comment.
Yeah I don't really understand why we sometimes use one and sometimes the other. I'll merge this first and then maybe make another preview style change harmonizing between these two.
return42
added a commit
to return42/searxng
that referenced
this pull request
Mar 8, 2024
The issue discussed in [1] has been solved since [2] has been merged into black / now we can upgrade without touching 69 files as it was needed with black 23.1.0 [3]. [1] searxng#2159 (comment) [2] psf/black#4060 [3] https://github.com/searxng/searxng/pull/2159/files Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This was referenced Mar 8, 2024
|
@JelleZijlstra thank you for taking the efforts / with your help we now "back to black" :) |
return42
added a commit
to searxng/searxng
that referenced
this pull request
Mar 9, 2024
The issue discussed in [1] has been solved since [2] has been merged into black / now we can upgrade without touching 69 files as it was needed with black 23.1.0 [3]. [1] #2159 (comment) [2] psf/black#4060 [3] https://github.com/searxng/searxng/pull/2159/files Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
# for free
to join this conversation on GitHub.
Already have an account?
# 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 #4043