language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-24 05:26:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Use correct range to highlight line continuation error" (#12089)

Browse source 
This PR reverts https://github.com/astral-sh/ruff/pull/12016 with a
small change where the error location points to the continuation
character only. Earlier, it would also highlight the whitespace that
came before it.

The motivation for this change is to avoid panic in
https://github.com/astral-sh/ruff/pull/11950. For example:

```py
\)
```

Playground: https://play.ruff.rs/87711071-1b54-45a3-b45a-81a336a1ea61

The range of `Unknown` token and `Rpar` is the same. Once #11950 is
enabled, the indexer would panic. It won't panic in the stable version
because we stop at the first `Unknown` token.
This commit is contained in:
Dhruv Manilawala 2024-06-28 18:10:00 +05:30 • committed by GitHub
parent 6a37d7a1e6
commit 434ce307a7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ruff_python_parser/src/error.rs
View file

@ -404,7 +404,7 @@ impl std::fmt::Display for LexicalErrorType {
write!(f, "Got unexpected token {tok}")
}
LexicalErrorType::LineContinuationError => {
write!(f, "unexpected character after line continuation character")
write!(f, "Expected a newline after line continuation character")
}
LexicalErrorType::Eof => write!(f, "unexpected EOF while parsing"),
LexicalErrorType::OtherError(msg) => write!(f, "{msg}"),

4
crates/ruff_python_parser/src/lexer.rs
View file

@ -247,7 +247,7 @@ impl<'src> Lexer<'src> {
} else if !self.cursor.eat_char('\n') {
return Some(self.push_error(LexicalError::new(
LexicalErrorType::LineContinuationError,
TextRange::at(self.offset(), self.cursor.first().text_len()),
TextRange::at(self.offset() - '\\'.text_len(), '\\'.text_len()),
)));
}
indentation = Indentation::root();
@ -339,7 +339,7 @@ impl<'src> Lexer<'src> {
} else if !self.cursor.eat_char('\n') {
return Err(LexicalError::new(
LexicalErrorType::LineContinuationError,
TextRange::at(self.offset(), self.cursor.first().text_len()),
TextRange::at(self.offset() - '\\'.text_len(), '\\'.text_len()),
));
}
}

10
crates/ruff_python_parser/tests/snapshots/invalid_syntax@re_lexing__line_continuation_1.py.snap
View file

@ -11,10 +11,10 @@ Module(
body: [
Expr(
StmtExpr {
range: 0..14,
range: 0..13,
value: Call(
ExprCall {
range: 0..14,
range: 0..13,
func: Name(
ExprName {
range: 0..4,
@ -23,7 +23,7 @@ Module(
},
),
arguments: Arguments {
range: 4..14,
range: 4..13,
args: [
Name(
ExprName {
@ -82,7 +82,7 @@ Module(
|
1 | call(a, b, \\\
| ^ Syntax Error: unexpected character after line continuation character
| ^ Syntax Error: Expected a newline after line continuation character
2 |
3 | def bar():
|
@ -90,7 +90,7 @@ Module(
|
1 | call(a, b, \\\
| ^ Syntax Error: unexpected character after line continuation character
| ^ Syntax Error: Expected a newline after line continuation character
2 |
3 | def bar():
|