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

Move Ranged into ruff_text_size (#6919)

Browse source 
## Summary

The motivation here is that this enables us to implement `Ranged` in
crates that don't depend on `ruff_python_ast`.

Largely a mechanical refactor with a lot of regex, Clippy help, and
manual fixups.

## Test Plan

`cargo test`
This commit is contained in:
Charlie Marsh 2023-08-27 14:12:51 -04:00 • committed by GitHub
parent 88c8bece38
commit fc89976c24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
468 changed files with 940 additions and 706 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/ruff_python_index/src/comment_ranges.rs
View file

@ -3,7 +3,7 @@ use std::fmt::{Debug, Formatter};
use std::ops::Deref;
use ruff_python_parser::Tok;
use ruff_text_size::TextRange;
use ruff_text_size::{Ranged, TextRange};
/// Stores the ranges of comments sorted by [`TextRange::start`] in increasing order. No two ranges are overlapping.
#[derive(Clone)]

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

@ -1,14 +1,14 @@
//! Struct used to index source code, to enable efficient lookup of tokens that
//! are omitted from the AST (e.g., commented lines).
use ruff_python_ast::{Ranged, Stmt};
use ruff_python_ast::Stmt;
use ruff_python_parser::lexer::LexResult;
use ruff_python_parser::{StringKind, Tok};
use ruff_python_trivia::{has_leading_content, has_trailing_content, is_python_whitespace};
use ruff_text_size::{TextRange, TextSize};
use ruff_source_file::Locator;
use ruff_text_size::{Ranged, TextRange, TextSize};
use super::comment_ranges::{CommentRanges, CommentRangesBuilder};
use ruff_source_file::Locator;
pub struct Indexer {
comment_ranges: CommentRanges,
@ -276,10 +276,10 @@ impl Indexer {
mod tests {
use ruff_python_parser::lexer::LexResult;
use ruff_python_parser::{lexer, Mode};
use ruff_source_file::Locator;
use ruff_text_size::{TextRange, TextSize};
use crate::Indexer;
use ruff_source_file::Locator;
#[test]
fn continuation() {