Skip to content
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

perf(linter): react/no_set_state + react/no_string_refs rules reduce iteration over ancestors #5616

Merged
merged 1 commit into from
Sep 9, 2024
Merged

perf(linter): react/no_set_state + react/no_string_refs rules reduce iteration over ancestors #5616

Show file tree
Hide file tree
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
10 changes: 2 additions & 8 deletions crates/oxc_linter/src/rules/react/no_set_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint;
use oxc_span::{GetSpan, Span};

use crate::{
context::LintContext,
rule::Rule,
utils::{get_parent_es5_component, get_parent_es6_component},
AstNode,
};
use crate::{context::LintContext, rule::Rule, utils::get_parent_component, AstNode};

fn no_set_state_diagnostic(span: Span) -> OxcDiagnostic {
OxcDiagnostic::warn("Do not use setState").with_label(span)
Expand Down Expand Up @@ -63,8 +58,7 @@ impl Rule for NoSetState {

if !matches!(member_expr.object(), Expression::ThisExpression(_))
|| !member_expr.static_property_name().is_some_and(|str| str == "setState")
|| !(get_parent_es5_component(node, ctx).is_some()
|| get_parent_es6_component(node, ctx).is_some())
|| get_parent_component(node, ctx).is_none()
{
return;
}
Expand Down
10 changes: 2 additions & 8 deletions crates/oxc_linter/src/rules/react/no_string_refs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,7 @@ use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint;
use oxc_span::{GetSpan, Span};

use crate::{
context::LintContext,
rule::Rule,
utils::{get_parent_es5_component, get_parent_es6_component},
AstNode,
};
use crate::{context::LintContext, rule::Rule, utils::get_parent_component, AstNode};

fn this_refs_deprecated(span: Span) -> OxcDiagnostic {
OxcDiagnostic::warn("Using this.refs is deprecated.")
Expand Down Expand Up @@ -121,8 +116,7 @@ impl Rule for NoStringRefs {
AstKind::MemberExpression(member_expr) => {
if matches!(member_expr.object(), Expression::ThisExpression(_))
&& member_expr.static_property_name() == Some("refs")
&& (get_parent_es5_component(node, ctx).is_some()
|| get_parent_es6_component(node, ctx).is_some())
&& get_parent_component(node, ctx).is_some()
{
ctx.diagnostic(this_refs_deprecated(member_expr.span()));
}
Expand Down
21 changes: 8 additions & 13 deletions crates/oxc_linter/src/utils/react.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,22 +190,17 @@ pub fn is_es6_component(node: &AstNode) -> bool {
false
}

pub fn get_parent_es5_component<'a, 'b>(
pub fn get_parent_component<'a, 'b>(
node: &'b AstNode<'a>,
ctx: &'b LintContext<'a>,
) -> Option<&'b AstNode<'a>> {
ctx.nodes().ancestors(node.id()).skip(1).find_map(|node_id| {
is_es5_component(ctx.nodes().get_node(node_id)).then(|| ctx.nodes().get_node(node_id))
})
}

pub fn get_parent_es6_component<'a, 'b>(
node: &'b AstNode<'a>,
ctx: &'b LintContext<'a>,
) -> Option<&'b AstNode<'a>> {
ctx.nodes().ancestors(node.id()).find_map(|node_id| {
is_es6_component(ctx.nodes().get_node(node_id)).then(|| ctx.nodes().get_node(node_id))
})
for node_id in ctx.nodes().ancestors(node.id()) {
let node = ctx.nodes().get_node(node_id);
if is_es5_component(node) || is_es6_component(node) {
return Some(node);
}
}
None
}

/// Resolve element type(name) using jsx-a11y settings
Expand Down