Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 2 additions & 21 deletions crates/oxc_linter/src/rules/react/jsx_fragments.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
use oxc_ast::{
AstKind,
ast::{JSXElementName, JSXMemberExpressionObject, JSXOpeningElement},
};
use oxc_ast::AstKind;
use oxc_diagnostics::OxcDiagnostic;
use oxc_macros::declare_oxc_lint;
use oxc_span::{GetSpan, Span};
use serde_json::Value;

use crate::{AstNode, context::LintContext, rule::Rule};
use crate::{AstNode, context::LintContext, rule::Rule, utils::is_jsx_fragment};

fn jsx_fragments_diagnostic(span: Span, mode: FragmentMode) -> OxcDiagnostic {
let msg = if mode == FragmentMode::Element {
Expand Down Expand Up @@ -178,22 +175,6 @@ impl Rule for JsxFragments {
}
}

fn is_jsx_fragment(elem: &JSXOpeningElement) -> bool {
match &elem.name {
JSXElementName::IdentifierReference(ident) => ident.name == "Fragment",
JSXElementName::MemberExpression(mem_expr) => {
if let JSXMemberExpressionObject::IdentifierReference(ident) = &mem_expr.object {
ident.name == "React" && mem_expr.property.name == "Fragment"
} else {
false
}
}
JSXElementName::NamespacedName(_)
| JSXElementName::Identifier(_)
| JSXElementName::ThisExpression(_) => false,
}
}

#[test]
fn test() {
use crate::tester::Tester;
Expand Down
19 changes: 2 additions & 17 deletions crates/oxc_linter/src/rules/react/jsx_no_useless_fragment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ use crate::{
context::{ContextHost, LintContext},
fixer::{RuleFix, RuleFixer},
rule::Rule,
utils::is_jsx_fragment,
};
use oxc_allocator::Vec as ArenaVec;
use oxc_ast::{
AstKind,
ast::{
JSXAttributeItem, JSXAttributeName, JSXChild, JSXElement, JSXElementName, JSXExpression,
JSXFragment, JSXMemberExpressionObject, JSXOpeningElement,
JSXFragment,
},
};
use oxc_diagnostics::OxcDiagnostic;
Expand Down Expand Up @@ -321,22 +322,6 @@ fn is_html_element(elem_name: &JSXElementName) -> bool {
ident.name.starts_with(char::is_lowercase)
}

fn is_jsx_fragment(elem: &JSXOpeningElement) -> bool {
match &elem.name {
JSXElementName::IdentifierReference(ident) => ident.name == "Fragment",
JSXElementName::MemberExpression(mem_expr) => {
if let JSXMemberExpressionObject::IdentifierReference(ident) = &mem_expr.object {
ident.name == "React" && mem_expr.property.name == "Fragment"
} else {
false
}
}
JSXElementName::NamespacedName(_)
| JSXElementName::Identifier(_)
| JSXElementName::ThisExpression(_) => false,
}
}

fn has_less_than_two_children(children: &oxc_allocator::Vec<'_, JSXChild<'_>>) -> bool {
let non_padding_children = children.iter().filter(|v| is_padding_spaces(v)).collect::<Vec<_>>();

Expand Down
18 changes: 18 additions & 0 deletions crates/oxc_linter/src/utils/react.rs
Original file line number Diff line number Diff line change
Expand Up @@ -333,3 +333,21 @@ pub fn is_react_function_call(call: &CallExpression, expected_call: &str) -> boo
true
}
}

/// Checks if a JSX opening element is a React Fragment.
/// Recognizes both `<Fragment>` and `<React.Fragment>` forms.
pub fn is_jsx_fragment(elem: &JSXOpeningElement) -> bool {
match &elem.name {
JSXElementName::IdentifierReference(ident) => ident.name == "Fragment",
JSXElementName::MemberExpression(mem_expr) => {
if let JSXMemberExpressionObject::IdentifierReference(ident) = &mem_expr.object {
ident.name == "React" && mem_expr.property.name == "Fragment"
} else {
false
}
}
JSXElementName::NamespacedName(_)
| JSXElementName::Identifier(_)
| JSXElementName::ThisExpression(_) => false,
}
}
Loading