Remove babel-eslint workarounds for ClassProperty

Since the oldest supported version of `babel-eslint` (6.x) has the
key property on ClassProperty nodes, the workarounds aren't needed.

Author: jomasti

lib/rules/boolean-prop-naming.js

@@ -55,18 +55,12 @@ module.exports = {
      * @returns {Boolean} True if node is `propTypes` declaration, false if not.
      */
     function isPropTypesDeclaration(node) {
-      // Special case for class properties
-      // (babel-eslint does not expose property name so we have to rely on tokens)
       if (node && node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        if (tokens[0].value === 'propTypes' || (tokens[1] && tokens[1].value === 'propTypes')) {
-          return true;
-        }
         // Flow support
         if (node.typeAnnotation && node.key.name === 'props') {
           return true;
         }
-        return false;
+        node = node.key;
       }
 
       return Boolean(

lib/rules/default-props-match-prop-types.js

@@ -48,11 +48,6 @@ module.exports = {
         return node.key.name;
       } else if (node.type === 'MemberExpression') {
         return node.property.name;
-      // Special case for class properties
-      // (babel-eslint@5 does not expose property name so we have to rely on tokens)
-      } else if (node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
       }
       return '';
     }

lib/rules/display-name.js

@@ -31,7 +31,6 @@ module.exports = {
   },
 
   create: Components.detect((context, components, utils) => {
-    const sourceCode = context.getSourceCode();
     const config = context.options[0] || {};
     const ignoreTranspilerName = config.ignoreTranspilerName || false;
 
@@ -44,17 +43,8 @@ module.exports = {
      */
     function isDisplayNameDeclaration(node) {
       switch (node.type) {
-        // Special case for class properties
-        // (babel-eslint does not expose property name so we have to rely on tokens)
         case 'ClassProperty':
-          const tokens = sourceCode.getFirstTokens(node, 2);
-          if (
-            tokens[0].value === 'displayName' ||
-            (tokens[1] && tokens[1].value === 'displayName')
-          ) {
-            return true;
-          }
-          return false;
+          return node.key && node.key.name === 'displayName';
         case 'Identifier':
           return node.name === 'displayName';
         case 'Literal':

lib/rules/forbid-prop-types.js

@@ -53,14 +53,8 @@ module.exports = {
      * @returns {Boolean} True if node is `propTypes` declaration, false if not.
      */
     function isPropTypesDeclaration(node) {
-      // Special case for class properties
-      // (babel-eslint does not expose property name so we have to rely on tokens)
       if (node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        if (tokens[0].value === 'propTypes' || (tokens[1] && tokens[1].value === 'propTypes')) {
-          return true;
-        }
-        return false;
+        node = node.key;
       }
 
       return Boolean(

lib/rules/no-redundant-should-component-update.js

@@ -32,11 +32,6 @@ module.exports = {
     function getPropertyName(node) {
       if (node.key) {
         return node.key.name;
-      } else if (node.type === 'ClassProperty') {
-        // Special case for class properties
-        // (babel-eslint does not expose property name so we have to rely on tokens)
-        const tokens = context.getFirstTokens(node, 2);
-        return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
       }
       return '';
     }

lib/rules/no-unused-prop-types.js

@@ -182,17 +182,8 @@ module.exports = {
      * @returns {Boolean} True if we are declaring a prop, false if not.
      */
     function isPropTypesDeclaration(node) {
-      // Special case for class properties
-      // (babel-eslint does not expose property name so we have to rely on tokens)
       if (node && node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        if (
-          tokens[0].value === 'propTypes' ||
-          (tokens[1] && tokens[1].value === 'propTypes')
-        ) {
-          return true;
-        }
-        return false;
+        node = node.key;
       }
 
       return Boolean(

lib/rules/prefer-stateless-function.js

@@ -49,13 +49,6 @@ module.exports = {
      * @returns {String} Property name.
      */
     function getPropertyName(node) {
-      // Special case for class properties
-      // (babel-eslint does not expose property name so we have to rely on tokens)
-      if (node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
-      }
-
       return node.key.name;
     }
 

lib/rules/prop-types.js

@@ -188,17 +188,8 @@ module.exports = {
      * @returns {Boolean} True if we are declaring a prop, false if not.
      */
     function isPropTypesDeclaration(node) {
-      // Special case for class properties
-      // (babel-eslint does not expose property name so we have to rely on tokens)
       if (node && node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        if (
-          tokens[0].value === 'propTypes' ||
-          (tokens[1] && tokens[1].value === 'propTypes')
-        ) {
-          return true;
-        }
-        return false;
+        node = node.key;
       }
 
       return Boolean(

lib/rules/require-default-props.js

@@ -39,11 +39,6 @@ module.exports = {
         return node.key.name;
       } else if (node.type === 'MemberExpression') {
         return node.property.name;
-      // Special case for class properties
-      // (babel-eslint@5 does not expose property name so we have to rely on tokens)
-      } else if (node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
       }
       return '';
     }

lib/rules/sort-comp.js

@@ -195,13 +195,6 @@ module.exports = {
      * @returns {String} Property name.
      */
     function getPropertyName(node) {
-      // Special case for class properties
-      // (babel-eslint does not expose property name so we have to rely on tokens)
-      if (node.type === 'ClassProperty') {
-        const tokens = context.getFirstTokens(node, 2);
-        return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
-      }
-
       if (node.kind === 'get') {
         return 'getter functions';
       }