mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-13 22:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Removing trailing whitespace inside multiline strings is unsafe (#9744)

Browse source 
Fix #8037.
This commit is contained in:
Seo Sanghyeon 2024-02-01 06:45:23 +09:00 • committed by GitHub
parent 7992583908
commit 6e225cb57c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 89 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ruff_python_index/src/indexer.rs
View file

@ -11,6 +11,7 @@ use ruff_source_file::Locator;
use ruff_text_size::{Ranged, TextRange, TextSize};
use crate::fstring_ranges::{FStringRanges, FStringRangesBuilder};
use crate::multiline_ranges::{MultilineRanges, MultilineRangesBuilder};
use crate::CommentRangesBuilder;
pub struct Indexer {
@ -21,6 +22,9 @@ pub struct Indexer {
/// The range of all f-string in the source document.
fstring_ranges: FStringRanges,
/// The range of all multiline strings in the source document.
multiline_ranges: MultilineRanges,
}
impl Indexer {
@ -29,6 +33,7 @@ impl Indexer {
let mut comment_ranges_builder = CommentRangesBuilder::default();
let mut fstring_ranges_builder = FStringRangesBuilder::default();
let mut multiline_ranges_builder = MultilineRangesBuilder::default();
let mut continuation_lines = Vec::new();
// Token, end
let mut prev_end = TextSize::default();
@ -61,6 +66,7 @@ impl Indexer {
comment_ranges_builder.visit_token(tok, *range);
fstring_ranges_builder.visit_token(tok, *range);
multiline_ranges_builder.visit_token(tok, *range);
match tok {
Tok::Newline | Tok::NonLogicalNewline => {
@ -82,6 +88,7 @@ impl Indexer {
comment_ranges: comment_ranges_builder.finish(),
continuation_lines,
fstring_ranges: fstring_ranges_builder.finish(),
multiline_ranges: multiline_ranges_builder.finish(),
}
}
@ -95,6 +102,11 @@ impl Indexer {
&self.fstring_ranges
}
/// Returns the byte offset ranges of multiline strings.
pub const fn multiline_ranges(&self) -> &MultilineRanges {
&self.multiline_ranges
}
/// Returns the line start positions of continuations (backslash).
pub fn continuation_line_starts(&self) -> &[TextSize] {
&self.continuation_lines