Runtime: Adds support for multiple interpolations in tag method names (…

…#5800)
statamic · Apr 11, 2022 · 067fcaf · 067fcaf
1 parent f4cdf20
commit 067fcaf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/View/Antlers/Language/Runtime/NodeProcessor.php b/src/View/Antlers/Language/Runtime/NodeProcessor.php
@@ -1279,14 +1279,15 @@ public function reduce($processNodes)
                         $tagName = $node->name->getCompoundTagName();
                         $tagMethod = $node->name->getMethodName();
 
-                        if (array_key_exists($tagMethod, $node->processedInterpolationRegions)) {
-                            if (! empty($node->processedInterpolationRegions)) {
-                                foreach ($node->processedInterpolationRegions as $region => $regionNodes) {
-                                    $this->canHandleInterpolations[$region] = $regionNodes;
+                        if (! empty($node->processedInterpolationRegions)) {
+                            foreach ($node->processedInterpolationRegions as $region => $regionNodes) {
+                                $this->canHandleInterpolations[$region] = $regionNodes;
+
+                                if (Str::contains($tagMethod, $region)) {
+                                    $tagMethod = str_replace($region, $this->evaluateDeferredInterpolation($region), $tagMethod);
                                 }
                             }
 
-                            $tagMethod = $this->evaluateDeferredInterpolation($tagMethod);
                             $tagName = $node->name->name.':'.$tagMethod;
                         }
 

diff --git a/tests/Antlers/Runtime/ParametersTest.php b/tests/Antlers/Runtime/ParametersTest.php
@@ -127,6 +127,14 @@ public function test_interpolations_can_be_used_as_part_of_a_tag_method()
         $this->assertSame('hello_world', $this->renderString($template, [
             'var_name' => 'hello_world',
         ], true));
+
+        $template = <<<'EOT'
+{{ echo_method:components/{var_name}/{{ var_name}}/{2+5+10}/more/{var_name|upper} }}
+EOT;
+
+        $this->assertSame('components/button/button/17/more/BUTTON', $this->renderString($template, [
+            'var_name' => 'button',
+        ], true));
     }
 
     public function test_array_syntax_modifiers_work_on_multi_part_variable_paths()