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

Emit LexError for dedent to incorrect level (#7638)

Browse source
This commit is contained in:
Micha Reiser 2023-09-25 12:45:44 +02:00 • committed by GitHub
parent 10e35e38d7
commit 8ce138760a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 126 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -556,10 +556,22 @@ impl<'source> Lexer<'source> {
pub fn next_token(&mut self) -> LexResult {
// Return dedent tokens until the current indentation level matches the indentation of the next token.
if let Some(indentation) = self.pending_indentation.take() {
if let Ok(Ordering::Greater) = self.indentations.current().try_compare(indentation) {
self.pending_indentation = Some(indentation);
self.indentations.pop();
return Ok((Tok::Dedent, TextRange::empty(self.offset())));
match self.indentations.current().try_compare(indentation) {
Ok(Ordering::Greater) => {
self.pending_indentation = Some(indentation);
let offset = self.offset();
self.indentations.dedent_one(indentation).map_err(|_| {
LexicalError::new(LexicalErrorType::IndentationError, offset)
})?;
return Ok((Tok::Dedent, TextRange::empty(offset)));
}
Ok(_) => {}
Err(_) => {
return Err(LexicalError::new(
LexicalErrorType::IndentationError,
self.offset(),
));
}
}
}
@ -690,9 +702,12 @@ impl<'source> Lexer<'source> {
let token = match self.indentations.current().try_compare(indentation) {
// Dedent
Ok(Ordering::Greater) => {
self.indentations.pop();
self.pending_indentation = Some(indentation);
self.indentations.dedent_one(indentation).map_err(|_| {
LexicalError::new(LexicalErrorType::IndentationError, self.offset())
})?;
Some((Tok::Dedent, TextRange::empty(self.offset())))
}
@ -700,7 +715,7 @@ impl<'source> Lexer<'source> {
// Indent
Ok(Ordering::Less) => {
self.indentations.push(indentation);
self.indentations.indent(indentation);
Some((Tok::Indent, self.token_range()))
}
Err(_) => {
@ -732,7 +747,7 @@ impl<'source> Lexer<'source> {
Ok((Tok::Newline, TextRange::empty(self.offset())))
}
// Next, flush the indentation stack to zero.
else if self.indentations.pop().is_some() {
else if self.indentations.dedent().is_some() {
Ok((Tok::Dedent, TextRange::empty(self.offset())))
} else {
Ok((Tok::EndOfFile, TextRange::empty(self.offset())))
@ -1678,4 +1693,16 @@ def f(arg=%timeit a = b):
result => panic!("Expected an error token but found {result:?}"),
}
}
#[test]
fn tet_too_low_dedent() {
let tokens: Vec<_> = lex(
r#"if True:
pass
pass"#,
Mode::Module,
)
.collect();
assert_debug_snapshot!(tokens);
}
}