eslint
diff --git a/‎lib/languages/js/source-code/source-code.js
Copy file name to clipboard
+8-24Lines changed: 8 additions & 24 deletions b/‎lib/languages/js/source-code/source-code.js
Copy file name to clipboard
+8-24Lines changed: 8 additions & 24 deletions
diff --git a/‎lib/linter/code-path-analysis/code-path-analyzer.js
Copy file name to clipboard
+8-9Lines changed: 8 additions & 9 deletions b/‎lib/linter/code-path-analysis/code-path-analyzer.js
Copy file name to clipboard
+8-9Lines changed: 8 additions & 9 deletions
diff --git a/‎lib/linter/linter.js
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎lib/linter/linter.js
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎lib/linter/safe-emitter.js
Copy file name to clipboard
-52Lines changed: 0 additions & 52 deletions b/‎lib/linter/safe-emitter.js
Copy file name to clipboard
-52Lines changed: 0 additions & 52 deletions
@@ -15,7 +15,6 @@ const { isCommentToken } = require("@eslint-community/eslint-utils"),
 	globals = require("../../../../conf/globals"),
 	{ directivesPattern } = require("../../../shared/directives"),
 	CodePathAnalyzer = require("../../../linter/code-path-analysis/code-path-analyzer"),
-	createEmitter = require("../../../linter/safe-emitter"),
 	{
 		ConfigCommentParser,
 		VisitNodeStep,
@@ -40,16 +39,6 @@ const { isCommentToken } = require("@eslint-community/eslint-utils"),
 
 const commentParser = new ConfigCommentParser();
 
-const CODE_PATH_EVENTS = [
-	"onCodePathStart",
-	"onCodePathEnd",
-	"onCodePathSegmentStart",
-	"onCodePathSegmentEnd",
-	"onCodePathSegmentLoop",
-	"onUnreachableCodePathSegmentStart",
-	"onUnreachableCodePathSegmentEnd",
-];
-
 /**
  * Validates that the given AST has the required information.
  * @param {ASTNode} ast The Program node of the AST to check.
@@ -1302,7 +1291,6 @@ class SourceCode extends TokenStore {
 		 * custom parsers to return any AST, we need to ensure that the traversal
 		 * logic works for any AST.
 		 */
-		const emitter = createEmitter();
 		let analyzer = {
 			enterNode(node) {
 				steps.push(
@@ -1322,7 +1310,14 @@ class SourceCode extends TokenStore {
 					}),
 				);
 			},
-			emitter,
+			emit(eventName, args) {
+				steps.push(
+					new CallMethodStep({
+						target: eventName,
+						args,
+					}),
+				);
+			},
 		};
 
 		/*
@@ -1336,17 +1331,6 @@ class SourceCode extends TokenStore {
 		 */
 		if (this.isESTree) {
 			analyzer = new CodePathAnalyzer(analyzer);
-
-			CODE_PATH_EVENTS.forEach(eventName => {
-				emitter.on(eventName, (...args) => {
-					steps.push(
-						new CallMethodStep({
-							target: eventName,
-							args,
-						}),
-					);
-				});
-			});
 		}
 
 		/*
 
@@ -196,7 +196,7 @@ function forwardCurrentToHead(analyzer, node) {
 
 			debug.dump(`${eventName} ${currentSegment.id}`);
 
-			analyzer.emitter.emit(eventName, currentSegment, node);
+			analyzer.emit(eventName, [currentSegment, node]);
 		}
 	}
 
@@ -215,7 +215,7 @@ function forwardCurrentToHead(analyzer, node) {
 
 			debug.dump(`${eventName} ${headSegment.id}`);
 			CodePathSegment.markUsed(headSegment);
-			analyzer.emitter.emit(eventName, headSegment, node);
+			analyzer.emit(eventName, [headSegment, node]);
 		}
 	}
 }
@@ -239,7 +239,7 @@ function leaveFromCurrentSegment(analyzer, node) {
 
 		debug.dump(`${eventName} ${currentSegment.id}`);
 
-		analyzer.emitter.emit(eventName, currentSegment, node);
+		analyzer.emit(eventName, [currentSegment, node]);
 	}
 
 	state.currentSegments = [];
@@ -416,7 +416,7 @@ function processCodePathToEnter(analyzer, node) {
 
 		// Emits onCodePathStart events.
 		debug.dump(`onCodePathStart ${codePath.id}`);
-		analyzer.emitter.emit("onCodePathStart", codePath, node);
+		analyzer.emit("onCodePathStart", [codePath, node]);
 	}
 
 	/*
@@ -681,7 +681,7 @@ function postprocess(analyzer, node) {
 
 		// Emits onCodePathEnd event of this code path.
 		debug.dump(`onCodePathEnd ${codePath.id}`);
-		analyzer.emitter.emit("onCodePathEnd", codePath, node);
+		analyzer.emit("onCodePathEnd", [codePath, node]);
 		debug.dumpDot(codePath);
 
 		codePath = analyzer.codePath = analyzer.codePath.upper;
@@ -747,7 +747,7 @@ class CodePathAnalyzer {
 	 */
 	constructor(eventGenerator) {
 		this.original = eventGenerator;
-		this.emitter = eventGenerator.emitter;
+		this.emit = eventGenerator.emit;
 		this.codePath = null;
 		this.idGenerator = new IdGenerator("s");
 		this.currentNode = null;
@@ -816,12 +816,11 @@ class CodePathAnalyzer {
 			debug.dump(
 				`onCodePathSegmentLoop ${fromSegment.id} -> ${toSegment.id}`,
 			);
-			this.emitter.emit(
-				"onCodePathSegmentLoop",
+			this.emit("onCodePathSegmentLoop", [
 				fromSegment,
 				toSegment,
 				this.currentNode,
-			);
+			]);
 		}
 	}
 }
 
