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

refactor(linter/no-map-spread): remove Visit::enter_node usage #8537

Merged
merged 1 commit into from
Jan 16, 2025
Merged

refactor(linter/no-map-spread): remove Visit::enter_node usage #8537

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
25 changes: 10 additions & 15 deletions crates/oxc_linter/src/rules/oxc/no_map_spread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ use serde::{Deserialize, Serialize};
use oxc_ast::{
ast::{
ArrayExpression, ArrayExpressionElement, CallExpression, Expression, ObjectExpression,
ObjectPropertyKind,
ObjectPropertyKind, ReturnStatement,
},
visit::walk,
AstKind, Visit,
};
use oxc_diagnostics::{LabeledSpan, OxcDiagnostic};
Expand Down Expand Up @@ -637,21 +638,15 @@ impl<'a, F> Visit<'a> for SpreadInReturnVisitor<'a, '_, F>
where
F: FnMut(Spread<'a, '_>),
{
#[inline]
fn enter_node(&mut self, kind: AstKind<'a>) {
if let AstKind::ReturnStatement(stmt) = kind {
self.is_in_return = true;
self.return_span = stmt.argument.as_ref().map(GetSpan::span);
}
}
fn visit_return_statement(&mut self, stmt: &ReturnStatement<'a>) {
self.is_in_return = true;
self.return_span = stmt.argument.as_ref().map(GetSpan::span);

#[inline]
fn leave_node(&mut self, kind: AstKind<'a>) {
if let AstKind::ReturnStatement(_) = kind {
self.is_in_return = false;
// NOTE: do not clear `return_span` here. We want to keep the last
// encountered `return` for reporting.
}
walk::walk_return_statement(self, stmt);

self.is_in_return = false;
// NOTE: do not clear `return_span` here. We want to keep the last
// encountered `return` for reporting.
}

fn visit_expression(&mut self, expr: &Expression<'a>) {
Expand Down
Loading