feat(linter) eslint-plugin-unicorn consistent function scoping (#4948)

oxc-project · Aug 19, 2024 · 247120f · 247120f
1 parent 185eb20
commit 247120f
Show file tree

Hide file tree

Showing 5 changed files with 1,673 additions and 15 deletions.
diff --git a/crates/oxc_linter/src/ast_util.rs b/crates/oxc_linter/src/ast_util.rs
@@ -1,5 +1,6 @@
 use std::hash::{Hash, Hasher};
 
+use oxc_ast::ast::BindingIdentifier;
 use oxc_ast::AstKind;
 use oxc_semantic::{AstNode, SymbolId};
 use oxc_span::{GetSpan, Span};
@@ -239,6 +240,18 @@ pub fn outermost_paren_parent<'a, 'b>(
         .find(|parent| !matches!(parent.kind(), AstKind::ParenthesizedExpression(_)))
 }
 
+pub fn nth_outermost_paren_parent<'a, 'b>(
+    node: &'b AstNode<'a>,
+    ctx: &'b LintContext<'a>,
+    n: usize,
+) -> Option<&'b AstNode<'a>> {
+    ctx.nodes()
+        .iter_parents(node.id())
+        .skip(1)
+        .filter(|parent| !matches!(parent.kind(), AstKind::ParenthesizedExpression(_)))
+        .nth(n)
+}
+
 pub fn get_declaration_of_variable<'a, 'b>(
     ident: &IdentifierReference,
     ctx: &'b LintContext<'a>,
@@ -393,3 +406,17 @@ pub fn is_function_node(node: &AstNode) -> bool {
         _ => false,
     }
 }
+
+pub fn get_function_like_declaration<'b>(
+    node: &AstNode<'b>,
+    ctx: &LintContext<'b>,
+) -> Option<&'b BindingIdentifier<'b>> {
+    let parent = outermost_paren_parent(node, ctx)?;
+
+    if let AstKind::VariableDeclarator(decl) = parent.kind() {
+        let ident = decl.id.get_binding_identifier()?;
+        Some(ident)
+    } else {
+        None
+    }
+}
diff --git a/crates/oxc_linter/src/rules.rs b/crates/oxc_linter/src/rules.rs
@@ -254,6 +254,7 @@ mod react_perf {
 
 mod unicorn {
     pub mod catch_error_name;
+    pub mod consistent_function_scoping;
     pub mod empty_brace_spaces;
     pub mod error_message;
     pub mod escape_case;
@@ -643,6 +644,7 @@ oxc_macros::declare_all_lint_rules! {
     jest::valid_expect,
     jest::valid_title,
     unicorn::catch_error_name,
+    unicorn::consistent_function_scoping,
     unicorn::empty_brace_spaces,
     unicorn::error_message,
     unicorn::escape_case,

diff --git a/crates/oxc_linter/src/rules/oxc/only_used_in_recursion.rs b/crates/oxc_linter/src/rules/oxc/only_used_in_recursion.rs
@@ -7,7 +7,7 @@ use oxc_macros::declare_oxc_lint;
 use oxc_span::{GetSpan, Span};
 
 use crate::{
-    ast_util::outermost_paren_parent, context::LintContext, fixer::Fix, rule::Rule, AstNode,
+    ast_util::get_function_like_declaration, context::LintContext, fixer::Fix, rule::Rule, AstNode,
 };
 
 fn only_used_in_recursion_diagnostic(span0: Span, x1: &str) -> OxcDiagnostic {
@@ -162,20 +162,6 @@ impl Rule for OnlyUsedInRecursion {
     }
 }
 
-fn get_function_like_declaration<'b>(
-    node: &AstNode<'b>,
-    ctx: &LintContext<'b>,
-) -> Option<&'b BindingIdentifier<'b>> {
-    let parent = outermost_paren_parent(node, ctx)?;
-
-    if let AstKind::VariableDeclarator(decl) = parent.kind() {
-        let ident = decl.id.get_binding_identifier()?;
-        Some(ident)
-    } else {
-        None
-    }
-}
-
 fn is_argument_only_used_in_recursion<'a>(
     function_id: &'a BindingIdentifier,
     arg: &'a BindingIdentifier,