From 050d2bf07c1258db08b0000b869ba81079d6e8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Sun, 12 Apr 2026 07:03:12 +0200
Subject: [PATCH 1/6] fix(template-no-passed-in-event-handlers): align event
 list and ignore config with upstream

- Remove mouseMove, mouseEnter, mouseLeave from event list (not in upstream)
- Use bare names (without @) in ignore config for angle bracket invocations
- Remove unnecessary PascalCase gate on ElementNode visitor
---
 .../template-no-passed-in-event-handlers.js   | 20 +++++---
 .../template-no-passed-in-event-handlers.js   | 47 +++++++++++++------
 2 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/lib/rules/template-no-passed-in-event-handlers.js b/lib/rules/template-no-passed-in-event-handlers.js
index 7904b32a3b..7f65ffa72e 100644
--- a/lib/rules/template-no-passed-in-event-handlers.js
+++ b/lib/rules/template-no-passed-in-event-handlers.js
@@ -12,9 +12,6 @@ const EMBER_EVENTS = new Set([
   'contextMenu',
   'click',
   'doubleClick',
-  'mouseMove',
-  'mouseEnter',
-  'mouseLeave',
   'focusIn',
   'focusOut',
   'submit',
@@ -77,10 +74,19 @@ module.exports = {
 
     return {
       GlimmerElementNode(node) {
-        // Only check component invocations (PascalCase)
-        if (!/^[A-Z]/.test(node.tag)) {
+        // Only check component invocations. In GTS, dashed tags like <my-button>
+        // are HTML (imports can't have dashes); lowercase non-dashed tags are
+        // HTML. Components are PascalCase, @-prefixed args, this.-prefixed
+        // references, or dot-paths (re-exports).
+        const isComponent =
+          /^[A-Z]/.test(node.tag) ||
+          node.tag.startsWith('@') ||
+          node.tag.startsWith('this.') ||
+          node.tag.includes('.');
+        if (!isComponent) {
           return;
         }
+
         // Skip built-in Input/Textarea
         if (node.tag === 'Input' || node.tag === 'Textarea') {
           return;
@@ -98,8 +104,8 @@ module.exports = {
           }
           const argName = attr.name.slice(1);
 
-          // Check ignore config
-          if (ignoredAttrs.includes(attr.name)) {
+          // Check ignore config (use bare name without @)
+          if (ignoredAttrs.includes(argName)) {
             continue;
           }
 
diff --git a/tests/lib/rules/template-no-passed-in-event-handlers.js b/tests/lib/rules/template-no-passed-in-event-handlers.js
index 6db6d73b51..225efdf733 100644
--- a/tests/lib/rules/template-no-passed-in-event-handlers.js
+++ b/tests/lib/rules/template-no-passed-in-event-handlers.js
@@ -35,6 +35,15 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
     '<template><Foo @random={{true}} /></template>',
     '<template><Input @click={{this.handleClick}} /></template>',
     '<template><Textarea @click={{this.handleClick}} /></template>',
+
+    // HTML elements are not checked (in GTS <my-button> is HTML, not a component)
+    '<template><my-button @click={{this.handleClick}} /></template>',
+    '<template><custom-el @submit={{this.handleSubmit}} /></template>',
+
+    // mouseMove/mouseEnter/mouseLeave are NOT in upstream's event list
+    '<template><Foo @mouseMove={{this.handleMove}} /></template>',
+    '<template><Foo @mouseEnter={{this.handleEnter}} /></template>',
+    '<template><Foo @mouseLeave={{this.handleLeave}} /></template>',
     '<template>{{foo}}</template>',
     '<template>{{foo onClick=this.handleClick}}</template>',
     '<template>{{foo onclick=this.handleClick}}</template>',
@@ -48,11 +57,11 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
     // ignore option — angle bracket invocation
     {
       code: '<template><Foo @click={{this.handleClick}} /></template>',
-      options: [{ ignore: { Foo: ['@click'] } }],
+      options: [{ ignore: { Foo: ['click'] } }],
     },
     {
       code: '<template><Foo @click={{this.handleClick}} @submit={{this.handleSubmit}} /></template>',
-      options: [{ ignore: { Foo: ['@click', '@submit'] } }],
+      options: [{ ignore: { Foo: ['click', 'submit'] } }],
     },
 
     // ignore option — curly invocation
@@ -82,25 +91,33 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
       errors: [{ messageId: 'unexpected' }],
     },
     {
-      code: `<template>
-        <CustomButton @mouseEnter={{this.handleHover}} />
-      </template>`,
+      code: '<template><Foo @click={{this.handleClick}} /></template>',
       output: null,
       errors: [{ messageId: 'unexpected' }],
     },
-
     {
-      code: '<template><Foo @click={{this.handleClick}} /></template>',
+      code: '<template><Foo @keyPress={{this.handleClick}} /></template>',
       output: null,
       errors: [{ messageId: 'unexpected' }],
     },
     {
-      code: '<template><Foo @keyPress={{this.handleClick}} /></template>',
+      code: '<template><Foo @submit={{this.handleClick}} /></template>',
       output: null,
       errors: [{ messageId: 'unexpected' }],
     },
+    // Non-PascalCase component forms: this.-prefixed, @-prefixed, dot-path
     {
-      code: '<template><Foo @submit={{this.handleClick}} /></template>',
+      code: '<template><this.MyComponent @click={{this.handleClick}} /></template>',
+      output: null,
+      errors: [{ messageId: 'unexpected' }],
+    },
+    {
+      code: '<template><@someComponent @click={{this.handleClick}} /></template>',
+      output: null,
+      errors: [{ messageId: 'unexpected' }],
+    },
+    {
+      code: '<template><ns.Widget @submit={{this.handleSubmit}} /></template>',
       output: null,
       errors: [{ messageId: 'unexpected' }],
     },
@@ -124,14 +141,14 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
     {
       code: '<template><Bar @click={{this.handleClick}} /></template>',
       output: null,
-      options: [{ ignore: { Foo: ['@click'] } }],
+      options: [{ ignore: { Foo: ['click'] } }],
       errors: [{ messageId: 'unexpected' }],
     },
     // ignore option — only ignores specified attrs (angle bracket)
     {
       code: '<template><Foo @submit={{this.handleSubmit}} /></template>',
       output: null,
-      options: [{ ignore: { Foo: ['@click'] } }],
+      options: [{ ignore: { Foo: ['click'] } }],
       errors: [{ messageId: 'unexpected' }],
     },
     // ignore option — only ignores specified component (curly)
@@ -183,11 +200,11 @@ hbsRuleTester.run('template-no-passed-in-event-handlers', rule, {
     // ignore option — angle bracket invocation
     {
       code: '<Foo @click={{this.handleClick}} />',
-      options: [{ ignore: { Foo: ['@click'] } }],
+      options: [{ ignore: { Foo: ['click'] } }],
     },
     {
       code: '<Foo @click={{this.handleClick}} @submit={{this.handleSubmit}} />',
-      options: [{ ignore: { Foo: ['@click', '@submit'] } }],
+      options: [{ ignore: { Foo: ['click', 'submit'] } }],
     },
 
     // ignore option — curly invocation
@@ -266,14 +283,14 @@ hbsRuleTester.run('template-no-passed-in-event-handlers', rule, {
     {
       code: '<Bar @click={{this.handleClick}} />',
       output: null,
-      options: [{ ignore: { Foo: ['@click'] } }],
+      options: [{ ignore: { Foo: ['click'] } }],
       errors: [{ messageId: 'unexpected' }],
     },
     // ignore option — only ignores specified attrs (angle bracket)
     {
       code: '<Foo @submit={{this.handleSubmit}} />',
       output: null,
-      options: [{ ignore: { Foo: ['@click'] } }],
+      options: [{ ignore: { Foo: ['click'] } }],
       errors: [{ messageId: 'unexpected' }],
     },
     // ignore option — only ignores specified component (curly)

From f81b3a3c42969e3d5e41b228cb0b3f2e0ce22018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Mon, 13 Apr 2026 20:53:28 +0200
Subject: [PATCH 2/6] Document why mouseMove/mouseEnter/mouseLeave are excluded
 from event list

---
 lib/rules/template-no-passed-in-event-handlers.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/rules/template-no-passed-in-event-handlers.js b/lib/rules/template-no-passed-in-event-handlers.js
index 7f65ffa72e..d3903dd40c 100644
--- a/lib/rules/template-no-passed-in-event-handlers.js
+++ b/lib/rules/template-no-passed-in-event-handlers.js
@@ -1,4 +1,8 @@
-// Comprehensive Ember event handler names
+// Ember event handler names that map to Ember's classic event system.
+// Matches upstream ember-template-lint's no-passed-in-event-handlers list exactly.
+// Note: mouseMove, mouseEnter, and mouseLeave are intentionally excluded —
+// upstream does not include them, as they are native DOM events that do not
+// have corresponding Ember classic-event aliases on components.
 const EMBER_EVENTS = new Set([
   'touchStart',
   'touchMove',

From 11c6e204c6914938a0c7320de2faf7781249a074 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Tue, 14 Apr 2026 15:00:26 +0200
Subject: [PATCH 3/6] =?UTF-8?q?chore:=20remove=20'upstream'=20references?=
 =?UTF-8?q?=20=E2=80=94=20describe=20behavior=20directly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/rules/template-no-passed-in-event-handlers.js       | 5 ++---
 tests/lib/rules/template-no-passed-in-event-handlers.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/rules/template-no-passed-in-event-handlers.js b/lib/rules/template-no-passed-in-event-handlers.js
index d3903dd40c..e680690bc2 100644
--- a/lib/rules/template-no-passed-in-event-handlers.js
+++ b/lib/rules/template-no-passed-in-event-handlers.js
@@ -1,8 +1,7 @@
 // Ember event handler names that map to Ember's classic event system.
-// Matches upstream ember-template-lint's no-passed-in-event-handlers list exactly.
 // Note: mouseMove, mouseEnter, and mouseLeave are intentionally excluded —
-// upstream does not include them, as they are native DOM events that do not
-// have corresponding Ember classic-event aliases on components.
+// they are native DOM events that do not have corresponding Ember
+// classic-event aliases on components.
 const EMBER_EVENTS = new Set([
   'touchStart',
   'touchMove',
diff --git a/tests/lib/rules/template-no-passed-in-event-handlers.js b/tests/lib/rules/template-no-passed-in-event-handlers.js
index 225efdf733..5259f71328 100644
--- a/tests/lib/rules/template-no-passed-in-event-handlers.js
+++ b/tests/lib/rules/template-no-passed-in-event-handlers.js
@@ -40,7 +40,7 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
     '<template><my-button @click={{this.handleClick}} /></template>',
     '<template><custom-el @submit={{this.handleSubmit}} /></template>',
 
-    // mouseMove/mouseEnter/mouseLeave are NOT in upstream's event list
+    // mouseMove/mouseEnter/mouseLeave are not Ember classic-event aliases
     '<template><Foo @mouseMove={{this.handleMove}} /></template>',
     '<template><Foo @mouseEnter={{this.handleEnter}} /></template>',
     '<template><Foo @mouseLeave={{this.handleLeave}} /></template>',

From 434be3b65a6d7a0d18e1b4c8d8d60cc76b56b831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Wed, 15 Apr 2026 22:05:51 +0200
Subject: [PATCH 4/6] revert: drop component detection broadening in
 template-no-passed-in-event-handlers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removes the PascalCase-OR-@-OR-this.-OR-dot heuristic and the associated
tests for <this.MyComponent>, <@someComponent>, <ns.Widget>, <my-button>,
<custom-el>. Reverts to master's PascalCase-only gate.

Better addressed by scope analysis once ember-eslint-parser exposes
richer HBS scope — revisit as a separate PR then.

Keeps the ignore-config format fix (argName without @) and the event
list alignment with upstream.
---
 .../template-no-passed-in-event-handlers.js   | 13 ++----------
 .../template-no-passed-in-event-handlers.js   | 20 -------------------
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/lib/rules/template-no-passed-in-event-handlers.js b/lib/rules/template-no-passed-in-event-handlers.js
index e680690bc2..f33e4bacf0 100644
--- a/lib/rules/template-no-passed-in-event-handlers.js
+++ b/lib/rules/template-no-passed-in-event-handlers.js
@@ -77,19 +77,10 @@ module.exports = {
 
     return {
       GlimmerElementNode(node) {
-        // Only check component invocations. In GTS, dashed tags like <my-button>
-        // are HTML (imports can't have dashes); lowercase non-dashed tags are
-        // HTML. Components are PascalCase, @-prefixed args, this.-prefixed
-        // references, or dot-paths (re-exports).
-        const isComponent =
-          /^[A-Z]/.test(node.tag) ||
-          node.tag.startsWith('@') ||
-          node.tag.startsWith('this.') ||
-          node.tag.includes('.');
-        if (!isComponent) {
+        // Only check component invocations (PascalCase)
+        if (!/^[A-Z]/.test(node.tag)) {
           return;
         }
-
         // Skip built-in Input/Textarea
         if (node.tag === 'Input' || node.tag === 'Textarea') {
           return;
diff --git a/tests/lib/rules/template-no-passed-in-event-handlers.js b/tests/lib/rules/template-no-passed-in-event-handlers.js
index 5259f71328..1fbd2f5d99 100644
--- a/tests/lib/rules/template-no-passed-in-event-handlers.js
+++ b/tests/lib/rules/template-no-passed-in-event-handlers.js
@@ -36,10 +36,6 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
     '<template><Input @click={{this.handleClick}} /></template>',
     '<template><Textarea @click={{this.handleClick}} /></template>',
 
-    // HTML elements are not checked (in GTS <my-button> is HTML, not a component)
-    '<template><my-button @click={{this.handleClick}} /></template>',
-    '<template><custom-el @submit={{this.handleSubmit}} /></template>',
-
     // mouseMove/mouseEnter/mouseLeave are not Ember classic-event aliases
     '<template><Foo @mouseMove={{this.handleMove}} /></template>',
     '<template><Foo @mouseEnter={{this.handleEnter}} /></template>',
@@ -105,22 +101,6 @@ ruleTester.run('template-no-passed-in-event-handlers', rule, {
       output: null,
       errors: [{ messageId: 'unexpected' }],
     },
-    // Non-PascalCase component forms: this.-prefixed, @-prefixed, dot-path
-    {
-      code: '<template><this.MyComponent @click={{this.handleClick}} /></template>',
-      output: null,
-      errors: [{ messageId: 'unexpected' }],
-    },
-    {
-      code: '<template><@someComponent @click={{this.handleClick}} /></template>',
-      output: null,
-      errors: [{ messageId: 'unexpected' }],
-    },
-    {
-      code: '<template><ns.Widget @submit={{this.handleSubmit}} /></template>',
-      output: null,
-      errors: [{ messageId: 'unexpected' }],
-    },
     {
       code: '<template>{{foo click=this.handleClick}}</template>',
       output: null,

From 76d23c10ae1d737b6f0e02aaf148ed648af29940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Wed, 15 Apr 2026 22:10:47 +0200
Subject: [PATCH 5/6] chore: drop redundant what-comments

---
 lib/rules/template-no-passed-in-event-handlers.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/rules/template-no-passed-in-event-handlers.js b/lib/rules/template-no-passed-in-event-handlers.js
index f33e4bacf0..1a2034b823 100644
--- a/lib/rules/template-no-passed-in-event-handlers.js
+++ b/lib/rules/template-no-passed-in-event-handlers.js
@@ -1,4 +1,3 @@
-// Ember event handler names that map to Ember's classic event system.
 // Note: mouseMove, mouseEnter, and mouseLeave are intentionally excluded —
 // they are native DOM events that do not have corresponding Ember
 // classic-event aliases on components.
@@ -98,7 +97,6 @@ module.exports = {
           }
           const argName = attr.name.slice(1);
 
-          // Check ignore config (use bare name without @)
           if (ignoredAttrs.includes(argName)) {
             continue;
           }

From 5f0dbe852cd20b17b0056ede7036d8eb057b173f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Wed, 15 Apr 2026 22:13:02 +0200
Subject: [PATCH 6/6] chore: restore 'Comprehensive Ember event handler names'
 comment

---
 lib/rules/template-no-passed-in-event-handlers.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/rules/template-no-passed-in-event-handlers.js b/lib/rules/template-no-passed-in-event-handlers.js
index 1a2034b823..aff8e15c01 100644
--- a/lib/rules/template-no-passed-in-event-handlers.js
+++ b/lib/rules/template-no-passed-in-event-handlers.js
@@ -1,3 +1,4 @@
+// Comprehensive Ember event handler names
 // Note: mouseMove, mouseEnter, and mouseLeave are intentionally excluded —
 // they are native DOM events that do not have corresponding Ember
 // classic-event aliases on components.