From 0d7e166f4bf7ea5d784d115c0e0f2e8d5563c7c5 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 15 Dec 2023 11:40:07 +0000 Subject: [PATCH] refactor: use `new_without_config` for `jsx_key` (#1685) --- crates/oxc_linter/src/rules/react/jsx_key.rs | 158 +++++++------------ 1 file changed, 58 insertions(+), 100 deletions(-) diff --git a/crates/oxc_linter/src/rules/react/jsx_key.rs b/crates/oxc_linter/src/rules/react/jsx_key.rs index 14633efc1..9632bf407 100644 --- a/crates/oxc_linter/src/rules/react/jsx_key.rs +++ b/crates/oxc_linter/src/rules/react/jsx_key.rs @@ -189,32 +189,31 @@ fn test() { use crate::tester::Tester; let pass = vec![ - (r"fn()", None), - (r"[1, 2, 3].map(function () {})", None), - (r";", None), - (r"[, ];", None), - (r"[1, 2, 3].map(function(x) { return });", None), - (r"[1, 2, 3].map(x => );", None), - (r"[1, 2 ,3].map(x => x && );", None), - (r#"[1, 2 ,3].map(x => x ? : );"#, None), - (r"[1, 2, 3].map(x => { return });", None), - (r"Array.from([1, 2, 3], function(x) { return });", None), - (r"Array.from([1, 2, 3], (x => ));", None), - (r"Array.from([1, 2, 3], (x => {return }));", None), - (r"Array.from([1, 2, 3], someFn);", None), - (r"Array.from([1, 2, 3]);", None), - (r"[1, 2, 3].foo(x => );", None), - (r"var App = () =>
;", None), - (r"[1, 2, 3].map(function(x) { return; });", None), - (r"foo(() =>
);", None), - (r"foo(() => <>);", None), - (r"<>;", None), - (r";", None), - (r#";"#, None), - (r#"
;"#, None), - (r#"const spans = [,];"#, None), - ( - r#" + r"fn()", + r"[1, 2, 3].map(function () {})", + r";", + r"[, ];", + r"[1, 2, 3].map(function(x) { return });", + r"[1, 2, 3].map(x => );", + r"[1, 2 ,3].map(x => x && );", + r#"[1, 2 ,3].map(x => x ? : );"#, + r"[1, 2, 3].map(x => { return });", + r"Array.from([1, 2, 3], function(x) { return });", + r"Array.from([1, 2, 3], (x => ));", + r"Array.from([1, 2, 3], (x => {return }));", + r"Array.from([1, 2, 3], someFn);", + r"Array.from([1, 2, 3]);", + r"[1, 2, 3].foo(x => );", + r"var App = () =>
;", + r"[1, 2, 3].map(function(x) { return; });", + r"foo(() =>
);", + r"foo(() => <>);", + r"<>;", + r";", + r#";"#, + r#"
;"#, + r#"const spans = [,];"#, + r#" function Component(props) { return hasPayment ? (
@@ -226,10 +225,7 @@ fn test() { ) : null; } "#, - None, - ), - ( - r#" + r#" import React, { FC, useRef, useState } from 'react'; import './ResourceVideo.sass'; @@ -254,20 +250,14 @@ fn test() { export default ResourceVideo; "#, - None, - ), - ( - r" + r" // testrule.jsx const trackLink = () => {}; const getAnalyticsUiElement = () => {}; const onTextButtonClick = (e, item) => trackLink([, getAnalyticsUiElement(item), item.name], e); ", - None, - ), - ( - r#" + r#" function Component({ allRatings }) { return ( @@ -288,20 +278,14 @@ fn test() { ); } "#, - None, - ), - ( - r" + r" const baz = foo?.bar?.()?.[1] ?? 'qux'; qux()?.map() const directiveRanges = comments?.map(tryParseTSDirective) ", - None, - ), - ( - r#" + r#" import { observable } from "mobx"; export interface ClusterFrameInfo { @@ -311,10 +295,7 @@ fn test() { export const clusterFrameMap = observable.map(); "#, - None, - ), - ( - r#" + r#" const columns: ColumnDef[] = [{ accessorKey: 'lastName', header: ({ column }) => , @@ -323,10 +304,7 @@ fn test() { enableHiding: false, }] "#, - None, - ), - ( - r#" + r#" const columns: ColumnDef[] = [{ accessorKey: 'lastName', header: function ({ column }) { return }, @@ -335,10 +313,7 @@ fn test() { enableHiding: false, }] "#, - None, - ), - ( - r#" + r#" const router = createBrowserRouter([ { path: "/", @@ -352,32 +327,29 @@ fn test() { }, ]); "#, - None, - ), ]; let fail = vec![ - (r"[];", None), - (r"[];", None), - (r"[, ];", None), - (r"[1, 2 ,3].map(function(x) { return });", None), - (r"[1, 2 ,3].map(x => );", None), - (r"[1, 2 ,3].map(x => x && );", None), - (r#"[1, 2 ,3].map(x => x ? : );"#, None), - (r#"[1, 2 ,3].map(x => x ? : );"#, None), - (r"[1, 2 ,3].map(x => { return });", None), - (r"Array.from([1, 2 ,3], function(x) { return });", None), - (r"Array.from([1, 2 ,3], (x => { return }));", None), - (r"Array.from([1, 2 ,3], (x => ));", None), - (r"[1, 2, 3]?.map(x => )", None), - (r"[1, 2, 3]?.map(x => )", None), - (r"[1, 2, 3]?.map(x => <>)", None), - ("[1, 2, 3].map(x => <>{x});", None), - ("[<>];", None), - (r#"[];"#, None), - (r#"[
];"#, None), - ( - r" + r"[];", + r"[];", + r"[, ];", + r"[1, 2 ,3].map(function(x) { return });", + r"[1, 2 ,3].map(x => );", + r"[1, 2 ,3].map(x => x && );", + r#"[1, 2 ,3].map(x => x ? : );"#, + r#"[1, 2 ,3].map(x => x ? : );"#, + r"[1, 2 ,3].map(x => { return });", + r"Array.from([1, 2 ,3], function(x) { return });", + r"Array.from([1, 2 ,3], (x => { return }));", + r"Array.from([1, 2 ,3], (x => ));", + r"[1, 2, 3]?.map(x => )", + r"[1, 2, 3]?.map(x => )", + r"[1, 2, 3]?.map(x => <>)", + "[1, 2, 3].map(x => <>{x});", + "[<>];", + r#"[];"#, + r#"[
];"#, + r" const Test = () => { const list = [1, 2, 3, 4, 5]; @@ -394,10 +366,7 @@ fn test() { ); }; ", - None, - ), - ( - r" + r" const TestO = () => { const list = [1, 2, 3, 4, 5]; @@ -418,10 +387,7 @@ fn test() { ); }; ", - None, - ), - ( - r" + r" const TestCase = () => { const list = [1, 2, 3, 4, 5]; @@ -436,10 +402,7 @@ fn test() { ); }; ", - None, - ), - ( - r" + r" const TestCase = () => { const list = [1, 2, 3, 4, 5]; @@ -450,10 +413,7 @@ fn test() { ); }; ", - None, - ), - ( - r" + r" const TestCase = () => { const list = [1, 2, 3, 4, 5]; @@ -467,9 +427,7 @@ fn test() { ); }; ", - None, - ), ]; - Tester::new(JsxKey::NAME, pass, fail).test_and_snapshot(); + Tester::new_without_config(JsxKey::NAME, pass, fail).test_and_snapshot(); }