Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid token clone in implicit string rule

This commit is contained in:
Charlie Marsh 2024-02-05 22:14:29 -05:00
parent df7fb95cbc
commit a0afde1a3f
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/ruff_linter/src/rules/flake8_implicit_str_concat/rules/implicit.rs
View File

@ -5,7 +5,7 @@ use ruff_macros::{derive_message_formats, violation};
use ruff_python_ast::str::{leading_quote, trailing_quote}; use ruff_python_ast::str::{leading_quote, trailing_quote};
use ruff_python_index::Indexer; use ruff_python_index::Indexer;
use ruff_python_parser::lexer::LexResult; use ruff_python_parser::lexer::LexResult;
use ruff_python_parser::Tok; use ruff_python_parser::TokenKind;
use ruff_source_file::Locator; use ruff_source_file::Locator;
use ruff_text_size::{Ranged, TextRange}; use ruff_text_size::{Ranged, TextRange};
@ -101,28 +101,37 @@ pub(crate) fn implicit(
for ((a_tok, a_range), (b_tok, b_range)) in tokens for ((a_tok, a_range), (b_tok, b_range)) in tokens
.iter() .iter()
.flatten() .flatten()
.filter(|(tok, _)| { .filter_map(|(tok, range)| {
!tok.is_comment() // Ignore comments.
&& (settings.flake8_implicit_str_concat.allow_multiline if tok.is_comment() {
|| !tok.is_non_logical_newline()) return None;
}
// Ignore non-localized newlines.
if !settings.flake8_implicit_str_concat.allow_multiline && tok.is_non_logical_newline()
{
return None;
}
Some((TokenKind::from(tok), *range))
}) })
.tuple_windows() .tuple_windows()
{ {
let (a_range, b_range) = match (a_tok, b_tok) { let (a_range, b_range) = match (a_tok, b_tok) {
(Tok::String { .. }, Tok::String { .. }) => (*a_range, *b_range), (TokenKind::String, TokenKind::String) => (a_range, b_range),
(Tok::String { .. }, Tok::FStringStart) => { (TokenKind::String, TokenKind::FStringStart) => {
match indexer.fstring_ranges().innermost(b_range.start()) { match indexer.fstring_ranges().innermost(b_range.start()) {
Some(b_range) => (*a_range, b_range), Some(b_range) => (a_range, b_range),
None => continue, None => continue,
} }
} }
(Tok::FStringEnd, Tok::String { .. }) => { (TokenKind::FStringEnd, TokenKind::String { .. }) => {
match indexer.fstring_ranges().innermost(a_range.start()) { match indexer.fstring_ranges().innermost(a_range.start()) {
Some(a_range) => (a_range, *b_range), Some(a_range) => (a_range, b_range),
None => continue, None => continue,
} }
} }
(Tok::FStringEnd, Tok::FStringStart) => { (TokenKind::FStringEnd, TokenKind::FStringStart) => {
match ( match (
indexer.fstring_ranges().innermost(a_range.start()), indexer.fstring_ranges().innermost(a_range.start()),
indexer.fstring_ranges().innermost(b_range.start()), indexer.fstring_ranges().innermost(b_range.start()),