mirror of
https://github.com/astral-sh/ruff.git
synced 2025-08-18 09:30:35 +00:00
Add support for PEP 701 (#7376)
## Summary This PR adds support for PEP 701 in Ruff. This is a rollup PR of all the other individual PRs. The separate PRs were created for logic separation and code reviews. Refer to each pull request for a detail description on the change. Refer to the PR description for the list of pull requests within this PR. ## Test Plan ### Formatter ecosystem checks Explanation for the change in ecosystem check: https://github.com/astral-sh/ruff/pull/7597#issue-1908878183 #### `main` ``` | project | similarity index | total files | changed files | |--------------|------------------:|------------------:|------------------:| | cpython | 0.76083 | 1789 | 1631 | | django | 0.99983 | 2760 | 36 | | transformers | 0.99963 | 2587 | 319 | | twine | 1.00000 | 33 | 0 | | typeshed | 0.99983 | 3496 | 18 | | warehouse | 0.99967 | 648 | 15 | | zulip | 0.99972 | 1437 | 21 | ``` #### `dhruv/pep-701` ``` | project | similarity index | total files | changed files | |--------------|------------------:|------------------:|------------------:| | cpython | 0.76051 | 1789 | 1632 | | django | 0.99983 | 2760 | 36 | | transformers | 0.99963 | 2587 | 319 | | twine | 1.00000 | 33 | 0 | | typeshed | 0.99983 | 3496 | 18 | | warehouse | 0.99967 | 648 | 15 | | zulip | 0.99972 | 1437 | 21 | ```
This commit is contained in:
parent
78b8741352
commit
e62e245c61
115 changed files with 44780 additions and 31370 deletions
95
crates/ruff_python_index/src/fstring_ranges.rs
Normal file
95
crates/ruff_python_index/src/fstring_ranges.rs
Normal file
|
@ -0,0 +1,95 @@
|
|||
use std::collections::BTreeMap;
|
||||
|
||||
use ruff_python_parser::Tok;
|
||||
use ruff_text_size::{TextRange, TextSize};
|
||||
|
||||
/// Stores the ranges of all f-strings in a file sorted by [`TextRange::start`].
|
||||
/// There can be multiple overlapping ranges for nested f-strings.
|
||||
#[derive(Debug)]
|
||||
pub struct FStringRanges {
|
||||
raw: BTreeMap<TextSize, TextRange>,
|
||||
}
|
||||
|
||||
impl FStringRanges {
|
||||
/// Return the [`TextRange`] of the innermost f-string at the given offset.
|
||||
pub fn innermost(&self, offset: TextSize) -> Option<TextRange> {
|
||||
self.raw
|
||||
.range(..=offset)
|
||||
.rev()
|
||||
.find(|(_, range)| range.contains(offset))
|
||||
.map(|(_, range)| *range)
|
||||
}
|
||||
|
||||
/// Return the [`TextRange`] of the outermost f-string at the given offset.
|
||||
pub fn outermost(&self, offset: TextSize) -> Option<TextRange> {
|
||||
// Explanation of the algorithm:
|
||||
//
|
||||
// ```python
|
||||
// # v
|
||||
// f"normal" f"another" f"first {f"second {f"third"} second"} first"
|
||||
// # ^^(1)^^^
|
||||
// # ^^^^^^^^^^^^(2)^^^^^^^^^^^^
|
||||
// # ^^^^^^^^^^^^^^^^^^^^^(3)^^^^^^^^^^^^^^^^^^^^
|
||||
// # ^^^(4)^^^^
|
||||
// # ^^^(5)^^^
|
||||
// ```
|
||||
//
|
||||
// The offset is marked with a `v` and the ranges are numbered in the order
|
||||
// they are yielded by the iterator in the reverse order. The algorithm
|
||||
// works as follows:
|
||||
// 1. Skip all ranges that don't contain the offset (1).
|
||||
// 2. Take all ranges that contain the offset (2, 3).
|
||||
// 3. Stop taking ranges when the offset is no longer contained.
|
||||
// 4. Take the last range that contained the offset (3, the outermost).
|
||||
self.raw
|
||||
.range(..=offset)
|
||||
.rev()
|
||||
.skip_while(|(_, range)| !range.contains(offset))
|
||||
.take_while(|(_, range)| range.contains(offset))
|
||||
.last()
|
||||
.map(|(_, range)| *range)
|
||||
}
|
||||
|
||||
/// Returns an iterator over all f-string [`TextRange`] sorted by their
|
||||
/// start location.
|
||||
///
|
||||
/// For nested f-strings, the outermost f-string is yielded first, moving
|
||||
/// inwards with each iteration.
|
||||
#[inline]
|
||||
pub fn values(&self) -> impl Iterator<Item = &TextRange> + '_ {
|
||||
self.raw.values()
|
||||
}
|
||||
|
||||
/// Returns the number of f-string ranges stored.
|
||||
#[inline]
|
||||
pub fn len(&self) -> usize {
|
||||
self.raw.len()
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub(crate) struct FStringRangesBuilder {
|
||||
start_locations: Vec<TextSize>,
|
||||
raw: BTreeMap<TextSize, TextRange>,
|
||||
}
|
||||
|
||||
impl FStringRangesBuilder {
|
||||
pub(crate) fn visit_token(&mut self, token: &Tok, range: TextRange) {
|
||||
match token {
|
||||
Tok::FStringStart => {
|
||||
self.start_locations.push(range.start());
|
||||
}
|
||||
Tok::FStringEnd => {
|
||||
if let Some(start) = self.start_locations.pop() {
|
||||
self.raw.insert(start, TextRange::new(start, range.end()));
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn finish(self) -> FStringRanges {
|
||||
debug_assert!(self.start_locations.is_empty());
|
||||
FStringRanges { raw: self.raw }
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue