Python/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff synced 2026-01-21 05:20:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Expand NamedExpr range to include full range of parenthesized value (#6632)

Browse Source 
## Summary

Given:

```python
if (
    x
    :=
    (  # 4
        y # 5
    )  # 6
):
    pass
```

It turns out the parser ended the range of the `NamedExpr` at the end of
`y`, rather than the end of the parenthesis that encloses `y`. This just
seems like a bug -- the range should be from the start of the name on
the left, to the end of the parenthesized node on the right.

## Test Plan

`cargo test`
This commit is contained in:
Charlie Marsh
2023-08-17 10:34:05 -04:00
committed by GitHub
parent d9bb51dee4
commit a70807e1e1
4 changed files with 18803 additions and 18665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/ruff_python_parser/src/python.lalrpop
View File

@@ -1335,15 +1335,19 @@ NamedExpressionTest: ast::Expr = {
Test<"all">,
}
NamedExpressionName: ast::Expr = {
<location:@L> <id:Identifier> <end_location:@R> => ast::Expr::Name(
ast::ExprName { id: id.into(), ctx: ast::ExprContext::Store, range: (location..end_location).into() },
),
}
NamedExpression: ast::Expr = {
<location:@L> <id:Identifier> <end_location:@R> ":=" <value:Test<"all">> => {
<location:@L> <target:NamedExpressionName> ":=" <value:Test<"all">> <end_location:@R> => {
ast::Expr::NamedExpr(
ast::ExprNamedExpr {
target: Box::new(ast::Expr::Name(
ast::ExprName { id: id.into(), ctx: ast::ExprContext::Store, range: (location..end_location).into() },
)),
range: (location..value.end()).into(),
target: Box::new(target),
value: Box::new(value),
range: (location..end_location).into(),
}
)
},