[Fix] no-typos: improve report location

jsx-eslint · Oct 20, 2019 · 5be539b · 5be539b
1 parent d9d2193
commit 5be539b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/lib/rules/no-typos.js b/lib/rules/no-typos.js
@@ -124,17 +124,18 @@ module.exports = {
       }
     }
 
-    function reportErrorIfPropertyCasingTypo(node, propertyName, isClassProperty) {
+    function reportErrorIfPropertyCasingTypo(propertyValue, propertyKey, isClassProperty) {
+      const propertyName = propertyKey.name;
       if (propertyName === 'propTypes' || propertyName === 'contextTypes' || propertyName === 'childContextTypes') {
-        checkValidPropObject(node);
+        checkValidPropObject(propertyValue);
       }
       STATIC_CLASS_PROPERTIES.forEach((CLASS_PROP) => {
         if (propertyName && CLASS_PROP.toLowerCase() === propertyName.toLowerCase() && CLASS_PROP !== propertyName) {
           const message = isClassProperty ?
             'Typo in static class property declaration' :
             'Typo in property declaration';
           context.report({
-            node,
+            node: propertyKey,
             message
           });
         }
@@ -176,9 +177,7 @@ module.exports = {
           return;
         }
 
-        const tokens = context.getFirstTokens(node, 2);
-        const propertyName = tokens[1].value;
-        reportErrorIfPropertyCasingTypo(node.value, propertyName, true);
+        reportErrorIfPropertyCasingTypo(node.value, node.key, true);
       },
 
       MemberExpression(node) {
@@ -198,7 +197,7 @@ module.exports = {
           (utils.isES6Component(relatedComponent.node) || utils.isReturningJSX(relatedComponent.node)) &&
           (node.parent && node.parent.type === 'AssignmentExpression' && node.parent.right)
         ) {
-          reportErrorIfPropertyCasingTypo(node.parent.right, propertyName, true);
+          reportErrorIfPropertyCasingTypo(node.parent.right, node.property, true);
         }
       },
 
@@ -218,7 +217,7 @@ module.exports = {
         }
 
         node.properties.forEach((property) => {
-          reportErrorIfPropertyCasingTypo(property.value, property.key.name, false);
+          reportErrorIfPropertyCasingTypo(property.value, property.key, false);
           reportErrorIfLifecycleMethodCasingTypo(property);
         });
       }

diff --git a/tests/lib/rules/no-typos.js b/tests/lib/rules/no-typos.js
@@ -618,21 +618,21 @@ ruleTester.run('no-typos', rule, {
     `,
     parser: parsers.BABEL_ESLINT,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       class Component extends React.Component {}
       Component.PropTypes = {}
     `,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       function MyComponent() { return (<div>{this.props.myProp}</div>) }
       MyComponent.PropTypes = {}
     `,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       class Component extends React.Component {
@@ -664,7 +664,7 @@ ruleTester.run('no-typos', rule, {
     `,
     parser: parsers.BABEL_ESLINT,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       class Component extends React.Component {}
@@ -756,21 +756,21 @@ ruleTester.run('no-typos', rule, {
     `,
     parser: parsers.BABEL_ESLINT,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       class Component extends React.Component {}
       Component.DefaultProps = {}
     `,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       function MyComponent() { return (<div>{this.props.myProp}</div>) }
       MyComponent.DefaultProps = {}
     `,
     parserOptions,
-    errors: [{message: ERROR_MESSAGE}]
+    errors: [{message: ERROR_MESSAGE, type: 'Identifier'}]
   }, {
     code: `
       class Component extends React.Component {
@@ -1567,13 +1567,13 @@ ruleTester.run('no-typos', rule, {
     parserOptions,
     errors: [{
       message: ERROR_MESSAGE_ES5,
-      type: 'ObjectExpression'
+      type: 'Identifier'
     }, {
       message: ERROR_MESSAGE_ES5,
-      type: 'ObjectExpression'
+      type: 'Identifier'
     }, {
       message: ERROR_MESSAGE_ES5,
-      type: 'ObjectExpression'
+      type: 'Identifier'
     }, {
       message: ERROR_MESSAGE_LIFECYCLE_METHOD,
       type: 'Property'
@@ -1619,13 +1619,13 @@ ruleTester.run('no-typos', rule, {
     parserOptions,
     errors: [{
       message: ERROR_MESSAGE_ES5,
-      type: 'ObjectExpression'
+      type: 'Identifier'
     }, {
       message: ERROR_MESSAGE_ES5,
-      type: 'ObjectExpression'
+      type: 'Identifier'
     }, {
       message: ERROR_MESSAGE_ES5,
-      type: 'ObjectExpression'
+      type: 'Identifier'
     }, {
       message: ERROR_MESSAGE_LIFECYCLE_METHOD,
       type: 'Property'