mirror of
https://github.com/astral-sh/ruff.git
synced 2025-07-23 13:05:06 +00:00
Introduce ArgOrKeyword
to keep call parameter order (#7302)
## 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 (https://github.com/astral-sh/ruff/pull/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 (https://github.com/astral-sh/ruff/pull/7268) which uncovered this.
This commit is contained in:
parent
179128dc54
commit
56440ad835
8 changed files with 133 additions and 49 deletions
|
@ -207,6 +207,8 @@ pub fn any_over_expr(expr: &Expr, func: &dyn Fn(&Expr) -> bool) -> bool {
|
|||
range: _,
|
||||
}) => {
|
||||
any_over_expr(call_func, func)
|
||||
// Note that this is the evaluation order but not necessarily the declaration order
|
||||
// (e.g. for `f(*args, a=2, *args2, **kwargs)` it's not)
|
||||
|| args.iter().any(|expr| any_over_expr(expr, func))
|
||||
|| keywords
|
||||
.iter()
|
||||
|
@ -347,6 +349,8 @@ pub fn any_over_stmt(stmt: &Stmt, func: &dyn Fn(&Expr) -> bool) -> bool {
|
|||
decorator_list,
|
||||
..
|
||||
}) => {
|
||||
// Note that e.g. `class A(*args, a=2, *args2, **kwargs): pass` is a valid class
|
||||
// definition
|
||||
arguments
|
||||
.as_deref()
|
||||
.is_some_and(|Arguments { args, keywords, .. }| {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue