[eslint] enable and manually fix no-case-declarations

Author: ljharb

.eslintrc

@@ -36,7 +36,6 @@
         "object-curly-newline": 1,
         "object-property-newline": 1,
         "spaced-comment": 1,
-        "no-case-declarations": 1,
         "no-underscore-dangle": 1,
         "no-mixed-operators": 1,
         "no-void": 1,

lib/rules/forbid-prop-types.js

@@ -118,18 +118,20 @@ module.exports = {
         case 'ObjectExpression':
           checkProperties(node.properties);
           break;
-        case 'Identifier':
+        case 'Identifier': {
           const propTypesObject = variableUtil.findVariableByName(context, node.name);
           if (propTypesObject && propTypesObject.properties) {
             checkProperties(propTypesObject.properties);
           }
           break;
-        case 'CallExpression':
+        }
+        case 'CallExpression': {
           const innerNode = node.arguments && node.arguments[0];
           if (propWrapperUtil.isPropWrapperFunction(context, context.getSource(node.callee)) && innerNode) {
             checkNode(innerNode);
           }
           break;
+        }
         default:
           break;
       }

lib/rules/jsx-closing-bracket-location.js

@@ -142,9 +142,10 @@ module.exports = {
           return tokens.lastProp.lastLine === tokens.closing.line;
         case 'props-aligned':
         case 'tag-aligned':
-        case 'line-aligned':
+        case 'line-aligned': {
           const correctColumn = getCorrectColumn(tokens, expectedLocation);
           return correctColumn === tokens.closing.column;
+        }
         default:
           return true;
       }

lib/rules/jsx-sort-default-props.js

@@ -129,18 +129,20 @@ module.exports = {
         case 'ObjectExpression':
           checkSorted(node.properties);
           break;
-        case 'Identifier':
+        case 'Identifier': {
           const propTypesObject = findVariableByName(node.name);
           if (propTypesObject && propTypesObject.properties) {
             checkSorted(propTypesObject.properties);
           }
           break;
-        case 'CallExpression':
+        }
+        case 'CallExpression': {
           const innerNode = node.arguments && node.arguments[0];
           if (propWrapperUtil.isPropWrapperFunction(context, node.callee.name) && innerNode) {
             checkNode(innerNode);
           }
           break;
+        }
         default:
           break;
       }

lib/rules/sort-prop-types.js

@@ -247,18 +247,20 @@ module.exports = {
         case 'ObjectExpression':
           checkSorted(node.properties);
           break;
-        case 'Identifier':
+        case 'Identifier': {
           const propTypesObject = variableUtil.findVariableByName(context, node.name);
           if (propTypesObject && propTypesObject.properties) {
             checkSorted(propTypesObject.properties);
           }
           break;
-        case 'CallExpression':
+        }
+        case 'CallExpression': {
           const innerNode = node.arguments && node.arguments[0];
           if (propWrapperUtil.isPropWrapperFunction(context, node.callee.name) && innerNode) {
             checkNode(innerNode);
           }
           break;
+        }
         default:
           break;
       }

lib/util/propTypes.js

@@ -370,7 +370,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
       const callName = value.callee.property.name;
       const argument = value.arguments[0];
       switch (callName) {
-        case 'shape':
+        case 'shape': {
           if (argument.type !== 'ObjectExpression') {
             // Invalid proptype or cannot analyse statically
             return {};
@@ -390,8 +390,9 @@ module.exports = function propTypesInstructions(context, components, utils) {
             }
           });
           return shapeTypeDefinition;
+        }
         case 'arrayOf':
-        case 'objectOf':
+        case 'objectOf': {
           const fullName = [parentName, '*'].join('.');
           const child = buildReactDeclarationTypes(argument, fullName);
           child.fullName = fullName;
@@ -403,7 +404,8 @@ module.exports = function propTypesInstructions(context, components, utils) {
               __ANY_KEY__: child
             }
           };
-        case 'oneOfType':
+        }
+        case 'oneOfType': {
           if (
             !argument.elements ||
             !argument.elements.length
@@ -435,6 +437,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
             return {};
           }
           return unionTypeDefinition;
+        }
         case 'instanceOf':
           return {
             type: 'instance',
@@ -482,7 +485,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
           declaredPropTypes[key] = types;
         });
         break;
-      case 'MemberExpression':
+      case 'MemberExpression': {
         let curDeclaredPropTypes = declaredPropTypes;
         // Walk the list of properties, until we reach the assignment
         // ie: ClassX.propTypes.a.b.c = ...
@@ -537,7 +540,8 @@ module.exports = function propTypesInstructions(context, components, utils) {
           }
         }
         break;
-      case 'Identifier':
+      }
+      case 'Identifier': {
         const variablesInScope = variableUtil.variablesInScope(context);
         for (let i = 0, j = variablesInScope.length; i < j; i++) {
           if (variablesInScope[i].name !== propTypes.name) {
@@ -549,7 +553,8 @@ module.exports = function propTypesInstructions(context, components, utils) {
         }
         ignorePropsValidation = true;
         break;
-      case 'CallExpression':
+      }
+      case 'CallExpression': {
         if (
           propWrapperUtil.isPropWrapperFunction(context, sourceCode.getText(propTypes.callee)) &&
           propTypes.arguments && propTypes.arguments[0]
@@ -558,6 +563,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
           return;
         }
         break;
+      }
       case 'IntersectionTypeAnnotation':
         ignorePropsValidation = declarePropTypesForIntersectionTypeAnnotation(propTypes, declaredPropTypes);
         break;

lib/util/usedPropTypes.js

@@ -364,7 +364,7 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
     let ignoreUnusedPropTypesValidation = component && component.ignoreUnusedPropTypesValidation || false;
 
     switch (type) {
-      case 'direct':
+      case 'direct': {
         // Ignore Object methods
         if (name in Object.prototype) {
           break;
@@ -385,7 +385,8 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
           node: reportedNode
         });
         break;
-      case 'destructuring':
+      }
+      case 'destructuring': {
         for (let k = 0, l = (properties || []).length; k < l; k++) {
           if (hasSpreadOperator(properties[k]) || properties[k].computed) {
             ignoreUnusedPropTypesValidation = true;
@@ -409,6 +410,7 @@ module.exports = function usedPropTypesInstructions(context, components, utils)
           }
         }
         break;
+      }
       default:
         break;
     }