Skip to content

refactor(linter/prefer-number-properties): simplify fixer logic #12451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
graphite-app merged 1 commit into from
Jul 22, 2025
Merged

refactor(linter/prefer-number-properties): simplify fixer logic #12451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 37 additions & 49 deletions crates/oxc_linter/src/rules/unicorn/prefer_number_properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use oxc_ast::{
AstKind,
ast::{Expression, UnaryOperator, match_member_expression},
ast::{Expression, UnaryExpression, UnaryOperator, match_member_expression},
};
use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint;
Expand Down Expand Up @@ -127,57 +127,35 @@ impl Rule for PreferNumberProperties {
|| (matches!(ident_name, "isNaN" | "isFinite" | "parseFloat" | "parseInt")
&& matches!(ctx.nodes().parent_kind(node.id()), AstKind::ObjectProperty(_)))
{
let mut replacement = "Number.POSITIVE_INFINITY";
let mut replace_span = ident_ref.span;
let fixer = |fixer: RuleFixer<'_, 'a>| {
if ident_name == "Infinity" {
let unary_expr =
ctx.nodes().ancestor_kinds(node.id()).find_map(|ancestor| {
if let AstKind::UnaryExpression(unary_expr) = ancestor {
Some(unary_expr)
} else {
None
}
});

if let Some(unary_expr) = unary_expr {
replacement = if matches!(
unary_expr.operator,
UnaryOperator::UnaryNegation
) {
// -(Infinity) -> Number.NEGATIVE_INFINITY
// +(Infinity) -> +(Number.POSITIVE_INFINITY)
replace_span = unary_expr.span;
"Number.NEGATIVE_INFINITY"
} else {
"Number.POSITIVE_INFINITY"
};
}
}
match ctx.nodes().parent_kind(node.id()) {
AstKind::ObjectProperty(object_property)
if object_property.shorthand =>
{
if ident_name == "Infinity" {
fixer.insert_text_after(
&ident_ref.span,
format!(": {replacement}"),
)
} else {
fixer.insert_text_before(
&ident_ref.span,
format!("{}: Number.", ident_ref.name.as_str()),
)
}
}
_ => {
if ident_name == "Infinity" {
fixer.replace(replace_span, replacement)
} else {
fixer.insert_text_before(&ident_ref.span, "Number.")
let (replacement_span, replacement_text) = if ident_name == "Infinity" {
if let Some(unary) = find_ancestor_unary(node, ctx) {
match unary.operator {
UnaryOperator::UnaryNegation => {
(unary.span, "Number.NEGATIVE_INFINITY")
}
_ => (ident_ref.span, "Number.POSITIVE_INFINITY"),
}
} else {
(ident_ref.span, "Number.POSITIVE_INFINITY")
}
} else {
(ident_ref.span, "")
};

let fixer = |fixer: RuleFixer<'_, 'a>| match ctx.nodes().parent_kind(node.id())
{
AstKind::ObjectProperty(prop)
if prop.shorthand && ident_name == "Infinity" =>
{
fixer
.insert_text_after(&ident_ref.span, format!(": {replacement_text}"))
}
AstKind::ObjectProperty(prop) if prop.shorthand => fixer
.insert_text_before(&ident_ref.span, format!("{ident_name}: Number.")),
_ if ident_name == "Infinity" => {
fixer.replace(replacement_span, replacement_text)
}
_ => fixer.insert_text_before(&ident_ref.span, "Number."),
};

if ident_name == "isNaN" || ident_name == "isFinite" {
Expand Down Expand Up @@ -241,6 +219,16 @@ impl Rule for PreferNumberProperties {
}
}

/// Finds the nearest enclosing unary expression ancestor for `node`.
fn find_ancestor_unary<'a>(
node: &AstNode<'a>,
ctx: &LintContext<'a>,
) -> Option<&'a UnaryExpression<'a>> {
ctx.nodes().ancestor_kinds(node.id()).find_map(|ancestor| {
if let AstKind::UnaryExpression(unary_expr) = ancestor { Some(unary_expr) } else { None }
})
}

fn extract_ident_from_expression<'b>(expr: &'b Expression<'_>) -> Option<&'b str> {
match expr {
Expression::Identifier(ident_name) => Some(ident_name.name.as_str()),
Expand Down
Loading