From 24dc52854f3cd5958b2a7505ecdcd8e4fcf6a0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20R=C3=B8ed?= <johanroed@gmail.com>
Date: Fri, 28 Aug 2026 09:42:09 +0200
Subject: [PATCH] Match the template block of a semicolon-less TOC in
 multi-template files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`readGts` picks the template block that lies inside the named
declaration's range, computed on the file with templates blanked. For
`export const X = <template>…</template>` without a trailing semicolon
the blanked initializer leaves the statement ending at `=`, so no block
was ever inside the range and the lookup failed silently; the consumer
fell back to the TypeScript-side result (typically `transparent`).

Accept a block that starts inside the range or follows it across
whitespace only.

Cowritten by Claude
---
 lib/resolver/template-source.ts                     |  7 +++++--
 test/glint-fixtures/toc-expression-no-semicolon.gts | 11 +++++++++++
 test/resolver/template-source.test.ts               |  8 ++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 test/glint-fixtures/toc-expression-no-semicolon.gts

diff --git a/lib/resolver/template-source.ts b/lib/resolver/template-source.ts
index c2cfcbc..e419892 100644
--- a/lib/resolver/template-source.ts
+++ b/lib/resolver/template-source.ts
@@ -279,8 +279,11 @@ function readGts(
   for (const block of templates) {
     if (!block.range) continue;
     const start = block.range.startUtf16Codepoint;
-    const end = block.range.endUtf16Codepoint;
-    if (start >= resolvedRange.start && end <= resolvedRange.end) {
+    if (start < resolvedRange.start) continue;
+    // `const X = <template>` without a semicolon: the blanked initializer
+    // leaves the statement ending at `=`, so the block follows the range
+    // across whitespace only.
+    if (start < resolvedRange.end || /^\s*$/.test(contents.slice(resolvedRange.end, start))) {
       return { content: block.contents, origin: file, kind };
     }
   }
diff --git a/test/glint-fixtures/toc-expression-no-semicolon.gts b/test/glint-fixtures/toc-expression-no-semicolon.gts
new file mode 100644
index 0000000..6663ec3
--- /dev/null
+++ b/test/glint-fixtures/toc-expression-no-semicolon.gts
@@ -0,0 +1,11 @@
+// Two template-only components in expression form without a trailing
+// semicolon. Blanking the templates before the TS parse leaves each
+// `export const X = ` with no initializer, so the statement's range
+// ends before its template block.
+export const Bar = <template>
+  <div class='bar'>{{yield}}</div>
+</template>
+
+export const Baz = <template>
+  <span class='baz'>{{yield}}</span>
+</template>
diff --git a/test/resolver/template-source.test.ts b/test/resolver/template-source.test.ts
index 2cf6b9f..31e60a3 100644
--- a/test/resolver/template-source.test.ts
+++ b/test/resolver/template-source.test.ts
@@ -56,6 +56,14 @@ describe('findTemplateSource', () => {
     expect(result?.content).not.toContain('<div ...attributes');
   });
 
+  test('multi-template file: expression-form TOCs without semicolons resolve by name', () => {
+    const declFile = path.join(FIXTURES, 'toc-expression-no-semicolon.gts');
+    const bar = findTemplateSource({ declFile, componentName: 'Bar', ts });
+    expect(bar?.content).toContain("<div class='bar'>");
+    const baz = findTemplateSource({ declFile, componentName: 'Baz', ts });
+    expect(baz?.content).toContain("<span class='baz'>");
+  });
+
   test('reads .hbs source directly', () => {
     const declFile = path.join(FIXTURES, 'node_modules/classic-card-addon/addon/components/classic-card.hbs');
     const result = findTemplateSource({ declFile, ts });