[Refactor] getFirstTokens: context -> sourceCode

jsx-eslint · May 18, 2024 · 65f10f9 · 65f10f9
1 parent 0c804bb
commit 65f10f9
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/lib/rules/jsx-sort-default-props.js b/lib/rules/jsx-sort-default-props.js
@@ -10,7 +10,10 @@ const variableUtil = require('../util/variable');
 const docsUrl = require('../util/docsUrl');
 const report = require('../util/report');
 const log = require('../util/log');
-const getSourceCode = require('../util/eslint').getSourceCode;
+const eslintUtil = require('../util/eslint');
+
+const getFirstTokens = eslintUtil.getFirstTokens;
+const getSourceCode = eslintUtil.getSourceCode;
 
 let isWarnedForDeprecation = false;
 
@@ -66,7 +69,7 @@ module.exports = {
       // (babel-eslint@5 does not expose property name so we have to rely on tokens)
       }
       if (node.type === 'ClassProperty') {
-        const tokens = getSourceCode(context).getFirstTokens(node, 2);
+        const tokens = getFirstTokens(context, node, 2);
         return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
       }
       return '';

diff --git a/lib/rules/jsx-tag-spacing.js b/lib/rules/jsx-tag-spacing.js
@@ -8,7 +8,10 @@
 const getTokenBeforeClosingBracket = require('../util/getTokenBeforeClosingBracket');
 const docsUrl = require('../util/docsUrl');
 const report = require('../util/report');
-const getSourceCode = require('../util/eslint').getSourceCode;
+const eslintUtil = require('../util/eslint');
+
+const getFirstTokens = eslintUtil.getFirstTokens;
+const getSourceCode = eslintUtil.getSourceCode;
 
 const messages = {
   selfCloseSlashNoSpace: 'Whitespace is forbidden between `/` and `>`; write `/>`',
@@ -65,7 +68,7 @@ function validateClosingSlash(context, node, option) {
       });
     }
   } else {
-    const firstTokens = sourceCode.getFirstTokens(node, 2);
+    const firstTokens = getFirstTokens(context, node, 2);
 
     adjacent = !sourceCode.isSpaceBetweenTokens(firstTokens[0], firstTokens[1]);
 

diff --git a/lib/rules/sort-default-props.js b/lib/rules/sort-default-props.js
@@ -9,7 +9,10 @@
 const variableUtil = require('../util/variable');
 const docsUrl = require('../util/docsUrl');
 const report = require('../util/report');
-const getSourceCode = require('../util/eslint').getSourceCode;
+const eslintUtil = require('../util/eslint');
+
+const getFirstTokens = eslintUtil.getFirstTokens;
+const getSourceCode = eslintUtil.getSourceCode;
 
 // ------------------------------------------------------------------------------
 // Rule Definition
@@ -61,7 +64,7 @@ module.exports = {
       // (babel-eslint@5 does not expose property name so we have to rely on tokens)
       }
       if (node.type === 'ClassProperty') {
-        const tokens = getSourceCode(context).getFirstTokens(node, 2);
+        const tokens = getFirstTokens(context, node, 2);
         return tokens[1] && tokens[1].type === 'Identifier' ? tokens[1].value : tokens[0].value;
       }
       return '';

diff --git a/lib/util/annotations.js b/lib/util/annotations.js
@@ -6,6 +6,8 @@
 
 'use strict';
 
+const getFirstTokens = require('./eslint').getFirstTokens;
+
 /**
  * Checks if we are declaring a `props` argument with a flow type annotation.
  * @param {ASTNode} node The AST node being checked.
@@ -19,7 +21,7 @@ function isAnnotatedFunctionPropsDeclaration(node, context) {
 
   const typeNode = node.params[0].type === 'AssignmentPattern' ? node.params[0].left : node.params[0];
 
-  const tokens = context.getFirstTokens(typeNode, 2);
+  const tokens = getFirstTokens(context, typeNode, 2);
   const isAnnotated = typeNode.typeAnnotation;
   const isDestructuredProps = typeNode.type === 'ObjectPattern';
   const isProps = tokens[0].value === 'props' || (tokens[1] && tokens[1].value === 'props');

diff --git a/lib/util/ast.js b/lib/util/ast.js
@@ -7,6 +7,7 @@
 const estraverse = require('estraverse');
 const eslintUtil = require('./eslint');
 
+const getFirstTokens = eslintUtil.getFirstTokens;
 const getSourceCode = eslintUtil.getSourceCode;
 // const pragmaUtil = require('./pragma');
 
@@ -287,7 +288,7 @@ function stripQuotes(string) {
  */
 function getKeyValue(context, node) {
   if (node.type === 'ObjectTypeProperty') {
-    const tokens = getSourceCode(context).getFirstTokens(node, 2);
+    const tokens = getFirstTokens(context, node, 2);
     return (tokens[0].value === '+' || tokens[0].value === '-'
       ? tokens[1].value
       : stripQuotes(tokens[0].value)

diff --git a/lib/util/eslint.js b/lib/util/eslint.js
@@ -16,8 +16,14 @@ function markVariableAsUsed(name, node, context) {
     : context.markVariableAsUsed(name);
 }
 
+function getFirstTokens(context, node, count) {
+  const sourceCode = getSourceCode(context);
+  return sourceCode.getFirstTokens ? sourceCode.getFirstTokens(node, count) : context.getFirstTokens(node, count);
+}
+
 module.exports = {
   getAncestors,
+  getFirstTokens,
   getSourceCode,
   markVariableAsUsed,
 };
diff --git a/lib/util/propTypes.js b/lib/util/propTypes.js
@@ -15,6 +15,7 @@ const astUtil = require('./ast');
 const isFirstLetterCapitalized = require('./isFirstLetterCapitalized');
 const eslintUtil = require('./eslint');
 
+const getFirstTokens = eslintUtil.getFirstTokens;
 const getSourceCode = eslintUtil.getSourceCode;
 
 /**
@@ -1112,7 +1113,7 @@ module.exports = function propTypesInstructions(context, components, utils) {
    */
   function isAnnotatedClassPropsDeclaration(node) {
     if (node && (node.type === 'ClassProperty' || node.type === 'PropertyDefinition')) {
-      const tokens = context.getFirstTokens(node, 2);
+      const tokens = getFirstTokens(context, node, 2);
       if (
         node.typeAnnotation && (
           tokens[0].value === 'props'