Format call expressions (without call chaining) #5341
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 was referenced Jun 23, 2023
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
konstin
changed the title
This was referenced Jun 23, 2023
PR Check ResultsEcosystem✅ ecosystem check detected no changes. BenchmarkLinuxWindows |
konstin
force-pushed
the
fix_attribute_chain_own_line_comments_rebased
branch
from
37fdcdd
to
8bc2b89
Compare
Base automatically changed from
fix_attribute_chain_own_line_comments_rebased
to
main
June 26, 2023 09:13
konstin
force-pushed
the
call_expressions_no_call_chaining
branch
2 times, most recently
from
c15c45a
to
ebf1c09
Compare
konstin
commented
Jun 26, 2023
Cargo.toml
Outdated
Comment on lines
62
to
66
| #ruff_text_size = { path = "../disk/projects/RustPython-Parser/ruff_text_size" } | ||
| #rustpython-ast = { path = "../disk/projects/RustPython-Parser/ast", default-features = false, features = ["num-bigint"] } | ||
| #rustpython-format = { path = "../disk/projects/RustPython-Parser/format", default-features = false, features = ["num-bigint"] } | ||
| #rustpython-literal = { path = "../disk/projects/RustPython-Parser/literal", default-features = false } | ||
| #rustpython-parser = { path = "../disk/projects/RustPython-Parser/parser", default-features = false, features = ["full-lexer", "num-bigint"] } |
There was a problem hiding this comment.
i'll remove this before merging
MichaReiser
approved these changes
Jun 26, 2023
| if let Some(arg) = arg { | ||
| write!(f, [arg.format(), text("="), value.format()]) | ||
| } else { | ||
| // TODO(konstin): dangling comments after the stars? |
There was a problem hiding this comment.
I don't think that we have to preserve these. It seems a rather weird place to put comments.
| @@ -13,10 +13,11 @@ impl FormatNodeRule<Keyword> for FormatKeyword { | |||
| arg, | |||
| value, | |||
| } = item; | |||
| if let Some(argument) = arg { | |||
| write!(f, [argument.format(), text("=")])?; | |||
| if let Some(arg) = arg { | |||
There was a problem hiding this comment.
Nit: I prefer to move the logic that is common for all branches out of the if. I find that this improves readability. I otherwise have to manually parse both branches to understand what's the same/different.
There was a problem hiding this comment.
i want to keep those two specifically since they are one entry in a list each and because each branch has its own comment handling
Comment on lines
+1076
to
+1091
| // value . attr | ||
| // ^^^^^^^ the range of dangling comments |
konstin
force-pushed
the
call_expressions_no_call_chaining
branch
from
ebf1c09
to
9a63e21
Compare
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
This formats call expressions with magic trailing comma and parentheses behaviour but without call chaining
Test Plan
Lots of new test fixtures, including some that don't work yet