Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove type parameter from parse_* methods (#9466)

Browse Source
This commit is contained in:
Micha Reiser
2024-01-11 19:41:19 +01:00
committed by GitHub
parent 25bafd2d66
commit f192c72596
13 changed files with 98 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/ruff_python_index/src/comment_ranges.rs
View File

@@ -1,7 +1,7 @@
use std::fmt::Debug;
use ruff_python_ast::PySourceType;
use ruff_python_parser::lexer::{lex, LexicalError};
use ruff_python_parser::lexer::{lex, LexResult, LexicalError};
use ruff_python_parser::{AsMode, Tok};
use ruff_python_trivia::CommentRanges;
use ruff_text_size::TextRange;
@@ -27,15 +27,16 @@ impl CommentRangesBuilder {
pub fn tokens_and_ranges(
source: &str,
source_type: PySourceType,
) -> Result<(Vec<(Tok, TextRange)>, CommentRanges), LexicalError> {
) -> Result<(Vec<LexResult>, CommentRanges), LexicalError> {
let mut tokens = Vec::new();
let mut comment_ranges = CommentRangesBuilder::default();
for result in lex(source, source_type.as_mode()) {
let (token, range) = result?;
if let Ok((token, range)) = &result {
comment_ranges.visit_token(token, *range);
}
comment_ranges.visit_token(&token, range);
tokens.push((token, range));
tokens.push(result);
}
let comment_ranges = comment_ranges.finish();