Merge pull request #2526 from johanrd/review/2460

Post-merge review of #2460 (`template-no-curly-component-invocation`)

Author: NullVoxPopuli

lib/rules/template-no-curly-component-invocation.js

@@ -151,7 +151,7 @@ module.exports = {
       };
     }
 
-    // Stack of block-param name arrays, one entry per active GlimmerBlockStatement.
+    // Stack of block-param name arrays, one entry per active GlimmerBlockStatement or GlimmerElementNode.
     const blockParamStack = [];
     let insideAttrNode = false;
 
@@ -323,6 +323,14 @@ module.exports = {
         blockParamStack.pop();
       },
 
+      GlimmerElementNode(node) {
+        blockParamStack.push(node.blockParams ?? []);
+      },
+
+      'GlimmerElementNode:exit'() {
+        blockParamStack.pop();
+      },
+
       GlimmerAttrNode() {
         insideAttrNode = true;
       },

tests/lib/rules/template-no-curly-component-invocation.js

@@ -28,6 +28,9 @@ ruleTester.run('template-no-curly-component-invocation', rule, {
     '<template>{{true}}</template>',
     '<template>{{foo bar}}</template>',
     '<template>{{#each items as |item|}}{{item}}{{/each}}</template>',
+    // ElementNode block params should be recognized as local variables
+    '<template><Foo as |bar|>{{bar}}</Foo></template>',
+    '<template><Foo as |bar|>{{bar.baz}}</Foo></template>',
     '<template>{{#if someProperty}}yay{{/if}}</template>',
     '<template><FooBar /></template>',
     {
@@ -200,6 +203,9 @@ hbsRuleTester.run('template-no-curly-component-invocation', rule, {
     // Built-in helpers / keywords (always valid)
     '{{#each items as |item|}}{{item}}{{/each}}',
     '{{#each items as |item|}}{{item.foo}}{{/each}}',
+    // ElementNode block params should be recognized as local variables
+    '<Foo as |bar|>{{bar}}</Foo>',
+    '<Foo as |bar|>{{bar.baz}}</Foo>',
     '{{42}}',
     '{{true}}',
     '{{undefined}}',