@@ -29,8 +29,8 @@ const path = require("node:path"),
 	{ ConfigCommentParser } = require("@eslint/plugin-kit"),
 	createReportTranslator = require("./report-translator"),
 	Rules = require("./rules"),
-	createEmitter = require("./safe-emitter"),
 	SourceCodeFixer = require("./source-code-fixer"),
+	{ SourceCodeVisitor } = require("./source-code-visitor"),
 	timing = require("./timing"),
 	ruleReplacements = require("../../conf/replacements.json");
 const { FlatConfigArray } = require("../config/flat-config-array");
@@ -1175,7 +1175,7 @@ function runRules(
 	stats,
 	slots,
 ) {
-	const emitter = createEmitter();
+	const visitor = new SourceCodeVisitor();
 
 	/*
 	 * Create a frozen object with the ruleContext properties and methods that are shared by all rules.
@@ -1339,13 +1339,13 @@ function runRules(
 					? timing.time(ruleId, ruleListeners[selector], stats)
 					: ruleListeners[selector];
 
-			emitter.on(selector, addRuleErrorHandler(ruleListener));
+			visitor.add(selector, addRuleErrorHandler(ruleListener));
 		});
 	});
 
 	const traverser = SourceCodeTraverser.getInstance(language);
 
-	traverser.traverseSync(sourceCode, emitter, { steps });
+	traverser.traverseSync(sourceCode, visitor, { steps });
 
 	return lintingProblems;
 }
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ function forwardCurrentToHead(analyzer, node) {`
`196`	`196`
`197`	`197`	debug.dump(`${eventName} ${currentSegment.id}`);
`198`	`198`
`199`		`- analyzer.emitter.emit(eventName, currentSegment, node);`
	`199`	`+ analyzer.emit(eventName, [currentSegment, node]);`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`@@ -215,7 +215,7 @@ function forwardCurrentToHead(analyzer, node) {`
`215`	`215`
`216`	`216`	debug.dump(`${eventName} ${headSegment.id}`);
`217`	`217`	`CodePathSegment.markUsed(headSegment);`
`218`		`- analyzer.emitter.emit(eventName, headSegment, node);`
	`218`	`+ analyzer.emit(eventName, [headSegment, node]);`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`}`
`@@ -239,7 +239,7 @@ function leaveFromCurrentSegment(analyzer, node) {`
`239`	`239`
`240`	`240`	debug.dump(`${eventName} ${currentSegment.id}`);
`241`	`241`
`242`		`- analyzer.emitter.emit(eventName, currentSegment, node);`
	`242`	`+ analyzer.emit(eventName, [currentSegment, node]);`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`state.currentSegments = [];`
`@@ -416,7 +416,7 @@ function processCodePathToEnter(analyzer, node) {`
`416`	`416`
`417`	`417`	`// Emits onCodePathStart events.`
`418`	`418`	debug.dump(`onCodePathStart ${codePath.id}`);
`419`		`- analyzer.emitter.emit("onCodePathStart", codePath, node);`
	`419`	`+ analyzer.emit("onCodePathStart", [codePath, node]);`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`/*`
`@@ -681,7 +681,7 @@ function postprocess(analyzer, node) {`
`681`	`681`
`682`	`682`	`// Emits onCodePathEnd event of this code path.`
`683`	`683`	debug.dump(`onCodePathEnd ${codePath.id}`);
`684`		`- analyzer.emitter.emit("onCodePathEnd", codePath, node);`
	`684`	`+ analyzer.emit("onCodePathEnd", [codePath, node]);`
`685`	`685`	`debug.dumpDot(codePath);`
`686`	`686`
`687`	`687`	`codePath = analyzer.codePath = analyzer.codePath.upper;`
`@@ -747,7 +747,7 @@ class CodePathAnalyzer {`
`747`	`747`	`*/`
`748`	`748`	`constructor(eventGenerator) {`
`749`	`749`	`this.original = eventGenerator;`
`750`		`- this.emitter = eventGenerator.emitter;`
	`750`	`+ this.emit = eventGenerator.emit;`
`751`	`751`	`this.codePath = null;`
`752`	`752`	`this.idGenerator = new IdGenerator("s");`
`753`	`753`	`this.currentNode = null;`
`@@ -816,12 +816,11 @@ class CodePathAnalyzer {`
`816`	`816`	`debug.dump(`
`817`	`817`	`onCodePathSegmentLoop ${fromSegment.id} -> ${toSegment.id}`,
`818`	`818`	`);`
`819`		`- this.emitter.emit(`
`820`		`- "onCodePathSegmentLoop",`
	`819`	`+ this.emit("onCodePathSegmentLoop", [`
`821`	`820`	`fromSegment,`
`822`	`821`	`toSegment,`
`823`	`822`	`this.currentNode,`
`824`		`- );`
	`823`	`+ ]);`
`825`	`824`	`}`
`826`	`825`	`}`
`827`	`826`	`}`