dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(linter/unicorn): clean up no-null (#5174)

Browse source
This commit is contained in:
DonIsaac 2024-08-24 21:48:35 +00:00
parent 7886618e00
commit 7ab615220d
1 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
crates/oxc_linter/src/rules/unicorn/no_null.rs
View file

@ -8,6 +8,7 @@ use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint; use oxc_macros::declare_oxc_lint;
use oxc_span::{GetSpan, Span}; use oxc_span::{GetSpan, Span};
use oxc_syntax::operator::BinaryOperator; use oxc_syntax::operator::BinaryOperator;
use serde_json::Value;
use crate::{ use crate::{
ast_util::is_method_call, ast_util::is_method_call,
@ -23,7 +24,7 @@ fn no_null_diagnostic(null: Span) -> OxcDiagnostic {
#[derive(Debug, Default, Clone)] #[derive(Debug, Default, Clone)]
pub struct NoNull { pub struct NoNull {
check_strict_equality: Option<bool>, check_strict_equality: bool,
} }
declare_oxc_lint!( declare_oxc_lint!(
@ -61,35 +62,36 @@ fn match_null_arg(call_expr: &CallExpression, index: usize, span: Span) -> bool
}) })
} }
fn diagnose_binary_expression( impl NoNull {
no_null: &NoNull, fn diagnose_binary_expression(
ctx: &LintContext, &self,
null_literal: &NullLiteral, ctx: &LintContext,
binary_expr: &BinaryExpression, null_literal: &NullLiteral,
) { binary_expr: &BinaryExpression,
// checkStrictEquality=false && `if (foo !== null) {}` ) {
if !no_null.check_strict_equality.is_some_and(|val| val) match binary_expr.operator {
&& matches!( // `if (foo != null) {}`
binary_expr.operator, BinaryOperator::Equality | BinaryOperator::Inequality => {
BinaryOperator::StrictEquality | BinaryOperator::StrictInequality ctx.diagnostic_with_fix(no_null_diagnostic(null_literal.span), |fixer| {
) fix_null(fixer, null_literal)
{ });
return; }
// `if (foo !== null) {}`
BinaryOperator::StrictEquality | BinaryOperator::StrictInequality => {
if self.check_strict_equality {
ctx.diagnostic_with_fix(no_null_diagnostic(null_literal.span), |fixer| {
fix_null(fixer, null_literal)
});
}
}
_ => {
ctx.diagnostic_with_fix(no_null_diagnostic(null_literal.span), |fixer| {
fix_null(fixer, null_literal)
});
}
}
} }
// `if (foo != null) {}`
if matches!(binary_expr.operator, BinaryOperator::Equality | BinaryOperator::Inequality) {
ctx.diagnostic_with_fix(no_null_diagnostic(null_literal.span), |fixer| {
fix_null(fixer, null_literal)
});
return;
}
// checkStrictEquality=true && `if (foo !== null) {}`
ctx.diagnostic_with_fix(no_null_diagnostic(null_literal.span), |fixer| {
fix_null(fixer, null_literal)
});
} }
fn diagnose_variable_declarator( fn diagnose_variable_declarator(
@ -156,12 +158,13 @@ fn match_call_expression_pass_case(null_literal: &NullLiteral, call_expr: &CallE
} }
impl Rule for NoNull { impl Rule for NoNull {
fn from_configuration(value: serde_json::Value) -> Self { fn from_configuration(value: Value) -> Self {
Self { Self {
check_strict_equality: value check_strict_equality: value
.get(0) .get(0)
.and_then(|v| v.get("checkStrictEquality")) .and_then(|v| v.get("checkStrictEquality"))
.and_then(serde_json::Value::as_bool), .and_then(Value::as_bool)
.unwrap_or_default(),
} }
} }
@ -182,7 +185,7 @@ impl Rule for NoNull {
} }
if let AstKind::BinaryExpression(binary_expr) = parent_node.kind() { if let AstKind::BinaryExpression(binary_expr) = parent_node.kind() {
diagnose_binary_expression(self, ctx, null_literal, binary_expr); self.diagnose_binary_expression(ctx, null_literal, binary_expr);
return; return;
} }