Fix require-optimization test for function declaration

* [FIX] In require-optimization corrected test for function declarations in classes * changed example In require-optimization
jsx-eslint · Aug 11, 2016 · 8661917 · 8661917
1 parent 90ebb64
commit 8661917
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 3 deletions.
diff --git a/lib/rules/require-optimization.js b/lib/rules/require-optimization.js
@@ -71,10 +71,10 @@ module.exports = {
      * @returns {Boolean} True if node is decorated name with a custom decorated, false if not.
      */
     var hasCustomDecorator = function (node) {
-      var allowLenght = allowDecorators.length;
+      var allowLength = allowDecorators.length;
 
-      if (allowLenght && node.decorators && node.decorators.length) {
-        for (var i = 0; i < allowLenght; i++) {
+      if (allowLength && node.decorators && node.decorators.length) {
+        for (var i = 0; i < allowLength; i++) {
           for (var j = 0, l = node.decorators.length; j < l; j++) {
             if (
               node.decorators[j].expression &&
@@ -161,6 +161,24 @@ module.exports = {
       });
     };
 
+    /**
+     * Checks if we are declaring function in class
+     * @returns {Boolean} True if we are declaring function in class, false if not.
+     */
+    var isFunctionInClass = function () {
+      var blockNode;
+      var scope = context.getScope();
+      while (scope) {
+        blockNode = scope.block;
+        if (blockNode && blockNode.type === 'ClassDeclaration') {
+          return true;
+        }
+        scope = scope.upper;
+      }
+
+      return false;
+    };
+
     return {
       ArrowFunctionExpression: function (node) {
         // Stateless Functional Components cannot be optimized (yet)
@@ -175,11 +193,19 @@ module.exports = {
       },
 
       FunctionDeclaration: function (node) {
+        // Skip if the function is declared in the class
+        if (isFunctionInClass()) {
+          return;
+        }
         // Stateless Functional Components cannot be optimized (yet)
         markSCUAsDeclared(node);
       },
 
       FunctionExpression: function (node) {
+        // Skip if the function is declared in the class
+        if (isFunctionInClass()) {
+          return;
+        }
         // Stateless Functional Components cannot be optimized (yet)
         markSCUAsDeclared(node);
       },

diff --git a/tests/lib/rules/require-optimization.js b/tests/lib/rules/require-optimization.js
@@ -37,6 +37,17 @@ ruleTester.run('react-require-optimization', rule, {
       '}'
     ].join('\n'),
     parserOptions: parserOptions
+  }, {
+    code: [
+      'import React, {Component} from "react";',
+      '@reactMixin.decorate(PureRenderMixin)',
+      'class YourComponent extends Component {',
+      '  componetnDidMount () {}',
+      '  render() {}',
+      '}'
+    ].join('\n'),
+    parser: 'babel-eslint',
+    parserOptions: parserOptions
   }, {
     code: [
       'import React from "react";' +
@@ -123,6 +134,21 @@ ruleTester.run('react-require-optimization', rule, {
       message: MESSAGE
     }],
     parserOptions: parserOptions
+  }, {
+    code: [
+      'import React from "react";',
+      'class YourComponent extends React.Component {',
+      '  handleClick() {}',
+      '  render() {',
+      '    return <div onClick={this.handleClick}>123</div>',
+      '  }',
+      '}'
+    ].join('\n'),
+    parser: 'babel-eslint',
+    errors: [{
+      message: MESSAGE
+    }],
+    parserOptions: parserOptions
   }, {
     code: [
       'import React, {Component} from "react";' +