dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(linter): panic in yoda (#7679)

Browse source 
fixes #7674
This commit is contained in:
camc314 2024-12-06 03:33:38 +00:00
parent 72b5d58560
commit 7cee065249
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crates/oxc_linter/src/rules/eslint/yoda.rs
View file

@ -9,7 +9,6 @@ use oxc_diagnostics::OxcDiagnostic;
use oxc_ecmascript::ToBigInt; use oxc_ecmascript::ToBigInt;
use oxc_macros::declare_oxc_lint; use oxc_macros::declare_oxc_lint;
use oxc_span::{GetSpan, Span}; use oxc_span::{GetSpan, Span};
use regex::Regex;
use crate::{context::LintContext, rule::Rule, utils::is_same_expression, AstNode}; use crate::{context::LintContext, rule::Rule, utils::is_same_expression, AstNode};
@ -264,6 +263,7 @@ fn is_not_yoda(expr: &BinaryExpression) -> bool {
&& is_literal_or_simple_template_literal(expr.right.get_inner_expression()) && is_literal_or_simple_template_literal(expr.right.get_inner_expression())
} }
#[allow(clippy::cast_possible_truncation)]
fn do_diagnostic_with_fix(expr: &BinaryExpression, ctx: &LintContext, never: bool) { fn do_diagnostic_with_fix(expr: &BinaryExpression, ctx: &LintContext, never: bool) {
ctx.diagnostic_with_fix(yoda_diagnostic(expr.span, never, expr.operator.as_str()), |fix| { ctx.diagnostic_with_fix(yoda_diagnostic(expr.span, never, expr.operator.as_str()), |fix| {
let flipped_operator = flip_operator(expr.operator); let flipped_operator = flip_operator(expr.operator);
@ -273,29 +273,34 @@ fn do_diagnostic_with_fix(expr: &BinaryExpression, ctx: &LintContext, never: boo
let flipped_operator_str = flipped_operator.as_str(); let flipped_operator_str = flipped_operator.as_str();
let operator_str = expr.operator.as_str(); let operator_str = expr.operator.as_str();
let source_str = ctx.source_range(expr.span); let source_str = ctx.source_range(
let regex = Regex::new(operator_str).unwrap(); Span::new(expr.left.span().end, expr.right.span().start)
let mut operator_position_start: u32 = 0; );
let mut operator_position_end: u32 = 0;
for mat in regex.find_iter(source_str) {
let start = u32::try_from(mat.start()).unwrap();
let end = u32::try_from(mat.end()).unwrap();
let is_inside_comments = ctx.comments().iter().any(|c| { let source_chars = source_str.char_indices().collect::<Vec<_>>();
c.span.start <= start + expr.span.start && end + expr.span.start <= c.span.end
let search_start_position = expr.left.span().end;
let operator_position_start = source_chars.windows(operator_str.len()).find(|str| {
if str.iter().enumerate().all(|(i, (_pos, c))| *c == operator_str.chars().nth(i).unwrap()) {
!ctx.comments().iter().any(|c| {
c.span.start <= (str[0].0 as u32) + search_start_position && (str[0].0 as u32) + operator_str.len() as u32 + search_start_position <= c.span.end
})
} else {
false
}
}); });
if !is_inside_comments { let Some(operator_position_start) = operator_position_start else {
operator_position_start = start + expr.span.start; debug_assert!(false);
operator_position_end = end + expr.span.start; return fix.noop();
break; };
}
}
let str_between_left_and_operator = let operator_position_start = search_start_position + operator_position_start[0].0 as u32;
ctx.source_range(Span::new(expr.left.span().end, operator_position_start));
let str_between_operator_and_right = let operator_position_end = operator_position_start + operator_str.len() as u32;
ctx.source_range(Span::new(operator_position_end, expr.right.span().start)); let str_between_left_and_operator = ctx.source_range(Span::new(expr.left.span().end, operator_position_start));
let str_between_operator_and_right = ctx.source_range(Span::new(operator_position_end, expr.right.span().start));
let left_start = expr.left.span().start; let left_start = expr.left.span().start;
let left_prev_token = if left_start > 0 && (expr.right.is_literal() || expr.right.is_identifier_reference() ) { let left_prev_token = if left_start > 0 && (expr.right.is_literal() || expr.right.is_identifier_reference() ) {
@ -1156,6 +1161,7 @@ fn test() {
"if (a > 0 && b < max) {}", "if (a > 0 && b < max) {}",
Some(serde_json::json!(["never", { "exceptRange": true }])), Some(serde_json::json!(["never", { "exceptRange": true }])),
), ),
("y>E>1", "1<y>E", Some(serde_json::json!(["always", { "exceptRange": false }]))),
]; ];
Tester::new(Yoda::NAME, Yoda::CATEGORY, pass, fail).expect_fix(fix).test_and_snapshot(); Tester::new(Yoda::NAME, Yoda::CATEGORY, pass, fail).expect_fix(fix).test_and_snapshot();
} }