Skip to content

Commit 0790899

Browse files
committed
improve diagnostic ranges
1 parent e8e39f7 commit 0790899

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

crates/ruff_python_parser/src/parser/expression.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@ impl<'src> Parser<'src> {
879879
{
880880
self.add_unsupported_syntax_error(
881881
UnsupportedSyntaxErrorKind::UnparWalrusBefore310,
882-
self.node_range(start),
882+
lower.range(),
883883
);
884884
}
885885

@@ -1662,8 +1662,8 @@ impl<'src> Parser<'src> {
16621662
&& key_or_element.is_unparenthesized_named_expr()
16631663
{
16641664
self.add_unsupported_syntax_error(
1665-
UnsupportedSyntaxErrorKind::UnparWalrusBefore310,
1666-
self.node_range(start),
1665+
UnsupportedSyntaxErrorKind::UnparWalrus,
1666+
key_or_element.range(),
16671667
);
16681668
}
16691669

@@ -1714,8 +1714,8 @@ impl<'src> Parser<'src> {
17141714
&& key_or_element.is_unparenthesized_named_expr()
17151715
{
17161716
self.add_unsupported_syntax_error(
1717-
UnsupportedSyntaxErrorKind::UnparWalrusBefore310,
1718-
self.node_range(start),
1717+
UnsupportedSyntaxErrorKind::UnparWalrus,
1718+
key_or_element.range(),
17191719
);
17201720
}
17211721
Expr::Set(self.parse_set_expression(key_or_element.expr, start))
@@ -1884,8 +1884,8 @@ impl<'src> Parser<'src> {
18841884
&& parsed_expr.is_unparenthesized_named_expr()
18851885
{
18861886
parser.add_unsupported_syntax_error(
1887-
UnsupportedSyntaxErrorKind::UnparWalrusBefore310,
1888-
parser.node_range(start),
1887+
UnsupportedSyntaxErrorKind::UnparWalrus,
1888+
parsed_expr.range(),
18891889
);
18901890
}
18911891

crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_walrus_set_comp_py39.py.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,5 +87,5 @@ Module(
8787
|
8888
1 | # parse_options: {"target-version": "3.9"}
8989
2 | {last := x for x in range(3)}
90-
| ^^^^^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
90+
| ^^^^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
9191
|

crates/ruff_python_parser/tests/snapshots/invalid_syntax@unparenthesized_walrus_set_literal_py39.py.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Module(
162162
|
163163
1 | # parse_options: {"target-version": "3.9"}
164164
2 | {x := 1, 2, 3}
165-
| ^^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
165+
| ^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
166166
3 | {1, x := 2, 3}
167167
4 | {1, 2, x := 3}
168168
|
@@ -172,7 +172,7 @@ Module(
172172
1 | # parse_options: {"target-version": "3.9"}
173173
2 | {x := 1, 2, 3}
174174
3 | {1, x := 2, 3}
175-
| ^^^^^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
175+
| ^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
176176
4 | {1, 2, x := 3}
177177
|
178178

@@ -181,5 +181,5 @@ Module(
181181
2 | {x := 1, 2, 3}
182182
3 | {1, x := 2, 3}
183183
4 | {1, 2, x := 3}
184-
| ^^^^^^^^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
184+
| ^^^^^^ Syntax Error: Cannot use unparenthesized assignment expression on Python 3.9 (syntax was added in Python 3.10)
185185
|

0 commit comments

Comments
 (0)