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

Respect 'is not' operators split across newlines (#4977)

Browse source
This commit is contained in:
Charlie Marsh 2023-06-09 01:07:45 -04:00 • committed by GitHub
parent d647105e97
commit 16d1e63a5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ruff_python_ast/src/helpers.rs
View file

@ -1440,14 +1440,21 @@ impl LocatedCmpop {
}
}
/// Extract all [`Cmpop`] operators from a source code snippet, with appropriate
/// Extract all [`Cmpop`] operators from an expression snippet, with appropriate
/// ranges.
///
/// `RustPython` doesn't include line and column information on [`Cmpop`] nodes.
/// `CPython` doesn't either. This method iterates over the token stream and
/// re-identifies [`Cmpop`] nodes, annotating them with valid ranges.
pub fn locate_cmpops(contents: &str) -> Vec<LocatedCmpop> {
let mut tok_iter = lexer::lex(contents, Mode::Module).flatten().peekable();
let mut tok_iter = lexer::lex(contents, Mode::Expression)
.flatten()
.filter(|(tok, _)|
// Skip whitespace, including Tok::Newline. It should be sufficient to skip
// Tok::NonLogicalNewline, but the lexer doesn't know that we're within an
// expression, and so it may confusion logical and non-logical newlines.
!matches!(tok, Tok::Newline | Tok::NonLogicalNewline | Tok::Comment(_)))
.peekable();
let mut ops: Vec<LocatedCmpop> = vec![];
let mut count = 0u32;
loop {