[eslint] fix func-names and change object-shorthand to 'always'

chiawendt · ljharb · commit 83ac4c0b6f77 · 2019-11-01T23:24:26.000+08:00
diff --git a/.eslintrc b/.eslintrc
@@ -16,6 +16,7 @@
     "rules": {
         "comma-dangle": [2, "never"],
         "object-curly-spacing": [2, "never"],
+        "object-shorthand": [2, "always"],
         "array-bracket-spacing": [2, "never"],
         "max-len": [2, 120, {
           "ignoreStrings": true,
diff --git a/lib/rules/boolean-prop-naming.js b/lib/rules/boolean-prop-naming.js
@@ -282,7 +282,8 @@ module.exports = {
         }
       },
 
-      'Program:exit': function () {
+      // eslint-disable-next-line object-shorthand
+      'Program:exit'() {
         if (!rule) {
           return;
         }
diff --git a/lib/rules/default-props-match-prop-types.js b/lib/rules/default-props-match-prop-types.js
@@ -80,7 +80,7 @@ module.exports = {
     // --------------------------------------------------------------------------
 
     return {
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
 
         // If no defaultProps could be found, we don't report anything.
diff --git a/lib/rules/display-name.js b/lib/rules/display-name.js
@@ -227,7 +227,7 @@ module.exports = {
         }
       },
 
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
         // Report missing display name for all components
         Object.keys(list).filter(component => !list[component].hasDisplayName).forEach((component) => {
diff --git a/lib/rules/jsx-closing-bracket-location.js b/lib/rules/jsx-closing-bracket-location.js
@@ -236,7 +236,7 @@ module.exports = {
         lastAttributeNode[getOpeningElementId(node.parent)] = node;
       },
 
-      'JSXOpeningElement:exit': function (node) {
+      'JSXOpeningElement:exit'(node) {
         const attributeNode = lastAttributeNode[getOpeningElementId(node)];
         const cachedLastAttributeEndPos = attributeNode ? attributeNode.range[1] : null;
         let expectedNextLine;
diff --git a/lib/rules/jsx-filename-extension.js b/lib/rules/jsx-filename-extension.js
@@ -80,7 +80,7 @@ module.exports = {
       JSXElement: handleJSX,
       JSXFragment: handleJSX,
 
-      'Program:exit': function () {
+      'Program:exit'() {
         if (!invalidNode) {
           return;
         }
diff --git a/lib/rules/jsx-fragments.js b/lib/rules/jsx-fragments.js
@@ -58,7 +58,7 @@ module.exports = {
 
     function getFixerToLong(jsxFragment) {
       const sourceCode = context.getSourceCode();
-      return function (fixer) {
+      return function fix(fixer) {
         let source = sourceCode.getText();
         source = replaceNode(source, jsxFragment.closingFragment, closeFragLong);
         source = replaceNode(source, jsxFragment.openingFragment, openFragLong);
@@ -71,7 +71,7 @@ module.exports = {
 
     function getFixerToShort(jsxElement) {
       const sourceCode = context.getSourceCode();
-      return function (fixer) {
+      return function fix(fixer) {
         let source = sourceCode.getText();
         let lengthDiff;
         if (jsxElement.closingElement) {
@@ -164,7 +164,7 @@ module.exports = {
         }
       },
 
-      'Program:exit': function () {
+      'Program:exit'() {
         jsxElements.forEach((node) => {
           const openingEl = node.openingElement;
           const elName = elementType(openingEl);
diff --git a/lib/rules/jsx-indent.js b/lib/rules/jsx-indent.js
@@ -95,7 +95,7 @@ module.exports = {
      * @private
      */
     function getFixerFunction(node, needed) {
-      return function (fixer) {
+      return function fix(fixer) {
         const indent = Array(needed + 1).join(indentChar);
         return fixer.replaceTextRange(
           [node.range[0] - node.loc.start.column, node.range[0]],
diff --git a/lib/rules/jsx-max-props-per-line.js b/lib/rules/jsx-max-props-per-line.js
@@ -62,7 +62,7 @@ module.exports = {
         }, ''));
       }
       const code = output.join('\n');
-      return function (fixer) {
+      return function fix(fixer) {
         return fixer.replaceTextRange([front, back], code);
       };
     }
diff --git a/lib/rules/jsx-sort-props.js b/lib/rules/jsx-sort-props.js
@@ -132,7 +132,7 @@ const generateFixerFunction = (node, context, reservedList) => {
     .slice(0)
     .map(group => group.slice(0).sort((a, b) => contextCompare(a, b, options)));
 
-  return function (fixer) {
+  return function fixFunction(fixer) {
     const fixers = [];
     let source = sourceCode.getText();
 
@@ -178,15 +178,15 @@ function validateReservedFirstConfig(context, reservedFirst) {
       ));
 
       if (reservedFirst.length === 0) {
-        return function (decl) {
+        return function report(decl) {
           context.report({
             node: decl,
             message: 'A customized reserved first list must not be empty'
           });
         };
       }
       if (nonReservedWords.length > 0) {
-        return function (decl) {
+        return function report(decl) {
           context.report({
             node: decl,
             message: 'A customized reserved first list must only contain a subset of React reserved props.' +
diff --git a/lib/rules/no-array-index-key.js b/lib/rules/no-array-index-key.js
@@ -213,7 +213,7 @@ module.exports = {
         checkPropValue(value.expression);
       },
 
-      'CallExpression:exit': function (node) {
+      'CallExpression:exit'(node) {
         const mapIndexParamName = getMapIndexParamName(node);
         if (!mapIndexParamName) {
           return;
diff --git a/lib/rules/no-direct-mutation-state.js b/lib/rules/no-direct-mutation-state.js
@@ -119,21 +119,21 @@ module.exports = {
         }
       },
 
-      'CallExpression:exit': function (node) {
+      'CallExpression:exit'(node) {
         components.set(node, {
           inCallExpression: false
         });
       },
 
-      'MethodDefinition:exit': function (node) {
+      'MethodDefinition:exit'(node) {
         if (node.kind === 'constructor') {
           components.set(node, {
             inConstructor: false
           });
         }
       },
 
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
 
         Object.keys(list).forEach((key) => {
diff --git a/lib/rules/no-multi-comp.js b/lib/rules/no-multi-comp.js
@@ -58,7 +58,7 @@ module.exports = {
     // --------------------------------------------------------------------------
 
     return {
-      'Program:exit': function () {
+      'Program:exit'() {
         if (components.length() <= 1) {
           return;
         }
diff --git a/lib/rules/no-set-state.js b/lib/rules/no-set-state.js
@@ -72,7 +72,7 @@ module.exports = {
         });
       },
 
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
         Object.keys(list).filter(component => !isValid(list[component])).forEach((component) => {
           reportSetStateUsages(list[component]);
diff --git a/lib/rules/no-unescaped-entities.js b/lib/rules/no-unescaped-entities.js
@@ -109,7 +109,7 @@ module.exports = {
     }
 
     return {
-      'Literal, JSXText': function (node) {
+      'Literal, JSXText'(node) {
         if (jsxUtil.isJSX(node.parent)) {
           reportInvalidEntity(node);
         }
diff --git a/lib/rules/no-unused-prop-types.js b/lib/rules/no-unused-prop-types.js
@@ -131,7 +131,7 @@ module.exports = {
     // --------------------------------------------------------------------------
 
     return {
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
         // Report undeclared proptypes for all classes
         Object.keys(list).filter(component => mustBeValidated(list[component])).forEach((component) => {
diff --git a/lib/rules/no-unused-state.js b/lib/rules/no-unused-state.js
@@ -231,7 +231,7 @@ module.exports = {
         }
       },
 
-      'ObjectExpression:exit': function (node) {
+      'ObjectExpression:exit'(node) {
         if (!classInfo) {
           return;
         }
@@ -242,7 +242,7 @@ module.exports = {
         }
       },
 
-      'ClassDeclaration:exit': function () {
+      'ClassDeclaration:exit'() {
         if (!classInfo) {
           return;
         }
@@ -306,7 +306,7 @@ module.exports = {
         }
       },
 
-      'ClassProperty:exit': function (node) {
+      'ClassProperty:exit'(node) {
         if (
           classInfo &&
           !node.static &&
@@ -326,7 +326,7 @@ module.exports = {
         classInfo.aliases = new Set();
       },
 
-      'MethodDefinition:exit': function () {
+      'MethodDefinition:exit'() {
         if (!classInfo) {
           return;
         }
@@ -422,7 +422,7 @@ module.exports = {
         }
       },
 
-      'ExperimentalSpreadProperty, SpreadElement': function (node) {
+      'ExperimentalSpreadProperty, SpreadElement'(node) {
         if (classInfo && isStateReference(node.argument)) {
           classInfo = null;
         }
diff --git a/lib/rules/prefer-read-only-props.js b/lib/rules/prefer-read-only-props.js
@@ -33,7 +33,7 @@ module.exports = {
   },
 
   create: Components.detect((context, components) => ({
-    'Program:exit': function () {
+    'Program:exit'() {
       const list = components.list();
 
       Object.keys(list).forEach((key) => {
diff --git a/lib/rules/prefer-stateless-function.js b/lib/rules/prefer-stateless-function.js
@@ -196,21 +196,21 @@ module.exports = {
      * Mark component as pure as declared
      * @param {ASTNode} node The AST node being checked.
      */
-    const markSCUAsDeclared = function (node) {
+    function markSCUAsDeclared(node) {
       components.set(node, {
         hasSCU: true
       });
-    };
+    }
 
     /**
      * Mark childContextTypes as declared
      * @param {ASTNode} node The AST node being checked.
      */
-    const markChildContextTypesAsDeclared = function (node) {
+    function markChildContextTypesAsDeclared(node) {
       components.set(node, {
         hasChildContextTypes: true
       });
-    };
+    }
 
     /**
      * Mark a setState as used
@@ -351,7 +351,7 @@ module.exports = {
         markReturnAsInvalid(node);
       },
 
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
         Object.keys(list).forEach((component) => {
           if (
diff --git a/lib/rules/prop-types.js b/lib/rules/prop-types.js
@@ -183,7 +183,7 @@ module.exports = {
     // --------------------------------------------------------------------------
 
     return {
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
         // Report undeclared proptypes for all classes
         Object.keys(list).filter(component => mustBeValidated(list[component])).forEach((component) => {
diff --git a/lib/rules/require-default-props.js b/lib/rules/require-default-props.js
@@ -80,7 +80,7 @@ module.exports = {
     // --------------------------------------------------------------------------
 
     return {
-      'Program:exit': function () {
+      'Program:exit'() {
         const list = components.list();
 
         Object.keys(list).filter(component => list[component].declaredPropTypes).forEach((component) => {
diff --git a/lib/rules/require-optimization.js b/lib/rules/require-optimization.js
diff --git a/lib/rules/require-render-return.js b/lib/rules/require-render-return.js
diff --git a/lib/rules/sort-comp.js b/lib/rules/sort-comp.js
diff --git a/lib/util/Components.js b/lib/util/Components.js
diff --git a/lib/util/propTypes.js b/lib/util/propTypes.js
diff --git a/lib/util/usedPropTypes.js b/lib/util/usedPropTypes.js
diff --git a/tests/lib/rules/jsx-closing-bracket-location.js b/tests/lib/rules/jsx-closing-bracket-location.js

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,8 @@ module.exports = {`
`282`	`282`	`}`
`283`	`283`	`},`
`284`	`284`
`285`		`- 'Program:exit': function () {`
	`285`	`+ // eslint-disable-next-line object-shorthand`
	`286`	`+ 'Program:exit'() {`
`286`	`287`	`if (!rule) {`
`287`	`288`	`return;`
`288`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ module.exports = {`
`227`	`227`	`}`
`228`	`228`	`},`
`229`	`229`
`230`		`- 'Program:exit': function () {`
	`230`	`+ 'Program:exit'() {`
`231`	`231`	`const list = components.list();`
`232`	`232`	`// Report missing display name for all components`
`233`	`233`	`Object.keys(list).filter(component => !list[component].hasDisplayName).forEach((component) => {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ module.exports = {`
`80`	`80`	`JSXElement: handleJSX,`
`81`	`81`	`JSXFragment: handleJSX,`
`82`	`82`
`83`		`- 'Program:exit': function () {`
	`83`	`+ 'Program:exit'() {`
`84`	`84`	`if (!invalidNode) {`
`85`	`85`	`return;`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ module.exports = {`
`62`	`62`	`}, ''));`
`63`	`63`	`}`
`64`	`64`	`const code = output.join('\n');`
`65`		`- return function (fixer) {`
	`65`	`+ return function fix(fixer) {`
`66`	`66`	`return fixer.replaceTextRange([front, back], code);`
`67`	`67`	`};`
`68`	`68`	`}`