Fix #4011: Handle more huggable immediately nested parens/brackets.#4012
Merged
JelleZijlstra merged 23 commits intopsf:mainfrom Nov 18, 2023
Merged
Fix #4011: Handle more huggable immediately nested parens/brackets.#4012JelleZijlstra merged 23 commits intopsf:mainfrom
JelleZijlstra merged 23 commits intopsf:mainfrom
Conversation
for more information, see https://pre-commit.ci
|
diff-shades results comparing this PR (240c218) to main (58f31a7). The full diff is available in the logs under the "Generate HTML diff report" step. |
Contributor
Author
|
Looks like the changelog checker doesn't like me combining two PRs in CHANGES.md, let me know if you prefer separating them. |
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Contributor
Author
|
Looking at diff shades, this explodes: -man_pages = [
- ("index", doc_module.__name__, doc_module.__name__ + " Documentation", [""], 1)
-]
+man_pages = [(
+ "index",
+ doc_module.__name__,
+ doc_module.__name__ + " Documentation",
+ [""],
+ 1,
+)]- c = Context({
- "version": get_docs_version(),
- })
+ c = Context(
+ {
+ "version": get_docs_version(),
+ }
+ )I'll take a look later. |
…hades issues." This reverts commit 6134969.
Contributor
Author
|
diff-shades finally succeeded after several retries. I tried my best to read through the preview diffs, and they all look expected to me. |
copybara-service bot
pushed a commit
to google/pyink
that referenced
this pull request
Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between. Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0 yet, I'm waiting for psf#4012 to be merged as Pyink has local patches related by hugging parens. PiperOrigin-RevId: 582472645
copybara-service bot
pushed a commit
to google/pyink
that referenced
this pull request
Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between. Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0, I'm waiting for psf#4012 to be merged as Pyink has local patches related to hugging parens. PiperOrigin-RevId: 582472645
copybara-service bot
pushed a commit
to google/pyink
that referenced
this pull request
Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between. Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0, I'm waiting for psf#4012 to be merged as Pyink has local patches related to hugging parens. Also added two missing patches. PiperOrigin-RevId: 582472645
copybara-service bot
pushed a commit
to google/pyink
that referenced
this pull request
Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between. Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0, I'm waiting for psf#4012 to be merged as Pyink has local patches related to hugging parens. Also added two missing patches. PiperOrigin-RevId: 582704838
JelleZijlstra
approved these changes
Nov 18, 2023
2 tasks
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
2 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.
Description
Fix #4011.
Checklist - did you ...
CHANGES.mdif necessary?