From 99f18d0224d29490fb70dd67bf385d1052143017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Wed, 21 Oct 2026 19:35:50 +0200
Subject: [PATCH 1/2] Update ember-estree to 0.9

---
 package.json             |  2 +-
 pnpm-lock.yaml           | 10 +++++-----
 src/parser/transforms.js | 10 ++++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index f7a95a2..b969537 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "@glimmer/syntax": ">= 0.95.0",
     "@typescript-eslint/tsconfig-utils": "^8.57.1",
     "content-tag": "^4.1.1",
-    "ember-estree": "^0.6.10",
+    "ember-estree": "^0.9.0",
     "eslint-scope": "^9.1.2",
     "html-tags": "^5.1.0",
     "mathml-tag-names": "^4.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 148f077..4ba55c7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,8 +21,8 @@ importers:
         specifier: ^4.1.1
         version: 4.1.1
       ember-estree:
-        specifier: ^0.6.10
-        version: 0.6.10
+        specifier: ^0.9.0
+        version: 0.9.0
       eslint-scope:
         specifier: ^9.1.2
         version: 9.1.2
@@ -3063,8 +3063,8 @@ packages:
     resolution: {integrity: sha512-BtkjulweiXo9c3yVWrtexw2dTmBrvavD/xixNC6TKOBdrixUwU+6nuOO9dufDWsMxoid7MvtmDpzc9+mE8PdaA==}
     engines: {node: 10.* || >= 12.*}
 
-  ember-estree@0.6.10:
-    resolution: {integrity: sha512-5nItZGzvxHgoCdASQbn9qBzF4sdjSggUeZpXdihAanmYWm6XkObT/TlUvakYtoKret1/8gm0jNLwNPqZYwHtCw==}
+  ember-estree@0.9.0:
+    resolution: {integrity: sha512-CExL0d6FbbffZaQkD0+zA5PaIgle3fbpzapuLVQ+QZfI2KLalnhuof0e85Zvfy/fh8+q9liw7dqUhQX4gibMBA==}
 
   ember-rfc176-data@0.3.18:
     resolution: {integrity: sha512-JtuLoYGSjay1W3MQAxt3eINWXNYYQliK90tLwtb8aeCuQK8zKGCRbBodVIrkcTqshULMnRuTOS6t1P7oQk3g6Q==}
@@ -9587,7 +9587,7 @@ snapshots:
       - '@babel/core'
       - supports-color
 
-  ember-estree@0.6.10:
+  ember-estree@0.9.0:
     dependencies:
       '@glimmer/env': 0.1.7
       '@glimmer/syntax': 0.95.0
diff --git a/src/parser/transforms.js b/src/parser/transforms.js
index e6815f2..3971066 100644
--- a/src/parser/transforms.js
+++ b/src/parser/transforms.js
@@ -371,7 +371,7 @@ function createError(code, message, fileName, start, end = start) {
 
 /**
  * Transform code for TypeScript virtual file system.
- * Replaces <template> regions with backtick/static-block placeholders.
+ * Replaces <template> regions with void-backtick/static-block placeholders.
  * Used by ts-patch.js for type-aware linting.
  */
 export function transformForLint(code, fileName) {
@@ -392,7 +392,9 @@ export function transformForLint(code, fileName) {
   // Build placeholder JS inline (same format as ember-estree's toPlaceholderJS)
   let jsCode = code;
   for (const tplInfo of [...result].reverse()) {
-    const content = maskTemplateContentForLint(tplInfo.contents);
+    const content = maskTemplateContentForLint(
+      code.slice(tplInfo.contentRange.startUtf16Codepoint, tplInfo.contentRange.endUtf16Codepoint)
+    );
     const start = tplInfo.range.startUtf16Codepoint;
     const end = tplInfo.range.endUtf16Codepoint;
     const tplLength = end - start;
@@ -401,8 +403,8 @@ export function transformForLint(code, fileName) {
       const spaces = tplLength - content.length - 10; // "static{`" + "`}" = 10
       replacement = `static{\`${content}${' '.repeat(Math.max(0, spaces))}\`}`;
     } else {
-      const spaces = tplLength - content.length - 2; // "`" + "`" = 2
-      replacement = `\`${content}${' '.repeat(Math.max(0, spaces))}\``;
+      const spaces = tplLength - content.length - 7; // "void `" + "`" = 7
+      replacement = `void \`${content}${' '.repeat(Math.max(0, spaces))}\``;
     }
     jsCode = replaceRange(jsCode, start, end, replacement);
   }

From 0abe1acad8216ce5491cd1962f59c5cdeff89635 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Wed, 21 Oct 2026 14:49:54 -0400
Subject: [PATCH 2/2] Run eslint-plugin-ember tests from the ember-estree-0.9
 fork branch

The branch builds on update-blockparam-nodetype and updates two
template-vars tests for ember-estree 0.9.

- Two top-level templates no longer give a `semi` error. The old
  placeholders joined them into one tagged template.
- `export default <template>` now gets a `semi` error, because the tree
  keeps the ExportDefaultDeclaration. The test adds the `;`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 scripts/eslint-plugin-ember-test.mjs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/eslint-plugin-ember-test.mjs b/scripts/eslint-plugin-ember-test.mjs
index 9916fb4..0f36f76 100644
--- a/scripts/eslint-plugin-ember-test.mjs
+++ b/scripts/eslint-plugin-ember-test.mjs
@@ -2,10 +2,11 @@ import { execaCommand } from 'execa';
 import fse from 'fs-extra';
 
 // Use the fork branch that has the GlimmerBlockParam nodeType fix
+// and the test expectations for ember-estree 0.9
 // until https://github.com/ember-cli/eslint-plugin-ember/pull/2577 merges,
 // then switch back to ember-cli/eslint-plugin-ember.
 const REPO = `https://github.com/NullVoxPopuli-ai-agent/eslint-plugin-ember.git`;
-const BRANCH = 'update-blockparam-nodetype';
+const BRANCH = 'ember-estree-0.9';
 const FOLDERS = {
   here: process.cwd(),
   testRoot: '/tmp/eslint-plugin-ember-test/',