language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-16 09:35:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove lexing for colon-matching use cases (#6803)

Browse source 
It's much simpler to just search ahead for the first colon.
This commit is contained in:
Charlie Marsh 2023-08-23 00:44:51 -04:00 • committed by GitHub
parent 4bc5eddf91
commit d08f697a04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/ruff_python_parser/src/lib.rs
View file

@ -109,7 +109,6 @@
//! [parsing]: https://en.wikipedia.org/wiki/Parsing
//! [lexer]: crate::lexer
use crate::lexer::LexResult;
pub use parser::{
parse, parse_expression, parse_expression_starts_at, parse_program, parse_starts_at,
parse_suite, parse_tokens, ParseError, ParseErrorType,
@ -119,6 +118,8 @@ use ruff_text_size::{TextRange, TextSize};
pub use string::FStringErrorType;
pub use token::{StringKind, Tok, TokenKind};
use crate::lexer::LexResult;
mod function;
// Skip flattening lexer to distinguish from full ruff_python_parser
mod context;
@ -159,25 +160,6 @@ pub fn parse_program_tokens(
}
}
/// Return the `Range` of the first `Tok::Colon` token in a `Range`.
pub fn first_colon_range(
range: TextRange,
source: &str,
is_jupyter_notebook: bool,
) -> Option<TextRange> {
let contents = &source[range];
let mode = if is_jupyter_notebook {
Mode::Jupyter
} else {
Mode::Module
};
let range = lexer::lex_starts_at(contents, mode, range.start())
.flatten()
.find(|(tok, _)| tok.is_colon())
.map(|(_, range)| range);
range
}
/// Extract all [`CmpOp`] operators from an expression snippet, with appropriate
/// ranges.
///
@ -373,24 +355,12 @@ mod python {
#[cfg(test)]
mod tests {
use crate::{first_colon_range, locate_cmp_ops, parse_expression, LocatedCmpOp};
use anyhow::Result;
use ruff_python_ast::CmpOp;
use ruff_text_size::TextSize;
use ruff_text_size::{TextLen, TextRange, TextSize};
#[test]
fn extract_first_colon_range() {
let contents = "with a: pass";
let range = first_colon_range(
TextRange::new(TextSize::from(0), contents.text_len()),
contents,
false,
)
.unwrap();
assert_eq!(&contents[range], ":");
assert_eq!(range, TextRange::new(TextSize::from(6), TextSize::from(7)));
}
use crate::{locate_cmp_ops, parse_expression, LocatedCmpOp};
#[test]
fn extract_cmp_op_location() -> Result<()> {