Use parenthesized_with_dangling_comments in arguments formatter
#6376
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
charliermarsh
commented
Aug 6, 2023
| @@ -103,7 +101,12 @@ impl FormatNodeRule<Arguments> for FormatArguments { | |||
| // ) | |||
| // ``` | |||
| // TODO(konstin): Doesn't work see wrongly formatted test | |||
There was a problem hiding this comment.
@konstin - Is this still applicable? I can't tell what it applies to.
PR Check ResultsBenchmarkLinuxWindows |
charliermarsh
force-pushed
the
charlie/arguments-dangling
branch
from
e92bad8
to
9b61f73
Compare
|
The next stability failure (i.e., the reason this PR is still failing) is fixed in #6380. |
MichaReiser
approved these changes
Aug 7, 2023
Comment on lines
+104
to
+109
| parenthesized_with_dangling_comments( | ||
| "(", | ||
| dangling_comments, | ||
| &group(&all_arguments), | ||
| ")" | ||
| ) |
There was a problem hiding this comment.
Nit: Can we change the builder to parenthesized("(", &group(&all_arguments)), ")").with_dangling_comments(dangling_comments) to be more in line with how other builders work?
There was a problem hiding this comment.
i'm thinking about parenthesized and parenthesized_without_dangling_comments since the latter should be the exception
There was a problem hiding this comment.
I will handle separately since it would be unrelated to this change.
konstin
approved these changes
Aug 7, 2023
| @@ -103,7 +101,12 @@ impl FormatNodeRule<Arguments> for FormatArguments { | |||
| // ) | |||
| // ``` | |||
| // TODO(konstin): Doesn't work see wrongly formatted test | |||
Comment on lines
+104
to
+109
| parenthesized_with_dangling_comments( | ||
| "(", | ||
| dangling_comments, | ||
| &group(&all_arguments), | ||
| ")" | ||
| ) |
There was a problem hiding this comment.
i'm thinking about parenthesized and parenthesized_without_dangling_comments since the latter should be the exception
Merged
charliermarsh
added a commit
that referenced
this pull request
Aug 7, 2023
charliermarsh
added a commit
that referenced
this pull request
Aug 7, 2023
durumu
pushed a commit
to durumu/ruff
that referenced
this pull request
Aug 12, 2023
…tral-sh#6376) ## Summary Fixes an instability whereby this: ```python def get_recent_deployments(threshold_days: int) -> Set[str]: # Returns a list of deployments not older than threshold days # including `/root/zulip` directory if it exists. recent = set() threshold_date = datetime.datetime.now() - datetime.timedelta( # noqa: DTZ005 days=threshold_days ) ``` Was being formatted as: ```python def get_recent_deployments(threshold_days: int) -> Set[str]: # Returns a list of deployments not older than threshold days # including `/root/zulip` directory if it exists. recent = set() threshold_date = ( datetime.datetime.now() - datetime.timedelta(days=threshold_days) # noqa: DTZ005 ) ``` Which was in turn being formatted as: ```python def get_recent_deployments(threshold_days: int) -> Set[str]: # Returns a list of deployments not older than threshold days # including `/root/zulip` directory if it exists. recent = set() threshold_date = ( datetime.datetime.now() - datetime.timedelta(days=threshold_days) # noqa: DTZ005 ) ``` The second-to-third formattings still differs from Black because we aren't taking the line suffix into account when splitting (astral-sh#6377), but the first formatting is correct and should be unchanged (i.e., the first-to-second formattings is incorrect, and fixed here). ## Test Plan `cargo run --bin ruff_dev -- format-dev --stability-check ../zulip`
durumu
pushed a commit
to durumu/ruff
that referenced
this pull request
Aug 12, 2023
durumu
pushed a commit
to durumu/ruff
that referenced
this pull request
Aug 12, 2023
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.
Summary
Fixes an instability whereby this:
Was being formatted as:
Which was in turn being formatted as:
The second-to-third formattings still differs from Black because we aren't taking the line suffix into account when splitting (#6377), but the first formatting is correct and should be unchanged (i.e., the first-to-second formattings is incorrect, and fixed here).
Test Plan
cargo run --bin ruff_dev -- format-dev --stability-check ../zulip