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

Fix range of unparenthesized tuple subject in match statement (#8101)

Browse Source 
## Summary

This was just a bug in the parser ranges, probably since it was
initially implemented. Given `match n % 3, n % 5: ...`, the "subject"
(i.e., the tuple of two binary operators) was using the entire range of
the `match` statement.

Closes https://github.com/astral-sh/ruff/issues/8091.

## Test Plan

`cargo test`
This commit is contained in:
Charlie Marsh
2023-10-22 16:58:33 -07:00
committed by GitHub
parent 95702e408f
commit d6a4283003
7 changed files with 2763 additions and 2369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -466,7 +466,7 @@ MatchStatement: ast::Stmt = {
}
)
},
<location:@L> "match" <subject:TestOrStarNamedExpr> "," ":" "\n" Indent <cases:MatchCase+> Dedent => {
<location:@L> "match" <tuple_location:@L> <subject:TestOrStarNamedExpr> "," <tuple_end_location:@R> ":" "\n" Indent <cases:MatchCase+> Dedent => {
let end_location = cases
.last()
.unwrap()
@@ -476,13 +476,19 @@ MatchStatement: ast::Stmt = {
.end();
ast::Stmt::Match(
ast::StmtMatch {
subject: Box::new(subject.into()),
subject: Box::new(ast::Expr::Tuple(
ast::ExprTuple {
elts: vec![subject.into()],
ctx: ast::ExprContext::Load,
range: (tuple_location..tuple_end_location).into()
},
)),
cases,
range: (location..end_location).into()
}
)
},
<location:@L> "match" <elts:TwoOrMore<TestOrStarNamedExpr, ",">> ","? ":" "\n" Indent <cases:MatchCase+> Dedent => {
<location:@L> "match" <tuple_location:@L> <elts:TwoOrMore<TestOrStarNamedExpr, ",">> ","? <tuple_end_location:@R> ":" "\n" Indent <cases:MatchCase+> Dedent => {
let end_location = cases
.last()
.unwrap()
@@ -497,7 +503,7 @@ MatchStatement: ast::Stmt = {
ast::ExprTuple {
elts,
ctx: ast::ExprContext::Load,
range: (location..end_location).into()
range: (tuple_location..tuple_end_location).into()
},
)),
cases,