Skip to content

Commit edf5995

Browse files
youknowoneyouknowone
authored
Merge pull request RustPython#4552 from charliermarsh/charlie/loc
Limit match range to end of last statement
2 parents 6b2efdc + 57efe6f commit edf5995

4 files changed

Lines changed: 109 additions & 85 deletions

File tree

‎compiler/parser/python.lalrpop‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,15 @@ CompoundStatement: ast::Stmt = {
358358
};
359359

360360
MatchStatement: ast::Stmt = {
361-
<location:@L> "match" <subject:TestOrStarNamedExpr> ":" "\n" Indent <cases:MatchCase+> Dedent <end_location:@R> => {
361+
<location:@L> "match" <subject:TestOrStarNamedExpr> ":" "\n" Indent <cases:MatchCase+> Dedent => {
362+
let end_location = cases
363+
.last()
364+
.unwrap()
365+
.body
366+
.last()
367+
.unwrap()
368+
.end_location
369+
.unwrap();
362370
ast::Stmt {
363371
location,
364372
end_location: Some(end_location),
@@ -369,7 +377,15 @@ MatchStatement: ast::Stmt = {
369377
}
370378
}
371379
},
372-
<location:@L> "match" <subject:TestOrStarNamedExpr> "," ":" "\n" Indent <cases:MatchCase+> Dedent <end_location:@R> => {
380+
<location:@L> "match" <subject:TestOrStarNamedExpr> "," ":" "\n" Indent <cases:MatchCase+> Dedent => {
381+
let end_location = cases
382+
.last()
383+
.unwrap()
384+
.body
385+
.last()
386+
.unwrap()
387+
.end_location
388+
.unwrap();
373389
ast::Stmt {
374390
location,
375391
end_location: Some(end_location),
@@ -380,7 +396,15 @@ MatchStatement: ast::Stmt = {
380396
}
381397
}
382398
},
383-
<location:@L> "match" <subject:TestOrStarNamedExpr> "," <subjects:OneOrMore<TestOrStarNamedExpr>> ","? ":" "\n" Indent <cases:MatchCase+> Dedent <end_location:@R> => {
399+
<location:@L> "match" <subject:TestOrStarNamedExpr> "," <subjects:OneOrMore<TestOrStarNamedExpr>> ","? ":" "\n" Indent <cases:MatchCase+> Dedent => {
400+
let end_location = cases
401+
.last()
402+
.unwrap()
403+
.body
404+
.last()
405+
.unwrap()
406+
.end_location
407+
.unwrap();
384408
let mut subjects = subjects;
385409
subjects.insert(0, subject);
386410
ast::Stmt {

‎compiler/parser/src/snapshots/rustpython_parser__parser__tests__match.snap‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎compiler/parser/src/snapshots/rustpython_parser__parser__tests__match_as_identifier.snap‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)