Skip to content

fix: fixed potential false negatives in no-leaked-conditional-rendering when logical expressions are wrapped by type expressions #1068

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

Merged
merged 3 commits into from
Apr 15, 2025
Merged

fix: fixed potential false negatives in no-leaked-conditional-rendering when logical expressions are wrapped by type expressions #1068

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f20f87a
release: 1.47.3-next.0
Rel1cx Apr 14, 2025
b2a23a5
fix: fixed potential false negatives in no-leaked-conditional-renderi…
Rel1cx Apr 15, 2025
1a9503e
Merge branch 'main' into no-leaked-conditional-rendering
Rel1cx Apr 15, 2025
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
19 changes: 12 additions & 7 deletions packages/plugins/eslint-plugin-react-x/src/rules/no-leaked-conditional-rendering.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,7 @@ export default createRule<[], MessageID>({
});

export function create(context: RuleContext<MessageID, []>): RuleListener {
if (!context.sourceCode.text.includes("&&") && !context.sourceCode.text.includes("?")) return {};

if (!context.sourceCode.text.includes("&&")) return {};
const { version } = getSettingsFromContext(context);

// Allowed left node type variants
Expand All @@ -213,10 +212,18 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
] as const satisfies VariantType[];

const services = ESLintUtils.getParserServices(context, false);
function getReportDescriptor(node: TSESTree.Expression | _): ReportDescriptor<MessageID> | _ {
function getReportDescriptor(
node:
| _
| TSESTree.Expression
| TSESTree.JSXExpressionContainer
| TSESTree.JSXExpressionContainer["expression"],
): ReportDescriptor<MessageID> | _ {
if (node == null) return _;
if (AST.is(T.JSXExpressionContainer)(node)) return getReportDescriptor(node.expression);
if (AST.isJSX(node)) return _;
if (AST.isTypeExpression(node)) return getReportDescriptor(node.expression);
return match<typeof node, ReportDescriptor<MessageID> | _>(node)
.when(AST.isJSX, () => _)
.with({ type: T.LogicalExpression, operator: "&&" }, ({ left, right }) => {
const isLeftUnaryNot = left.type === T.UnaryExpression && left.operator === "!";
if (isLeftUnaryNot) {
Expand Down Expand Up @@ -260,10 +267,8 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
})
.otherwise(() => _);
}
const visitorFunction = flow(getReportDescriptor, Report.make(context).send);
return {
"JSXExpressionContainer > ConditionalExpression": visitorFunction,
"JSXExpressionContainer > LogicalExpression": visitorFunction,
JSXExpressionContainer: flow(getReportDescriptor, Report.make(context).send),
};
}

Expand Down
Loading