Merge pull request #427 from ember-tooling/improve-path-detection-inside-blocks

fix: improve path detection inside blocks

Author: lifeart

src/glimmer-utils.ts

@@ -327,7 +327,11 @@ function _findFocusPath(node: ASTv1.BaseNode, position: Position, seen = new Set
     if (containsPosition(range, position)) {
       path.push(node);
     } else {
-      return [];
+      // Special handling for Block nodes whose loc might not encompass all children
+      if (node.type !== 'Block') {
+        return [];
+      }
+      // For Block nodes, continue searching children even if loc doesn't contain position
     }
   }
 

test/glimmer-utils-test.ts

@@ -19,6 +19,20 @@ describe('glimmer-utils', function () {
 
       expect(astPath?.node).toMatchSnapshot();
     });
+    it('support nested ifs', function () {
+      const input = `
+{{#if @hasError}}
+  <Error />
+{{else if this.hasFiles}}
+  <File />
+{{else}}
+  <Empty />
+{{/if}}
+        `;
+      const astPath = ASTPath.toPosition(preprocess(input), toPosition(Position.create(6, 4)));
+
+      expect(astPath?.node.type).toBe('ElementNode');
+    });
   });
   describe('getLocalScope', function () {
     it('works as expected', function () {