Use ESLint markVariableAsUsed method instead of our (now useless) cus…

…tom one (fixes #799)
jsx-eslint · Sep 12, 2016 · 3291358 · 3291358
1 parent ffd8ea7
commit 3291358
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 42 deletions.
diff --git a/lib/rules/jsx-uses-react.js b/lib/rules/jsx-uses-react.js
@@ -4,7 +4,6 @@
  */
 'use strict';
 
-var variableUtil = require('../util/variable');
 var pragmaUtil = require('../util/pragma');
 
 // ------------------------------------------------------------------------------
@@ -32,7 +31,7 @@ module.exports = {
     return {
 
       JSXOpeningElement: function() {
-        variableUtil.markVariableAsUsed(context, pragma);
+        context.markVariableAsUsed(pragma);
       },
 
       BlockComment: function(node) {

diff --git a/lib/rules/jsx-uses-vars.js b/lib/rules/jsx-uses-vars.js
@@ -4,8 +4,6 @@
  */
 'use strict';
 
-var variableUtil = require('../util/variable');
-
 // ------------------------------------------------------------------------------
 // Rule Definition
 // ------------------------------------------------------------------------------
@@ -42,7 +40,7 @@ module.exports = {
           return;
         }
 
-        variableUtil.markVariableAsUsed(context, name);
+        context.markVariableAsUsed(name);
       }
 
     };

diff --git a/lib/util/variable.js b/lib/util/variable.js
@@ -4,41 +4,6 @@
  */
 'use strict';
 
-/**
- * Record that a particular variable has been used in code
- *
- * @param {Object} context The current rule context.
- * @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.
- */
-function markVariableAsUsed(context, name) {
-  var scope = context.getScope();
-  var variables;
-  var i;
-  var len;
-  var found = false;
-
-  // Special Node.js scope means we need to start one level deeper
-  if (scope.type === 'global') {
-    while (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) {
-        variables[i].eslintUsed = true;
-        found = true;
-      }
-    }
-    scope = scope.upper;
-  } while (scope);
-
-  return found;
-}
-
 /**
  * Search a particular variable in a list
  * @param {Array} variables The variables list.
@@ -88,6 +53,5 @@ function variablesInScope(context) {
 
 module.exports = {
   findVariable: findVariable,
-  variablesInScope: variablesInScope,
-  markVariableAsUsed: markVariableAsUsed
+  variablesInScope: variablesInScope
 };
diff --git a/tests/lib/rules/jsx-uses-vars.js b/tests/lib/rules/jsx-uses-vars.js
@@ -184,6 +184,21 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
       }],
       parser: 'babel-eslint',
       parserOptions: parserOptions
+    }, {
+      code: '\
+        /*eslint jsx-uses-vars:1*/\
+        import {Hello} from \'Hello\';\
+        function Greetings() {\
+          const Hello = require(\'Hello\').default;\
+          return <Hello />;\
+        }\
+        Greetings();',
+      errors: [{
+        message: '\'Hello\' is defined but never used.',
+        line: 1
+      }],
+      parser: 'babel-eslint',
+      parserOptions: parserOptions
     }
   ]
 });