merge eslint-plugin-unicorn

oxc-project · Dec 27, 2024 · 0c57506 · 0c57506
1 parent 155d9ea
commit 0c57506
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 54 deletions.
diff --git a/crates/oxc_linter/src/rules/eslint/no_negated_condition.rs b/crates/oxc_linter/src/rules/eslint/no_negated_condition.rs
@@ -1,10 +1,7 @@
 use crate::{context::LintContext, rule::Rule, AstNode};
-use oxc_ast::ast::{ConditionalExpression, Expression, IfStatement, Statement};
-use oxc_ast::AstKind;
 use oxc_diagnostics::OxcDiagnostic;
 use oxc_macros::declare_oxc_lint;
 use oxc_span::Span;
-use oxc_syntax::operator::{BinaryOperator, UnaryOperator};
 
 fn no_negated_condition_diagnostic(span: Span) -> OxcDiagnostic {
     OxcDiagnostic::warn("Unexpected negated condition.").with_label(span)
@@ -49,51 +46,11 @@ declare_oxc_lint!(
 
 impl Rule for NoNegatedCondition {
     fn run<'a>(&self, node: &AstNode<'a>, ctx: &LintContext<'a>) {
-        match node.kind() {
-            AstKind::IfStatement(if_stmt) => {
-                if !has_else_without_condition(if_stmt) {
-                    return;
-                }
-
-                if is_negated_if(if_stmt) {
-                    ctx.diagnostic(no_negated_condition_diagnostic(if_stmt.span));
-                }
-            }
-            AstKind::ConditionalExpression(conditional_expr) => {
-                if is_negated_if_conditional(conditional_expr) {
-                    ctx.diagnostic(no_negated_condition_diagnostic(conditional_expr.span));
-                }
-            }
-            _ => {}
-        }
+        // This rule is exactly the same as the eslint-plugin-unicorn's no-negated-condition rule.
+        crate::rules::unicorn::no_negated_condition::NoNegatedCondition::default().run(node, ctx);
     }
 }
 
-fn has_else_without_condition(node: &IfStatement) -> bool {
-    matches!(node.alternate, Some(Statement::BlockStatement(_)))
-}
-
-fn is_negated_unary_expression(test: &Expression) -> bool {
-    matches!(test, Expression::UnaryExpression(unary) if unary.operator == UnaryOperator::LogicalNot)
-}
-
-fn is_negated_binary_expression(test: &Expression) -> bool {
-    matches!(
-        test,
-        Expression::BinaryExpression(binary)
-            if binary.operator == BinaryOperator::Inequality
-                || binary.operator == BinaryOperator::StrictInequality
-    )
-}
-
-fn is_negated_if(node: &IfStatement) -> bool {
-    is_negated_unary_expression(&node.test) || is_negated_binary_expression(&node.test)
-}
-
-fn is_negated_if_conditional(node: &ConditionalExpression) -> bool {
-    is_negated_unary_expression(&node.test) || is_negated_binary_expression(&node.test)
-}
-
 #[test]
 fn test() {
     use crate::tester::Tester;

diff --git a/crates/oxc_linter/src/rules/unicorn/no_negated_condition.rs b/crates/oxc_linter/src/rules/unicorn/no_negated_condition.rs
@@ -119,6 +119,20 @@ fn test() {
         r"if (a !== b) {}",
         r"if (a === b) {} else {}",
         r"a ? b : c",
+        // Test cases from ESLint
+        "if (a) {}",
+        "if (a) {} else {}",
+        "if (!a) {}",
+        "if (!a) {} else if (b) {}",
+        "if (!a) {} else if (b) {} else {}",
+        "if (a == b) {}",
+        "if (a == b) {} else {}",
+        "if (a != b) {}",
+        "if (a != b) {} else if (b) {}",
+        "if (a != b) {} else if (b) {} else {}",
+        "if (a !== b) {}",
+        "if (a === b) {} else {}",
+        "a ? b : c",
     ];
 
     let fail = vec![
@@ -140,6 +154,13 @@ fn test() {
         r"if(!a) {b()} else {c()}",
         r"if(!!a) b(); else c();",
         r"(!!a) ? b() : c();",
+        // Test cases from ESLint
+        "if (!a) {;} else {;}",
+        "if (a != b) {;} else {;}",
+        "if (a !== b) {;} else {;}",
+        "!a ? b : c",
+        "a != b ? c : d",
+        "a !== b ? c : d",
     ];
 
     Tester::new(NoNegatedCondition::NAME, NoNegatedCondition::CATEGORY, pass, fail)

diff --git a/crates/oxc_linter/src/snapshots/eslint_no_negated_condition.snap b/crates/oxc_linter/src/snapshots/eslint_no_negated_condition.snap
@@ -3,37 +3,43 @@ source: crates/oxc_linter/src/tester.rs
 snapshot_kind: text
 ---
   ⚠ eslint(no-negated-condition): Unexpected negated condition.
-   ╭─[no_negated_condition.tsx:1:1]
+   ╭─[no_negated_condition.tsx:1:5]
  1 │ if (!a) {;} else {;}
-   · ────────────────────
+   ·     ──
    ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
 
   ⚠ eslint(no-negated-condition): Unexpected negated condition.
-   ╭─[no_negated_condition.tsx:1:1]
+   ╭─[no_negated_condition.tsx:1:5]
  1 │ if (a != b) {;} else {;}
-   · ────────────────────────
+   ·     ──────
    ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
 
   ⚠ eslint(no-negated-condition): Unexpected negated condition.
-   ╭─[no_negated_condition.tsx:1:1]
+   ╭─[no_negated_condition.tsx:1:5]
  1 │ if (a !== b) {;} else {;}
-   · ─────────────────────────
+   ·     ───────
    ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
 
   ⚠ eslint(no-negated-condition): Unexpected negated condition.
    ╭─[no_negated_condition.tsx:1:1]
  1 │ !a ? b : c
-   · ──────────
+   · ──
    ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
 
   ⚠ eslint(no-negated-condition): Unexpected negated condition.
    ╭─[no_negated_condition.tsx:1:1]
  1 │ a != b ? c : d
-   · ──────────────
+   · ──────
    ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
 
   ⚠ eslint(no-negated-condition): Unexpected negated condition.
    ╭─[no_negated_condition.tsx:1:1]
  1 │ a !== b ? c : d
-   · ───────────────
+   · ───────
    ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
diff --git a/crates/oxc_linter/src/snapshots/unicorn_no_negated_condition.snap b/crates/oxc_linter/src/snapshots/unicorn_no_negated_condition.snap
@@ -127,3 +127,45 @@ snapshot_kind: text
    ·  ───
    ╰────
   help: Remove the negation operator and switch the consequent and alternate branches.
+
+  ⚠ eslint-plugin-unicorn(no-negated-condition): Unexpected negated condition.
+   ╭─[no_negated_condition.tsx:1:5]
+ 1 │ if (!a) {;} else {;}
+   ·     ──
+   ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
+
+  ⚠ eslint-plugin-unicorn(no-negated-condition): Unexpected negated condition.
+   ╭─[no_negated_condition.tsx:1:5]
+ 1 │ if (a != b) {;} else {;}
+   ·     ──────
+   ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
+
+  ⚠ eslint-plugin-unicorn(no-negated-condition): Unexpected negated condition.
+   ╭─[no_negated_condition.tsx:1:5]
+ 1 │ if (a !== b) {;} else {;}
+   ·     ───────
+   ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
+
+  ⚠ eslint-plugin-unicorn(no-negated-condition): Unexpected negated condition.
+   ╭─[no_negated_condition.tsx:1:1]
+ 1 │ !a ? b : c
+   · ──
+   ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
+
+  ⚠ eslint-plugin-unicorn(no-negated-condition): Unexpected negated condition.
+   ╭─[no_negated_condition.tsx:1:1]
+ 1 │ a != b ? c : d
+   · ──────
+   ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.
+
+  ⚠ eslint-plugin-unicorn(no-negated-condition): Unexpected negated condition.
+   ╭─[no_negated_condition.tsx:1:1]
+ 1 │ a !== b ? c : d
+   · ───────
+   ╰────
+  help: Remove the negation operator and switch the consequent and alternate branches.