Don't reorder parameters in function calls#7268
Merged
Conversation
konstin
commented
Sep 11, 2023
|
|
||
| group(&format_inner).fmt(f) | ||
| }), | ||
| &format_with(|f| format_function_header(f, item)), |
Member
Author
There was a problem hiding this comment.
This isn't really part of the PR but i got confused so i split this into it's own function (no functional changes). It's a separate commit already i can easily split the branch if you want
Member
There was a problem hiding this comment.
I think I would prefer if you write it as (I'm somewhat certain that this should work):
fn format_function_header(item: &StmtFunctionDef) -> impl Format<PyFormatContext<'_>> {
format_with(move |f| {
...
})
}It avoids the nested function call.
Member
Author
There was a problem hiding this comment.
i prefer the flatter function body
konstin
commented
Sep 11, 2023
MichaReiser
approved these changes
Sep 11, 2023
Member
MichaReiser
left a comment
There was a problem hiding this comment.
Can you add the similarity index comparison between the baseline and this PR?
|
|
||
| group(&format_inner).fmt(f) | ||
| }), | ||
| &format_with(|f| format_function_header(f, item)), |
Member
There was a problem hiding this comment.
I think I would prefer if you write it as (I'm somewhat certain that this should work):
fn format_function_header(item: &StmtFunctionDef) -> impl Format<PyFormatContext<'_>> {
format_with(move |f| {
...
})
}It avoids the nested function call.
8b4a36a to
78867ef
Compare
Member
Author
|
Current dependencies on/for this PR:
This comment was auto-generated by Graphite. |
78867ef to
f6e0492
Compare
Contributor
PR Check ResultsEcosystem✅ ecosystem check detected no changes. |
f394565 to
492cd7a
Compare
454aa03 to
f4037d9
Compare
492cd7a to
d374956
Compare
konstin
commented
Sep 12, 2023
Comment on lines
+530
to
+531
| *args, # d | ||
| # c |
Member
Author
There was a problem hiding this comment.
these get switched but that seems fine to me
konstin
added a commit
that referenced
this pull request
Sep 13, 2023
## Motivation
The `ast::Arguments` for call argument are split into positional
arguments (args) and keywords arguments (keywords). We currently assume
that call consists of first args and then keywords, which is generally
the case, but not always:
```python
f(*args, a=2, *args2, **kwargs)
class A(*args, a=2, *args2, **kwargs):
pass
```
The consequence is accidentally reordering arguments
(#7268).
## Summary
`Arguments::args_and_keywords` returns an iterator of an `ArgOrKeyword`
enum that yields args and keywords in the correct order. I've fixed the
obvious `args` and `keywords` usages, but there might be some cases with
wrong assumptions remaining.
## Test Plan
The generator got new test cases, otherwise the stacked PR
(#7268) which uncovered this.
d374956 to
b30e268
Compare
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.
Summary
In
f(*args, a=b, *args2, **kwargs)the args (*args,*args2) and keywords (a=b,**kwargs) are interleaved, which we previously didn't handle.Fixes #6498
main
PR
Test Plan
New fixtures