[core] Enforce curly braces for block statements (#27946)

mui · Aug 25, 2021 · c7a3739 · c7a3739
1 parent 5608c83
commit c7a3739
Show file tree

Hide file tree

Showing 27 changed files with 214 additions and 71 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -46,6 +46,7 @@ module.exports = {
    */
   rules: {
     'consistent-this': ['error', 'self'],
+    curly: ['error', 'all'],
     // Just as bad as "max components per file"
     'max-classes-per-file': 'off',
     // Too interruptive

diff --git a/docs/src/components/header/HeaderNavBar.tsx b/docs/src/components/header/HeaderNavBar.tsx
@@ -121,7 +121,9 @@ export default function HeaderNavBar() {
         setSubMenuOpen(true);
       }
       setSubMenuIndex((prevValue) => {
-        if (prevValue === null) return 0;
+        if (prevValue === null) {
+          return 0;
+        }
         if (prevValue === PRODUCT_IDS.length - 1) {
           return 0;
         }
@@ -131,7 +133,9 @@ export default function HeaderNavBar() {
     if (event.key === 'ArrowUp') {
       event.preventDefault();
       setSubMenuIndex((prevValue) => {
-        if (prevValue === null) return 0;
+        if (prevValue === null) {
+          return 0;
+        }
         if (prevValue === 0) {
           return PRODUCT_IDS.length - 1;
         }

diff --git a/docs/src/components/home/DesignKits.tsx b/docs/src/components/home/DesignKits.tsx
@@ -160,7 +160,9 @@ export function DesignKitImagesSet2({
 
 export function DesignKitTools({ disableLink, ...props }: { disableLink?: boolean } & BoxProps) {
   function renderTool(brand: 'figma' | 'sketch' | 'xd') {
-    if (disableLink) return <DesignToolLogo brand={brand} />;
+    if (disableLink) {
+      return <DesignToolLogo brand={brand} />;
+    }
     return (
       <DesignToolLink brand={brand}>
         <DesignToolLogo brand={brand} />

diff --git a/docs/src/components/home/ElementPointer.tsx b/docs/src/components/home/ElementPointer.tsx
@@ -56,7 +56,9 @@ export default function PointerContainer({
     [],
   );
   React.useEffect(() => {
-    if (onElementChange) onElementChange(data);
+    if (onElementChange) {
+      onElementChange(data);
+    }
   }, [data, onElementChange]);
   return (
     <PointerContext.Provider value={handleMouseOver}>

diff --git a/docs/src/components/home/StoreTemplatesBanner.tsx b/docs/src/components/home/StoreTemplatesBanner.tsx
@@ -155,7 +155,9 @@ export function StoreTemplatesSet1({
   ...props
 }: { disableLink?: boolean; keyframes?: Record<string, object> } & BoxProps) {
   function renderTemplate(brand: TemplateBrand) {
-    if (disableLink) return <StoreTemplateImage brand={brand} />;
+    if (disableLink) {
+      return <StoreTemplateImage brand={brand} />;
+    }
     return (
       <StoreTemplateLink brand={brand}>
         <StoreTemplateImage brand={brand} />
@@ -185,7 +187,9 @@ export function StoreTemplatesSet2({
   ...props
 }: { disableLink?: boolean; keyframes?: Record<string, object> } & BoxProps) {
   function renderTemplate(brand: TemplateBrand) {
-    if (disableLink) return <StoreTemplateImage brand={brand} />;
+    if (disableLink) {
+      return <StoreTemplateImage brand={brand} />;
+    }
     return (
       <StoreTemplateLink brand={brand}>
         <StoreTemplateImage brand={brand} />

diff --git a/docs/src/components/showcase/FolderTable.tsx b/docs/src/components/showcase/FolderTable.tsx
@@ -48,15 +48,19 @@ function stableSort<T>(array: readonly T[], comparator: (a: T, b: T) => number)
   const stabilizedThis = array.map((el, index) => [el, index] as [T, number]);
   stabilizedThis.sort((a, b) => {
     const order = comparator(a[0], b[0]);
-    if (order !== 0) return order;
+    if (order !== 0) {
+      return order;
+    }
     return a[1] - b[1];
   });
   return stabilizedThis.map((el) => el[0]);
 }
 
 function formatSize(size: number) {
   const kb = size / 1000;
-  if (kb < 1000) return `${kb.toFixed(1)} KB`;
+  if (kb < 1000) {
+    return `${kb.toFixed(1)} KB`;
+  }
   return `${(kb / 1000).toFixed(0)} MB`;
 }
 

diff --git a/docs/src/modules/utils/find.js b/docs/src/modules/utils/find.js
@@ -144,8 +144,12 @@ function findPages(
   pages.sort((a, b) => {
     const pathnameA = a.pathname.replace(/-/g, '');
     const pathnameB = b.pathname.replace(/-/g, '');
-    if (pathnameA < pathnameB) return -1;
-    if (pathnameA > pathnameB) return 1;
+    if (pathnameA < pathnameB) {
+      return -1;
+    }
+    if (pathnameA > pathnameB) {
+      return 1;
+    }
     return 0;
   });
 

diff --git a/docs/src/pages/components/tables/EnhancedTable.js b/docs/src/pages/components/tables/EnhancedTable.js
@@ -70,7 +70,9 @@ function stableSort(array, comparator) {
   const stabilizedThis = array.map((el, index) => [el, index]);
   stabilizedThis.sort((a, b) => {
     const order = comparator(a[0], b[0]);
-    if (order !== 0) return order;
+    if (order !== 0) {
+      return order;
+    }
     return a[1] - b[1];
   });
   return stabilizedThis.map((el) => el[0]);

diff --git a/docs/src/pages/components/tables/EnhancedTable.tsx b/docs/src/pages/components/tables/EnhancedTable.tsx
@@ -91,7 +91,9 @@ function stableSort<T>(array: readonly T[], comparator: (a: T, b: T) => number)
   const stabilizedThis = array.map((el, index) => [el, index] as [T, number]);
   stabilizedThis.sort((a, b) => {
     const order = comparator(a[0], b[0]);
-    if (order !== 0) return order;
+    if (order !== 0) {
+      return order;
+    }
     return a[1] - b[1];
   });
   return stabilizedThis.map((el) => el[0]);

diff --git a/docs/src/pages/discover-more/showcase/Showcase.js b/docs/src/pages/discover-more/showcase/Showcase.js
@@ -17,7 +17,9 @@ function stableSort(array, cmp) {
   const stabilizedThis = array.map((el, index) => [el, index]);
   stabilizedThis.sort((a, b) => {
     const order = cmp(a[0], b[0]);
-    if (order !== 0) return order;
+    if (order !== 0) {
+      return order;
+    }
     return a[1] - b[1];
   });
   return stabilizedThis.map((el) => el[0]);

diff --git a/packages/material-ui-codemod/src/util/memoize.js b/packages/material-ui-codemod/src/util/memoize.js
@@ -2,7 +2,9 @@ const memoize = (func, resolver = (a) => a) => {
   const cache = new Map();
   return (...args) => {
     const key = resolver(...args);
-    if (cache.has(key)) return cache.get(key);
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
     const value = func(...args);
     cache.set(key, value);
     return value;

diff --git a/packages/material-ui-codemod/src/v4.0.0/optimal-imports.js b/packages/material-ui-codemod/src/v4.0.0/optimal-imports.js
@@ -31,14 +31,20 @@ export default function transformer(fileInfo, api, options) {
   };
 
   root.find(j.ImportDeclaration).forEach((path) => {
-    if (path.value.importKind && path.value.importKind !== 'value') return;
+    if (path.value.importKind && path.value.importKind !== 'value') {
+      return;
+    }
     const importPath = path.value.source.value.replace(/(index)?(\.js)?$/, '');
     const match = importPath.match(importRegExp);
-    if (!match) return;
+    if (!match) {
+      return;
+    }
 
     const subpath = match[1].replace(/\/$/, '');
 
-    if (/^(internal)/.test(subpath)) return;
+    if (/^(internal)/.test(subpath)) {
+      return;
+    }
     const targetImportPath = `${targetModule}/${subpath}`;
 
     const whitelist = getJSExports(
@@ -48,10 +54,16 @@ export default function transformer(fileInfo, api, options) {
     );
 
     path.node.specifiers.forEach((specifier, index) => {
-      if (!path.node.specifiers.length) return;
+      if (!path.node.specifiers.length) {
+        return;
+      }
 
-      if (specifier.importKind && specifier.importKind !== 'value') return;
-      if (specifier.type === 'ImportNamespaceSpecifier') return;
+      if (specifier.importKind && specifier.importKind !== 'value') {
+        return;
+      }
+      if (specifier.type === 'ImportNamespaceSpecifier') {
+        return;
+      }
       const localName = specifier.local.name;
       switch (specifier.type) {
         case 'ImportNamespaceSpecifier':
@@ -69,7 +81,9 @@ export default function transformer(fileInfo, api, options) {
           break;
         }
         case 'ImportSpecifier':
-          if (!whitelist.has(specifier.imported.name)) return;
+          if (!whitelist.has(specifier.imported.name)) {
+            return;
+          }
           addSpecifier(targetImportPath, specifier);
           path.get('specifiers', index).prune();
           break;
@@ -78,7 +92,9 @@ export default function transformer(fileInfo, api, options) {
       }
     });
 
-    if (!path.node.specifiers.length) path.prune();
+    if (!path.node.specifiers.length) {
+      path.prune();
+    }
   });
 
   addImports(

diff --git a/packages/material-ui-codemod/src/v4.0.0/top-level-imports.js b/packages/material-ui-codemod/src/v4.0.0/top-level-imports.js
@@ -25,24 +25,38 @@ export default function transformer(fileInfo, api, options) {
   const resultSpecifiers = [];
 
   root.find(j.ImportDeclaration).forEach((path) => {
-    if (!path.node.specifiers.length) return;
+    if (!path.node.specifiers.length) {
+      return;
+    }
 
-    if (path.value.importKind && path.value.importKind !== 'value') return;
+    if (path.value.importKind && path.value.importKind !== 'value') {
+      return;
+    }
     const importPath = path.value.source.value;
     const match = importPath.match(importRegExp);
-    if (!match) return;
+    if (!match) {
+      return;
+    }
 
-    if (importPath.includes('internal/')) return;
+    if (importPath.includes('internal/')) {
+      return;
+    }
 
     path.node.specifiers.forEach((specifier, index) => {
-      if (specifier.importKind && specifier.importKind !== 'value') return;
-      if (specifier.type === 'ImportNamespaceSpecifier') return;
+      if (specifier.importKind && specifier.importKind !== 'value') {
+        return;
+      }
+      if (specifier.type === 'ImportNamespaceSpecifier') {
+        return;
+      }
 
       switch (specifier.type) {
         case 'ImportDefaultSpecifier': {
           const localName = specifier.local.name;
           const moduleName = match[1];
-          if (whitelist[moduleName] == null) return;
+          if (whitelist[moduleName] == null) {
+            return;
+          }
           resultSpecifiers.push(
             j.importSpecifier(j.identifier(moduleName), j.identifier(localName)),
           );
@@ -64,7 +78,9 @@ export default function transformer(fileInfo, api, options) {
       }
     });
 
-    if (!path.node.specifiers.length) path.prune();
+    if (!path.node.specifiers.length) {
+      path.prune();
+    }
   });
 
   if (resultSpecifiers.length) {

diff --git a/packages/material-ui-codemod/src/v5.0.0/optimal-imports.js b/packages/material-ui-codemod/src/v5.0.0/optimal-imports.js
@@ -31,14 +31,20 @@ export default function transformer(fileInfo, api, options) {
   };
 
   root.find(j.ImportDeclaration).forEach((path) => {
-    if (path.value.importKind && path.value.importKind !== 'value') return;
+    if (path.value.importKind && path.value.importKind !== 'value') {
+      return;
+    }
     const importPath = path.value.source.value.replace(/(index)?(\.js)?$/, '');
     const match = importPath.match(importRegExp);
-    if (!match) return;
+    if (!match) {
+      return;
+    }
 
     const subpath = match[1].replace(/\/$/, '');
 
-    if (/^(internal)/.test(subpath)) return;
+    if (/^(internal)/.test(subpath)) {
+      return;
+    }
     const targetImportPath = `${targetModule}/${subpath}`;
 
     const whitelist = getJSExports(
@@ -48,10 +54,16 @@ export default function transformer(fileInfo, api, options) {
     );
 
     path.node.specifiers.forEach((specifier, index) => {
-      if (!path.node.specifiers.length) return;
+      if (!path.node.specifiers.length) {
+        return;
+      }
 
-      if (specifier.importKind && specifier.importKind !== 'value') return;
-      if (specifier.type === 'ImportNamespaceSpecifier') return;
+      if (specifier.importKind && specifier.importKind !== 'value') {
+        return;
+      }
+      if (specifier.type === 'ImportNamespaceSpecifier') {
+        return;
+      }
       const localName = specifier.local.name;
       switch (specifier.type) {
         case 'ImportNamespaceSpecifier':
@@ -69,7 +81,9 @@ export default function transformer(fileInfo, api, options) {
           break;
         }
         case 'ImportSpecifier':
-          if (!whitelist.has(specifier.imported.name)) return;
+          if (!whitelist.has(specifier.imported.name)) {
+            return;
+          }
           addSpecifier(targetImportPath, specifier);
           path.get('specifiers', index).prune();
           break;
@@ -78,7 +92,9 @@ export default function transformer(fileInfo, api, options) {
       }
     });
 
-    if (!path.node.specifiers.length) path.prune();
+    if (!path.node.specifiers.length) {
+      path.prune();
+    }
   });
 
   addImports(

diff --git a/packages/material-ui-lab/src/PickersDay/PickersDay.tsx b/packages/material-ui-lab/src/PickersDay/PickersDay.tsx
@@ -285,7 +285,9 @@ const PickersDay = React.forwardRef(function PickersDay<TDate>(
   };
 
   const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
-    if (!allowSameDateSelection && selected) return;
+    if (!allowSameDateSelection && selected) {
+      return;
+    }
 
     if (!disabled) {
       onDaySelect(day, 'finish');

diff --git a/packages/material-ui-lab/src/TabContext/TabContext.test.js b/packages/material-ui-lab/src/TabContext/TabContext.test.js
@@ -27,7 +27,9 @@ describe('<TabContext />', () => {
      */
     function Tabs({ value }) {
       const context = useTabContext();
-      if (context === null) throw new TypeError();
+      if (context === null) {
+        throw new TypeError();
+      }
 
       return (
         <React.Fragment>
@@ -59,7 +61,9 @@ describe('<TabContext />', () => {
      */
     function Tabs({ value }) {
       const context = useTabContext();
-      if (context === null) throw new TypeError();
+      if (context === null) {
+        throw new TypeError();
+      }
 
       return (
         <React.Fragment>
@@ -87,7 +91,9 @@ describe('<TabContext />', () => {
      */
     function Tabs({ value }) {
       const context = useTabContext();
-      if (context === null) throw new TypeError();
+      if (context === null) {
+        throw new TypeError();
+      }
 
       return (
         <React.Fragment>