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

feat: use new parenthesized_range in generate_comparison helper

This commit is contained in:
Denys Zhak 2025-12-09 03:00:45 +00:00
parent 03be8b9454
commit d9c1d6eecc
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ruff_linter/src/rules/pycodestyle/rules/literal_comparisons.rs
View File

@ -378,7 +378,6 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
.copied() .copied()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let comment_ranges = checker.comment_ranges();
let tokens = checker.tokens(); let tokens = checker.tokens();
let source = checker.source(); let source = checker.source();
@ -405,7 +404,7 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
&ops, &ops,
&compare.comparators, &compare.comparators,
compare.into(), compare.into(),
comment_ranges, tokens,
source, source,
) )
} }
@ -415,7 +414,7 @@ pub(crate) fn literal_comparisons(checker: &Checker, compare: &ast::ExprCompare)
&ops, &ops,
&compare.comparators, &compare.comparators,
compare.into(), compare.into(),
comment_ranges, tokens,
source, source,
), ),
}; };

4
crates/ruff_linter/src/rules/pycodestyle/rules/not_tests.rs
View File

@ -107,7 +107,7 @@ pub(crate) fn not_tests(checker: &Checker, unary_op: &ast::ExprUnaryOp) {
&[CmpOp::NotIn], &[CmpOp::NotIn],
comparators, comparators,
unary_op.into(), unary_op.into(),
checker.comment_ranges(), checker.tokens(),
checker.source(), checker.source(),
), ),
unary_op.range(), unary_op.range(),
@ -127,7 +127,7 @@ pub(crate) fn not_tests(checker: &Checker, unary_op: &ast::ExprUnaryOp) {
&[CmpOp::IsNot], &[CmpOp::IsNot],
comparators, comparators,
unary_op.into(), unary_op.into(),
checker.comment_ranges(), checker.tokens(),
checker.source(), checker.source(),
), ),
unary_op.range(), unary_op.range(),

2
crates/ruff_linter/src/rules/refurb/rules/single_item_membership_test.rs
View File

@ -95,7 +95,7 @@ pub(crate) fn single_item_membership_test(
&[membership_test.replacement_op()], &[membership_test.replacement_op()],
std::slice::from_ref(item), std::slice::from_ref(item),
expr.into(), expr.into(),
checker.comment_ranges(), checker.tokens(),
checker.source(), checker.source(),
), ),
expr.range(), expr.range(),

12
crates/ruff_python_ast/src/helpers.rs
View File

@ -3,13 +3,14 @@ use std::path::Path;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use ruff_python_trivia::{CommentRanges, SimpleTokenKind, SimpleTokenizer, indentation_at_offset}; use ruff_python_trivia::{SimpleTokenKind, SimpleTokenizer, indentation_at_offset};
use ruff_source_file::LineRanges; use ruff_source_file::LineRanges;
use ruff_text_size::{Ranged, TextLen, TextRange, TextSize}; use ruff_text_size::{Ranged, TextLen, TextRange, TextSize};
use crate::name::{Name, QualifiedName, QualifiedNameBuilder}; use crate::name::{Name, QualifiedName, QualifiedNameBuilder};
use crate::parenthesize::parenthesized_range;
use crate::statement_visitor::StatementVisitor; use crate::statement_visitor::StatementVisitor;
use crate::token::Tokens;
use crate::token::parenthesized_range;
use crate::visitor::Visitor; use crate::visitor::Visitor;
use crate::{ use crate::{
self as ast, Arguments, AtomicNodeIndex, CmpOp, DictItem, ExceptHandler, Expr, ExprNoneLiteral, self as ast, Arguments, AtomicNodeIndex, CmpOp, DictItem, ExceptHandler, Expr, ExprNoneLiteral,
@ -1474,7 +1475,7 @@ pub fn generate_comparison(
ops: &[CmpOp], ops: &[CmpOp],
comparators: &[Expr], comparators: &[Expr],
parent: AnyNodeRef, parent: AnyNodeRef,
comment_ranges: &CommentRanges, tokens: &Tokens,
source: &str, source: &str,
) -> String { ) -> String {
let start = left.start(); let start = left.start();
@ -1483,8 +1484,7 @@ pub fn generate_comparison(
// Add the left side of the comparison. // Add the left side of the comparison.
contents.push_str( contents.push_str(
&source[parenthesized_range(left.into(), parent, comment_ranges, source) &source[parenthesized_range(left.into(), parent, tokens).unwrap_or(left.range())],
.unwrap_or(left.range())],
); );
for (op, comparator) in ops.iter().zip(comparators) { for (op, comparator) in ops.iter().zip(comparators) {
@ -1504,7 +1504,7 @@ pub fn generate_comparison(
// Add the right side of the comparison. // Add the right side of the comparison.
contents.push_str( contents.push_str(
&source[parenthesized_range(comparator.into(), parent, comment_ranges, source) &source[parenthesized_range(comparator.into(), parent, tokens)
.unwrap_or(comparator.range())], .unwrap_or(comparator.range())],
); );
} }