mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-03 18:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Expect indented case block instead of match stmt (#11033)

Browse source 
## Summary

This PR adds a new `Clause::Case` and uses it to parse the body of a
`case` block. Earlier, it was using `Match` which would give an
incorrect error message like:

```
  |
1 | match subject:
2 |     case 1:
3 |     case 2: ...
  |     ^^^^ Syntax Error: Expected an indented block after `match` statement
  |
```

## Test Plan

Add test case and update the snapshot.
This commit is contained in:
Dhruv Manilawala 2024-04-19 16:46:15 +05:30 • committed by GitHub
parent 06c248a126
commit 9bb23b0a38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 95 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/ruff_python_parser/resources/inline/err/case_expect_indented_block.py Normal file
View file

@ -0,0 +1,3 @@
match subject:
case 1:
case 2: ...

11
crates/ruff_python_parser/src/parser/statement.rs
View file

@ -2492,7 +2492,12 @@ impl<'src> Parser<'src> {
}; };
self.expect(TokenKind::Colon); self.expect(TokenKind::Colon);
let body = self.parse_body(Clause::Match);
// test_err case_expect_indented_block
// match subject:
// case 1:
// case 2: ...
let body = self.parse_body(Clause::Case);
ast::MatchCase { ast::MatchCase {
pattern, pattern,
@ -3363,7 +3368,7 @@ enum Clause {
Class, Class,
While, While,
FunctionDef, FunctionDef,
Match, Case,
Try, Try,
Except, Except,
Finally, Finally,
@ -3380,7 +3385,7 @@ impl Display for Clause {
Clause::Class => write!(f, "`class` definition"), Clause::Class => write!(f, "`class` definition"),
Clause::While => write!(f, "`while` statement"), Clause::While => write!(f, "`while` statement"),
Clause::FunctionDef => write!(f, "function definition"), Clause::FunctionDef => write!(f, "function definition"),
Clause::Match => write!(f, "`match` statement"), Clause::Case => write!(f, "`case` block"),
Clause::Try => write!(f, "`try` statement"), Clause::Try => write!(f, "`try` statement"),
Clause::Except => write!(f, "`except` clause"), Clause::Except => write!(f, "`except` clause"),
Clause::Finally => write!(f, "`finally` clause"), Clause::Finally => write!(f, "`finally` clause"),

84
crates/ruff_python_parser/tests/snapshots/invalid_syntax@case_expect_indented_block.py.snap Normal file
View file

@ -0,0 +1,84 @@
---
source: crates/ruff_python_parser/tests/fixtures.rs
input_file: crates/ruff_python_parser/resources/inline/err/case_expect_indented_block.py
---
## AST
```
Module(
ModModule {
range: 0..43,
body: [
Match(
StmtMatch {
range: 0..42,
subject: Name(
ExprName {
range: 6..13,
id: "subject",
ctx: Load,
},
),
cases: [
MatchCase {
range: 19..26,
pattern: MatchValue(
PatternMatchValue {
range: 24..25,
value: NumberLiteral(
ExprNumberLiteral {
range: 24..25,
value: Int(
1,
),
},
),
},
),
guard: None,
body: [],
},
MatchCase {
range: 31..42,
pattern: MatchValue(
PatternMatchValue {
range: 36..37,
value: NumberLiteral(
ExprNumberLiteral {
range: 36..37,
value: Int(
2,
),
},
),
},
),
guard: None,
body: [
Expr(
StmtExpr {
range: 39..42,
value: EllipsisLiteral(
ExprEllipsisLiteral {
range: 39..42,
},
),
},
),
],
},
],
},
),
],
},
)
```
## Errors
|
1 | match subject:
2 | case 1:
3 | case 2: ...
| ^^^^ Syntax Error: Expected an indented block after `case` block
|