refactor: Return value of applyInlineConfig() (eslint#18623)

kirkwaiblinger · Jun 24, 2024 · 69ff64e · 69ff64e
1 parent 375227f
commit 69ff64e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/languages/js/source-code/source-code.js b/lib/languages/js/source-code/source-code.js
@@ -1099,7 +1099,7 @@ class SourceCode extends TokenStore {
     /**
      * Applies configuration found inside of the source code. This method is only
      * called when ESLint is running with inline configuration allowed.
-     * @returns {{problems:Array<Problem>,configs:{config:FlatConfigArray,node:ASTNode}}} Information
+     * @returns {{problems:Array<Problem>,configs:{config:FlatConfigArray,loc:Location}}} Information
      *      that ESLint needs to further process the inline configuration.
      */
     applyInlineConfig() {
@@ -1154,7 +1154,7 @@ class SourceCode extends TokenStore {
                             config: {
                                 rules: parseResult.config
                             },
-                            node: comment
+                            loc: comment.loc
                         });
                     } else {
                         problems.push({

diff --git a/lib/linter/linter.js b/lib/linter/linter.js
@@ -1764,7 +1764,7 @@ class Linter {
                     // next we need to verify information about the specified rules
                     const ruleValidator = new RuleValidator();
 
-                    for (const { config: inlineConfig, node } of inlineConfigResult.configs) {
+                    for (const { config: inlineConfig, loc } of inlineConfigResult.configs) {
 
                         Object.keys(inlineConfig.rules).forEach(ruleId => {
                             const rule = getRuleFromConfig(ruleId, config);
@@ -1773,7 +1773,7 @@ class Linter {
                             if (!rule) {
                                 inlineConfigProblems.push(createLintingProblem({
                                     ruleId,
-                                    loc: node.loc,
+                                    loc,
                                     language: config.language
                                 }));
                                 return;
@@ -1782,7 +1782,7 @@ class Linter {
                             if (Object.hasOwn(mergedInlineConfig.rules, ruleId)) {
                                 inlineConfigProblems.push(createLintingProblem({
                                     message: `Rule "${ruleId}" is already configured by another configuration comment in the preceding code. This configuration is ignored.`,
-                                    loc: node.loc,
+                                    loc,
                                     language: config.language
                                 }));
                                 return;
@@ -1875,7 +1875,7 @@ class Linter {
                                 inlineConfigProblems.push(createLintingProblem({
                                     ruleId,
                                     message: `Inline configuration for rule "${ruleId}" is invalid:\n\t${baseMessage}\n`,
-                                    loc: node.loc,
+                                    loc,
                                     language: config.language
                                 }));
                             }