fixup! [New] Symmetric useState hook variable names

Author: duncanbeevers

lib/rules/hook-use-state.js

@@ -54,7 +54,7 @@ module.exports = {
         ? useStateReactImportSpecifier.local.name
         : undefined;
 
-      const isReactUseStateCall = (
+      const isPotentialReactUseStateCall = (
         defaultReactImportName
           && node.callee.type === 'MemberExpression'
           && node.callee.object.type === 'Identifier'
@@ -69,17 +69,28 @@ module.exports = {
           && node.callee.name === useStateReactImportName
       );
 
-      const scope = isPotentialUseStateCall && context.getScope();
-      const useStateReference = scope && scope.references.find(
+      const scope = isPotentialReactUseStateCall || isPotentialUseStateCall
+        ? context.getScope()
+        : undefined;
+
+      const reactResolvedDefs = isPotentialReactUseStateCall && scope.references.find(
+        (reference) => reference.identifier.name === defaultReactImportName
+      ).resolved.defs;
+      const useStateResolvedDefs = isPotentialUseStateCall && scope.references.find(
         (reference) => reference.identifier.name === useStateReactImportName
-      );
-      const useStateResolvedDefs = useStateReference
-        ? useStateReference.resolved.defs
+      ).resolved.defs;
+
+      const ultimateReactResolvedDef = reactResolvedDefs
+        ? reactResolvedDefs[reactResolvedDefs.length - 1]
         : undefined;
       const ultimateUseStateResolvedDef = useStateResolvedDefs
         ? useStateResolvedDefs[useStateResolvedDefs.length - 1]
         : undefined;
+
+      const isReactShadowed = ultimateReactResolvedDef && ultimateReactResolvedDef.type !== 'ImportBinding';
       const isUseStateShadowed = ultimateUseStateResolvedDef && ultimateUseStateResolvedDef.type !== 'ImportBinding';
+
+      const isReactUseStateCall = isPotentialReactUseStateCall && !isReactShadowed;
       const isUseStateCall = isPotentialUseStateCall && !isUseStateShadowed;
 
       // Ignore unless this is a useState() or React.useState() call.

tests/lib/rules/hook-use-state.js

@@ -91,13 +91,25 @@ const tests = {
     {
       code: `import { useState } from 'react'
       function useState() { // shadows React's useState
-        return null;
+        return null
       }
       export default function useColor() {
         const result = useState()
       }`,
       features: ['no-default'],
     },
+    {
+      code: `import React from 'react'
+      const React = {
+        useState: () => {
+          return null
+        }
+      }
+      export default function useColor() {
+        const result = React.useState()
+      }`,
+      features: ['no-default'],
+    },
     {
       code: `import { useState } from 'react'
       export default function useColor() {