Fix jsx-uses-vars for ES6 classes (fixes #96)

Author: Yannick Croissant

lib/util/variable.js

@@ -7,9 +7,6 @@
 /**
  * Record that a particular variable has been used in code
  *
- * Similar to the one coming from ESLint but with a patch for babel-eslint
- * to avoid https://github.com/babel/babel-eslint/issues/21
- *
  * @param {String} name The name of the variable to mark as used.
  * @returns {Boolean} True if the variable was found and marked as used, false if not.
  */
@@ -22,15 +19,12 @@ function markVariableAsUsed(context, name) {
   // Special Node.js scope means we need to start one level deeper
   if (scope.type === 'global' && scope.childScopes.length) {
     scope = scope.childScopes[0];
-    if (scope.childScopes.length) {
-      scope = scope.childScopes[0];
-    }
   }
 
   do {
     variables = scope.variables;
     for (i = 0, len = variables.length; i < len; i++) {
-      if (variables[i].name === name) {
+      if (variables[i].name === name && scope.type !== 'class') {
         variables[i].eslintUsed = true;
         return true;
       }

tests/lib/rules/jsx-uses-vars.js

@@ -68,6 +68,29 @@ eslintTester.addRuleTest('node_modules/eslint/lib/rules/no-unused-vars', {
       ecmaFeatures: {
         jsx: true
       }
+    }, {
+      code: '\
+        /*eslint jsx-uses-vars:1*/\
+        class HelloMessage {}\
+        <HelloMessage />',
+      ecmaFeatures: {
+        classes: true,
+        jsx: true
+      }
+    }, {
+      code: '\
+        /*eslint jsx-uses-vars:1*/\
+        class HelloMessage {\
+          render() {\
+            var HelloMessage = <div>Hello</div>;\
+            return HelloMessage;\
+          }\
+        }\
+        <HelloMessage />',
+      ecmaFeatures: {
+        classes: true,
+        jsx: true
+      }
     }
   ],
   invalid: [
@@ -85,6 +108,32 @@ eslintTester.addRuleTest('node_modules/eslint/lib/rules/no-unused-vars', {
       ecmaFeatures: {
         jsx: true
       }
+    }, {
+      code: '\
+        /*eslint jsx-uses-vars:1*/\
+        class unused {}',
+      errors: [{message: 'unused is defined but never used'}],
+      ecmaFeatures: {
+        classes: true,
+        jsx: true
+      }
+    }, {
+      code: '\
+        /*eslint jsx-uses-vars:1*/\
+        class HelloMessage {\
+          render() {\
+            var HelloMessage = <div>Hello</div>;\
+            return HelloMessage;\
+          }\
+        }',
+      errors: [{
+        message: 'HelloMessage is defined but never used',
+        line: 1
+      }],
+      ecmaFeatures: {
+        classes: true,
+        jsx: true
+      }
     }
   ]
 });