eslint
diff --git a/‎lib/languages/js/source-code/source-code.js‎
Lines changed: 29 additions & 94 deletions b/‎lib/languages/js/source-code/source-code.js‎
Lines changed: 29 additions & 94 deletions
diff --git a/‎lib/linter/config-comment-parser.js‎
Lines changed: 0 additions & 169 deletions b/‎lib/linter/config-comment-parser.js‎
Lines changed: 0 additions & 169 deletions
@@ -20,7 +20,7 @@ const
 
     CodePathAnalyzer = require("../../../linter/code-path-analysis/code-path-analyzer"),
     createEmitter = require("../../../linter/safe-emitter"),
-    ConfigCommentParser = require("../../../linter/config-comment-parser"),
+    { ConfigCommentParser, VisitNodeStep, CallMethodStep } = require("@eslint/plugin-kit"),
 
     eslintScope = require("eslint-scope");
 
@@ -316,65 +316,6 @@ function markExportedVariables(globalScope, variables) {
 
 }
 
-const STEP_KIND = {
-    visit: 1,
-    call: 2
-};
-
-/**
- * A class to represent a step in the traversal process.
- */
-class TraversalStep {
-
-    /**
-     * The type of the step.
-     * @type {string}
-     */
-    type;
-
-    /**
-     * The kind of the step. Represents the same data as the `type` property
-     * but it's a number for performance.
-     * @type {number}
-     */
-    kind;
-
-    /**
-     * The target of the step.
-     * @type {ASTNode|string}
-     */
-    target;
-
-    /**
-     * The phase of the step.
-     * @type {number|undefined}
-     */
-    phase;
-
-    /**
-     * The arguments of the step.
-     * @type {Array<any>}
-     */
-    args;
-
-    /**
-     * Creates a new instance.
-     * @param {Object} options The options for the step.
-     * @param {string} options.type The type of the step.
-     * @param {ASTNode|string} options.target The target of the step.
-     * @param {number|undefined} [options.phase] The phase of the step.
-     * @param {Array<any>} options.args The arguments of the step.
-     * @returns {void}
-     */
-    constructor({ type, target, phase, args }) {
-        this.type = type;
-        this.kind = STEP_KIND[type];
-        this.target = target;
-        this.phase = phase;
-        this.args = args;
-    }
-}
-
 /**
  * A class to represent a directive comment.
  * @implements {IDirective}
@@ -1002,16 +943,18 @@ class SourceCode extends TokenStore {
                 return false;
             }
 
-            const { directivePart } = commentParser.extractDirectiveComment(comment.value);
+            const directive = commentParser.parseDirective(comment.value);
 
-            const directiveMatch = directivesPattern.exec(directivePart);
+            if (!directive) {
+                return false;
+            }
 
-            if (!directiveMatch) {
+            if (!directivesPattern.test(directive.label)) {
                 return false;
             }
 
             // only certain comment types are supported as line comments
-            return comment.type !== "Line" || !!/^eslint-disable-(next-)?line$/u.test(directiveMatch[1]);
+            return comment.type !== "Line" || !!/^eslint-disable-(next-)?line$/u.test(directive.label);
         });
 
         this[caches].set("configNodes", configNodes);
@@ -1038,27 +981,24 @@ class SourceCode extends TokenStore {
         const directives = [];
 
         this.getInlineConfigNodes().forEach(comment => {
-            const { directivePart, justificationPart } = commentParser.extractDirectiveComment(comment.value);
 
-            // Step 1: Extract the directive text
-            const match = directivesPattern.exec(directivePart);
-
-            if (!match) {
-                return;
-            }
-
-            const directiveText = match[1];
+            // Step 1: Parse the directive
+            const {
+                label,
+                value,
+                justification: justificationPart
+            } = commentParser.parseDirective(comment.value);
 
             // Step 2: Extract the directive value
-            const lineCommentSupported = /^eslint-disable-(next-)?line$/u.test(directiveText);
+            const lineCommentSupported = /^eslint-disable-(next-)?line$/u.test(label);
 
             if (comment.type === "Line" && !lineCommentSupported) {
                 return;
             }
 
             // Step 3: Validate the directive does not span multiple lines
-            if (directiveText === "eslint-disable-line" && comment.loc.start.line !== comment.loc.end.line) {
-                const message = `${directiveText} comment should not span multiple lines.`;
+            if (label === "eslint-disable-line" && comment.loc.start.line !== comment.loc.end.line) {
+                const message = `${label} comment should not span multiple lines.`;
 
                 problems.push({
                     ruleId: null,
@@ -1069,19 +1009,17 @@ class SourceCode extends TokenStore {
             }
 
             // Step 4: Extract the directive value and create the Directive object
-            const directiveValue = directivePart.slice(match.index + directiveText.length);
-
-            switch (directiveText) {
+            switch (label) {
                 case "eslint-disable":
                 case "eslint-enable":
                 case "eslint-disable-next-line":
                 case "eslint-disable-line": {
-                    const directiveType = directiveText.slice("eslint-".length);
+                    const directiveType = label.slice("eslint-".length);
 
                     directives.push(new Directive({
                         type: directiveType,
                         node: comment,
-                        value: directiveValue,
+                        value,
                         justification: justificationPart
                     }));
                 }
@@ -1136,20 +1074,20 @@ class SourceCode extends TokenStore {
 
         this.getInlineConfigNodes().forEach(comment => {
 
-            const { directiveText, directiveValue } = commentParser.parseDirective(comment);
+            const { label, value } = commentParser.parseDirective(comment.value);
 
-            switch (directiveText) {
+            switch (label) {
                 case "exported":
-                    Object.assign(exportedVariables, commentParser.parseListConfig(directiveValue, comment));
+                    Object.assign(exportedVariables, commentParser.parseListConfig(value));
                     break;
 
                 case "globals":
                 case "global":
-                    for (const [id, { value }] of Object.entries(commentParser.parseStringConfig(directiveValue, comment))) {
+                    for (const [id, idSetting] of Object.entries(commentParser.parseStringConfig(value))) {
                         let normalizedValue;
 
                         try {
-                            normalizedValue = normalizeConfigGlobal(value);
+                            normalizedValue = normalizeConfigGlobal(idSetting);
                         } catch (err) {
                             problems.push({
                                 ruleId: null,
@@ -1172,9 +1110,9 @@ class SourceCode extends TokenStore {
                     break;
 
                 case "eslint": {
-                    const parseResult = commentParser.parseJsonConfig(directiveValue);
+                    const parseResult = commentParser.parseJSONLikeConfig(value);
 
-                    if (parseResult.success) {
+                    if (parseResult.ok) {
                         configs.push({
                             config: {
                                 rules: parseResult.config
@@ -1251,16 +1189,14 @@ class SourceCode extends TokenStore {
         const emitter = createEmitter();
         let analyzer = {
             enterNode(node) {
-                steps.push(new TraversalStep({
-                    type: "visit",
+                steps.push(new VisitNodeStep({
                     target: node,
                     phase: 1,
                     args: [node, node.parent]
                 }));
             },
             leaveNode(node) {
-                steps.push(new TraversalStep({
-                    type: "visit",
+                steps.push(new VisitNodeStep({
                     target: node,
                     phase: 2,
                     args: [node, node.parent]
@@ -1283,8 +1219,7 @@ class SourceCode extends TokenStore {
 
             CODE_PATH_EVENTS.forEach(eventName => {
                 emitter.on(eventName, (...args) => {
-                    steps.push(new TraversalStep({
-                        type: "call",
+                    steps.push(new CallMethodStep({
                         target: eventName,
                         args
                     }));