Merge pull request #61 from typed-ember/globals-completion

Author: dfreeman

packages/core/__tests__/language-server/completions.test.ts

@@ -143,6 +143,33 @@ describe('Language Server: Completions', () => {
     expect(details.detail).toEqual('(parameter) letter: string');
   });
 
+  test('globals', () => {
+    let code = stripIndent`
+      import Component, { hbs } from '@glint/environment-glimmerx/component';
+
+      export default class MyComponent extends Component {
+        static template = hbs\`
+          {{deb}}
+        \`;
+      }
+    `;
+
+    project.write('index.ts', code);
+
+    let server = project.startLanguageServer();
+    let completions = server.getCompletions(project.fileURI('index.ts'), {
+      line: 4,
+      character: 9,
+    });
+
+    let completion = completions?.find((completion) => completion.label === 'debugger');
+
+    expect(completion).toMatchObject({
+      kind: CompletionItemKind.Field,
+      label: 'debugger',
+    });
+  });
+
   test('referencing module-scope identifiers', async () => {
     let code = stripIndent`
       import Component, { hbs } from '@glint/environment-glimmerx/component';

packages/transform/__tests__/offset-mapping.test.ts

@@ -142,7 +142,7 @@ describe('Source-to-source offset mapping', () => {
     describe('path segments', () => {
       test('simple path', () => {
         let module = rewriteCompanionTemplate({ contents: '{{foo.bar}}' });
-        expectTokenMapping(module, 'foo', { transformedToken: '"foo"' });
+        expectTokenMapping(module, 'foo');
         expectTokenMapping(module, 'bar');
       });
 
@@ -168,7 +168,7 @@ describe('Source-to-source offset mapping', () => {
 
       test('simple out-of-scope paths', () => {
         let module = rewriteInlineTemplate({ contents: '{{foo.bar}}' });
-        expectTokenMapping(module, 'foo', { transformedToken: '"foo"' });
+        expectTokenMapping(module, 'foo');
         expectTokenMapping(module, 'bar');
       });
 
@@ -263,12 +263,12 @@ describe('Source-to-source offset mapping', () => {
             `,
         });
 
-        expectTokenMapping(module, 'each', { occurrence: 0, transformedToken: '"each"' });
+        expectTokenMapping(module, 'each', { occurrence: 0 });
         expectTokenMapping(module, 'this');
         expectTokenMapping(module, 'items');
         expectTokenMapping(module, 'num', { occurrence: 0 });
         expectTokenMapping(module, 'num', { occurrence: 1 });
-        expectTokenMapping(module, 'each', { occurrence: 1, transformedToken: '"each"' });
+        expectTokenMapping(module, 'each', { occurrence: 1 });
       });
 
       test('angle bracket params', () => {

packages/transform/src/scope-stack.ts

@@ -28,6 +28,20 @@ export default class ScopeStack {
     return this.top.has(identifier);
   }
 
+  public hasMatchingBinding(prefix: string): boolean {
+    if (this.hasBinding(prefix)) {
+      return true;
+    }
+
+    for (let identifier of this.top) {
+      if (identifier.startsWith(prefix)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
   private get top(): Set<string> {
     return this.stack[0];
   }

packages/transform/src/template-to-typescript.ts

@@ -278,12 +278,12 @@ export function templateToTypescript(
     }
 
     function emitIdentifierReference(name: string, hbsOffset: number, hbsLength?: number): void {
-      if (scope.hasBinding(name)) {
+      if (scope.hasMatchingBinding(name)) {
         emit.identifier(name, hbsOffset, hbsLength);
       } else {
-        emit.text('χ.Globals[');
-        emit.identifier(JSON.stringify(name), hbsOffset, hbsLength ?? name.length);
-        emit.text(']');
+        emit.text('χ.Globals["');
+        emit.identifier(JSON.stringify(name).slice(1, -1), hbsOffset, hbsLength ?? name.length);
+        emit.text('"]');
       }
     }