mirror of
https://github.com/astral-sh/ruff.git
synced 2025-07-23 04:55:09 +00:00

**Summary** [Option::is_some_and](https://doc.rust-lang.org/stable/std/option/enum.Option.html#method.is_some_and) and [Result::is_ok_and](https://doc.rust-lang.org/std/result/enum.Result.html#method.is_ok_and) are new methods is rust 1.70. I find them way more readable than `.map_or(false, ...)`. The changes are `s/.map_or(false,/.is_some_and(/g`, then manually switching to `is_ok_and` where the value is a Result rather than an Option. **Test Plan** n/a^
163 lines
6.9 KiB
Rust
163 lines
6.9 KiB
Rust
use crate::{lexer::LexResult, token::Tok, Mode};
|
|
use itertools::{Itertools, MultiPeek};
|
|
|
|
/// An [`Iterator`] that transforms a token stream to accommodate soft keywords (namely, `match`
|
|
/// `case`, and `type`).
|
|
///
|
|
/// [PEP 634](https://www.python.org/dev/peps/pep-0634/) introduced the `match` and `case` keywords
|
|
/// as soft keywords, meaning that they can be used as identifiers (e.g., variable names) in certain
|
|
/// contexts.
|
|
///
|
|
/// Later, [PEP 695](https://peps.python.org/pep-0695/#generic-type-alias) introduced the `type`
|
|
/// soft keyword.
|
|
///
|
|
/// This function modifies a token stream to accommodate this change. In particular, it replaces
|
|
/// soft keyword tokens with `identifier` tokens if they are used as identifiers.
|
|
///
|
|
/// Handling soft keywords in this intermediary pass allows us to simplify both the lexer and
|
|
/// `ruff_python_parser`, as neither of them need to be aware of soft keywords.
|
|
pub struct SoftKeywordTransformer<I>
|
|
where
|
|
I: Iterator<Item = LexResult>,
|
|
{
|
|
underlying: MultiPeek<I>,
|
|
start_of_line: bool,
|
|
}
|
|
|
|
impl<I> SoftKeywordTransformer<I>
|
|
where
|
|
I: Iterator<Item = LexResult>,
|
|
{
|
|
pub fn new(lexer: I, mode: Mode) -> Self {
|
|
Self {
|
|
underlying: lexer.multipeek(), // spell-checker:ignore multipeek
|
|
start_of_line: matches!(mode, Mode::Module),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<I> Iterator for SoftKeywordTransformer<I>
|
|
where
|
|
I: Iterator<Item = LexResult>,
|
|
{
|
|
type Item = LexResult;
|
|
|
|
#[inline]
|
|
fn next(&mut self) -> Option<LexResult> {
|
|
let mut next = self.underlying.next();
|
|
if let Some(Ok((tok, range))) = next.as_ref() {
|
|
// If the token is a soft keyword e.g. `type`, `match`, or `case`, check if it's
|
|
// used as an identifier. We assume every soft keyword use is an identifier unless
|
|
// a heuristic is met.
|
|
|
|
match tok {
|
|
// For `match` and `case`, all of the following conditions must be met:
|
|
// 1. The token is at the start of a logical line.
|
|
// 2. The logical line contains a top-level colon (that is, a colon that is not nested
|
|
// inside a parenthesized expression, list, or dictionary).
|
|
// 3. The top-level colon is not the immediate sibling of a `match` or `case` token.
|
|
// (This is to avoid treating `match` or `case` as identifiers when annotated with
|
|
// type hints.) type hints.)
|
|
Tok::Match | Tok::Case => {
|
|
if self.start_of_line {
|
|
let mut nesting = 0;
|
|
let mut first = true;
|
|
let mut seen_colon = false;
|
|
let mut seen_lambda = false;
|
|
while let Some(Ok((tok, _))) = self.underlying.peek() {
|
|
match tok {
|
|
Tok::Newline => break,
|
|
Tok::Lambda if nesting == 0 => seen_lambda = true,
|
|
Tok::Colon if nesting == 0 => {
|
|
if seen_lambda {
|
|
seen_lambda = false;
|
|
} else if !first {
|
|
seen_colon = true;
|
|
}
|
|
}
|
|
Tok::Lpar | Tok::Lsqb | Tok::Lbrace => nesting += 1,
|
|
Tok::Rpar | Tok::Rsqb | Tok::Rbrace => nesting -= 1,
|
|
_ => {}
|
|
}
|
|
first = false;
|
|
}
|
|
if !seen_colon {
|
|
next = Some(Ok((soft_to_name(tok), *range)));
|
|
}
|
|
} else {
|
|
next = Some(Ok((soft_to_name(tok), *range)));
|
|
}
|
|
}
|
|
// For `type` all of the following conditions must be met:
|
|
// 1. The token is at the start of a logical line.
|
|
// 2. The type token is immediately followed by a name token.
|
|
// 3. The name token is eventually followed by an equality token.
|
|
Tok::Type => {
|
|
if self.start_of_line {
|
|
let mut is_type_alias = false;
|
|
if let Some(Ok((tok, _))) = self.underlying.peek() {
|
|
if matches!(
|
|
tok,
|
|
Tok::Name { .. } |
|
|
// We treat a soft keyword token following a type token as a
|
|
// name to support cases like `type type = int` or `type match = int`
|
|
Tok::Type | Tok::Match | Tok::Case
|
|
) {
|
|
let mut nesting = 0;
|
|
while let Some(Ok((tok, _))) = self.underlying.peek() {
|
|
match tok {
|
|
Tok::Newline => break,
|
|
Tok::Equal if nesting == 0 => {
|
|
is_type_alias = true;
|
|
break;
|
|
}
|
|
Tok::Lsqb => nesting += 1,
|
|
Tok::Rsqb => nesting -= 1,
|
|
// Allow arbitrary content within brackets for now
|
|
_ if nesting > 0 => {}
|
|
// Exit if unexpected tokens are seen
|
|
_ => break,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if !is_type_alias {
|
|
next = Some(Ok((soft_to_name(tok), *range)));
|
|
}
|
|
} else {
|
|
next = Some(Ok((soft_to_name(tok), *range)));
|
|
}
|
|
}
|
|
_ => (), // Not a soft keyword token
|
|
}
|
|
}
|
|
|
|
self.start_of_line = next.as_ref().is_some_and(|lex_result| {
|
|
lex_result.as_ref().is_ok_and(|(tok, _)| {
|
|
if matches!(tok, Tok::NonLogicalNewline | Tok::Comment { .. }) {
|
|
return self.start_of_line;
|
|
}
|
|
|
|
matches!(
|
|
tok,
|
|
Tok::StartModule | Tok::Newline | Tok::Indent | Tok::Dedent
|
|
)
|
|
})
|
|
});
|
|
|
|
next
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn soft_to_name(tok: &Tok) -> Tok {
|
|
let name = match tok {
|
|
Tok::Match => "match",
|
|
Tok::Case => "case",
|
|
Tok::Type => "type",
|
|
_ => unreachable!("other tokens never reach here"),
|
|
};
|
|
Tok::Name {
|
|
name: name.to_owned(),
|
|
}
|
|
}
|