Merge pull request #1529 from jomasti/issue-1499

Fix crash in default-props-match-prop-types
jsx-eslint · Nov 11, 2017 · e7e2940 · e7e2940
2 parents 02ac5ce + 59e3455
commit e7e2940
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/rules/default-props-match-prop-types.js b/lib/rules/default-props-match-prop-types.js
@@ -177,6 +177,10 @@ module.exports = {
           annotation = findVariableByName(annotation.id.name);
         }
 
+        if (!annotation || !annotation.properties) {
+          return properties;
+        }
+
         return properties.concat(annotation.properties);
       }, []);
     }

diff --git a/tests/lib/rules/default-props-match-prop-types.js b/tests/lib/rules/default-props-match-prop-types.js
@@ -755,6 +755,19 @@ ruleTester.run('default-props-match-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint'
+    },
+    // don't error when variable is not in scope with intersection
+    {
+      code: [
+        'import type ImportedProps from "fake";',
+        'type Props = ImportedProps & {',
+        '  foo: string',
+        '};',
+        'function Hello(props: Props) {',
+        '  return <div>Hello {props.name.firstname}</div>;',
+        '}'
+      ].join('\n'),
+      parser: 'babel-eslint'
     }
   ],