update

Author: ota-meshi

lib/rules/jsx-uses-vars.js

@@ -30,6 +30,8 @@ SOFTWARE.
  */
 'use strict'
 
+const utils = require('../utils')
+
 module.exports = {
   // eslint-disable-next-line eslint-plugin/prefer-message-ids
   meta: {
@@ -63,12 +65,7 @@ module.exports = {
           return
         }
 
-        const sourceCode = context.getSourceCode()
-        if (sourceCode.markVariableAsUsed) {
-          sourceCode.markVariableAsUsed(name, node)
-        } else {
-          context.markVariableAsUsed?.(name)
-        }
+        utils.markVariableAsUsed(context, name, node)
       }
     }
   }

lib/rules/script-setup-uses-vars.js

@@ -39,9 +39,10 @@ module.exports = {
     if (!utils.isScriptSetup(context)) {
       return {}
     }
+    const sourceCode = context.getSourceCode()
     /** @type {Set<string>} */
     const scriptVariableNames = new Set()
-    const globalScope = context.getSourceCode().scopeManager.globalScope
+    const globalScope = sourceCode.scopeManager.globalScope
     if (globalScope) {
       for (const variable of globalScope.variables) {
         scriptVariableNames.add(variable.name)
@@ -56,12 +57,7 @@ module.exports = {
 
     /** @param {string} name  */
     function markVariableAsUsed(name) {
-      const sourceCode = context.getSourceCode()
-      if (sourceCode.markVariableAsUsed) {
-        sourceCode.markVariableAsUsed(name, sourceCode.ast)
-      } else {
-        context.markVariableAsUsed?.(name)
-      }
+      utils.markVariableAsUsed(context, name, sourceCode.ast)
     }
 
     /**

lib/utils/index.js

@@ -1942,6 +1942,10 @@ module.exports = {
   withinTypeNode,
   findVariableByIdentifier,
   getScope,
+  /**
+   * Marks a variable with the given name in the current scope as used. This affects the no-unused-vars rule.
+   */
+  markVariableAsUsed,
   /**
    * Checks whether the given node is in export default.
    * @param {ASTNode} node
@@ -2565,6 +2569,26 @@ function isTypeScriptFile(path) {
   return path.endsWith('.ts') || path.endsWith('.tsx') || path.endsWith('.mts')
 }
 
+// ------------------------------------------------------------------------------
+// ESLint Helpers
+// ------------------------------------------------------------------------------
+/**
+ * Marks a variable with the given name in the current scope as used. This affects the no-unused-vars rule.
+ * @param {RuleContext} context
+ * @param {string} name
+ * @param {ASTNode} node The node to get the current scope.
+ */
+function markVariableAsUsed(context, name, node) {
+  const sourceCode = context.getSourceCode()
+  if (sourceCode.markVariableAsUsed) {
+    sourceCode.markVariableAsUsed(name, node)
+  } else {
+    // This function does not use the given node, but the currently visited node.
+    // If we need to determine the scope of a given node, we need to implement it yourself.
+    context.markVariableAsUsed?.(name)
+  }
+}
+
 // ------------------------------------------------------------------------------
 // Vue Helpers
 // ------------------------------------------------------------------------------

typings/eslint/index.d.ts

@@ -18,7 +18,7 @@ export namespace Scope {
     scopes: Scope[]
     globalScope: Scope | null
     acquire(node: VAST.ESNode | VAST.Program, inner?: boolean): Scope | null
-    /** Added in ESLint v8.38.0 */
+    /** @since ESLint v8.38.0 */
     getDeclaredVariables?(node: VAST.ESNode): Variable[]
   }
   interface Scope {
@@ -232,9 +232,9 @@ export class SourceCode /*extends ESLintSourceCode*/ {
   getCommentsAfter(nodeOrToken: VNODE.HasLocation): VNODE.Comment[]
   getCommentsInside(node: VNODE.HasLocation): VNODE.Comment[]
 
-  /** Added in ESLint v8.39.0 */
-  markVariableAsUsed?(name: string, node: VNODE.HasLocation): void
-  /** Added in ESLint v8.37.0 */
+  /** @since ESLint v8.39.0 */
+  markVariableAsUsed?(name: string, node?: VNODE.HasLocation): void
+  /** @since ESLint v8.37.0 */
   getScope?(node: VNODE.HasLocation): Scope.Scope
 }
 export namespace SourceCode {
@@ -337,20 +337,20 @@ export namespace Rule {
     /** @deprecated removed in ESLint v9 */
     getDeclaredVariables?(node: VAST.ESNode): Scope.Variable[]
     getFilename(): string
-    /** Added in ESLint v8.40.0 */
+    /** @since ESLint v8.40.0 */
     filename?: string
     /** @deprecated removed in ESLint v9 */
     getScope?(): Scope.Scope
     getSourceCode(): SourceCode
-    /** Added in ESLint v8.40.0 */
+    /** @since ESLint v8.40.0 */
     sourceCode?: SourceCode
     /** @deprecated removed in ESLint v9 */
     markVariableAsUsed?(name: string): boolean
     report(descriptor: ReportDescriptor): void
 
     // eslint@6 does not have this method.
     getCwd?: () => string
-    /** Added in ESLint v8.40.0 */
+    /** @since ESLint v8.40.0 */
     cwd?: string
   }