-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use empty range when there's "gap" in token source (#11032)
## Summary This fixes a bug where the parser would panic when there is a "gap" in the token source. What's a gap? The reason it's `<=` instead of just `==` is because there could be whitespaces between the two tokens. For example: ```python # last token end # | current token (newline) start # v v def foo \n # ^ # assume there's trailing whitespace here ``` Or, there could tokens that are considered "trivia" and thus aren't emitted by the token source. These are comments and non-logical newlines. For example: ```python # last token end # v def foo # comment\n # ^ current token (newline) start ``` In either of the above cases, there's a "gap" between the end of the last token and start of the current token. ## Test Plan Add test cases and update the snapshots.
- Loading branch information
1 parent
9b80cc0
commit d3cd61f
Showing
5 changed files
with
195 additions
and
26 deletions.
There are no files selected for viewing
3 changes: 3 additions & 0 deletions
3
crates/ruff_python_parser/resources/inline/err/node_range_with_gaps.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
def foo # comment | ||
def bar(): ... | ||
def baz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
crates/ruff_python_parser/tests/snapshots/invalid_syntax@node_range_with_gaps.py.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
--- | ||
source: crates/ruff_python_parser/tests/fixtures.rs | ||
input_file: crates/ruff_python_parser/resources/inline/err/node_range_with_gaps.py | ||
--- | ||
## AST | ||
|
||
``` | ||
Module( | ||
ModModule { | ||
range: 0..41, | ||
body: [ | ||
FunctionDef( | ||
StmtFunctionDef { | ||
range: 0..7, | ||
is_async: false, | ||
decorator_list: [], | ||
name: Identifier { | ||
id: "foo", | ||
range: 4..7, | ||
}, | ||
type_params: None, | ||
parameters: Parameters { | ||
range: 7..7, | ||
posonlyargs: [], | ||
args: [], | ||
vararg: None, | ||
kwonlyargs: [], | ||
kwarg: None, | ||
}, | ||
returns: None, | ||
body: [], | ||
}, | ||
), | ||
FunctionDef( | ||
StmtFunctionDef { | ||
range: 18..32, | ||
is_async: false, | ||
decorator_list: [], | ||
name: Identifier { | ||
id: "bar", | ||
range: 22..25, | ||
}, | ||
type_params: None, | ||
parameters: Parameters { | ||
range: 25..27, | ||
posonlyargs: [], | ||
args: [], | ||
vararg: None, | ||
kwonlyargs: [], | ||
kwarg: None, | ||
}, | ||
returns: None, | ||
body: [ | ||
Expr( | ||
StmtExpr { | ||
range: 29..32, | ||
value: EllipsisLiteral( | ||
ExprEllipsisLiteral { | ||
range: 29..32, | ||
}, | ||
), | ||
}, | ||
), | ||
], | ||
}, | ||
), | ||
FunctionDef( | ||
StmtFunctionDef { | ||
range: 33..40, | ||
is_async: false, | ||
decorator_list: [], | ||
name: Identifier { | ||
id: "baz", | ||
range: 37..40, | ||
}, | ||
type_params: None, | ||
parameters: Parameters { | ||
range: 40..40, | ||
posonlyargs: [], | ||
args: [], | ||
vararg: None, | ||
kwonlyargs: [], | ||
kwarg: None, | ||
}, | ||
returns: None, | ||
body: [], | ||
}, | ||
), | ||
], | ||
}, | ||
) | ||
``` | ||
## Errors | ||
|
||
| | ||
1 | def foo # comment | ||
| ^ Syntax Error: Expected '(', found newline | ||
2 | def bar(): ... | ||
3 | def baz | ||
| | ||
|
||
|
||
| | ||
1 | def foo # comment | ||
2 | def bar(): ... | ||
| ^^^ Syntax Error: Expected ')', found 'def' | ||
3 | def baz | ||
| | ||
|
||
|
||
| | ||
1 | def foo # comment | ||
2 | def bar(): ... | ||
3 | def baz | ||
| ^ Syntax Error: Expected '(', found newline | ||
| | ||
|
||
|
||
| | ||
2 | def bar(): ... | ||
3 | def baz | ||
| |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters