language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 12:55:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Generic "comment to node" association logic (#4642)

Browse source
This commit is contained in:
Micha Reiser 2023-05-30 11:28:01 +02:00 • committed by GitHub
parent 84a5584888
commit 0cd453bdf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 1574 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/ruff_python_ast/src/source_code/indexer.rs
View file

@ -1,6 +1,7 @@
//! Struct used to index source code, to enable efficient lookup of tokens that
//! are omitted from the AST (e.g., commented lines).
use crate::source_code::comment_ranges::{CommentRanges, CommentRangesBuilder};
use ruff_text_size::{TextRange, TextSize};
use rustpython_parser::lexer::LexResult;
use rustpython_parser::{StringKind, Tok};
@ -8,8 +9,7 @@ use rustpython_parser::{StringKind, Tok};
use crate::source_code::Locator;
pub struct Indexer {
/// Stores the ranges of comments sorted by [`TextRange::start`] in increasing order. No two ranges are overlapping.
comment_ranges: Vec<TextRange>,
comment_ranges: CommentRanges,
/// Stores the start offset of continuation lines.
continuation_lines: Vec<TextSize>,
@ -27,7 +27,7 @@ impl Indexer {
pub fn from_tokens(tokens: &[LexResult], locator: &Locator) -> Self {
assert!(TextSize::try_from(locator.contents().len()).is_ok());
let mut comment_ranges = Vec::new();
let mut comment_ranges_builder = CommentRangesBuilder::default();
let mut continuation_lines = Vec::new();
let mut triple_quoted_string_ranges = Vec::new();
let mut f_string_ranges = Vec::new();
@ -63,10 +63,9 @@ impl Indexer {
}
}
comment_ranges_builder.visit_token(tok, *range);
match tok {
Tok::Comment(..) => {
comment_ranges.push(*range);
}
Tok::Newline | Tok::NonLogicalNewline => {
line_start = range.end();
}
@ -89,7 +88,7 @@ impl Indexer {
prev_end = range.end();
}
Self {
comment_ranges,
comment_ranges: comment_ranges_builder.finish(),
continuation_lines,
triple_quoted_string_ranges,
f_string_ranges,
@ -97,7 +96,7 @@ impl Indexer {
}
/// Returns the byte offset ranges of comments
pub fn comment_ranges(&self) -> &[TextRange] {
pub fn comment_ranges(&self) -> &CommentRanges {
&self.comment_ranges
}