Test whitespace fixes

Author: theodorejb

composer.json

@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": ">=8.2",
-        "devtheorem/php-handlebars-parser": "^2.0"
+        "devtheorem/php-handlebars-parser": "dev-fix-chained-else-if-whitespace"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.95",

composer.lock

@@ -1,5 +1,5 @@
-Compiled 1000 times  |  3.08 ms/compile  |    24.0 KB code    |  1.8 MB peak
-Executed 1000 times  |  1.39 ms/render   |   139.9 KB output  |  1.9 MB peak
+Compiled 1000 times  |  3.14 ms/compile  |    24.0 KB code    |  1.8 MB peak
+Executed 1000 times  |  1.37 ms/render   |   139.9 KB output  |  1.9 MB peak
 <?php
 use DevTheorem\Handlebars\Runtime as LR;
 return function (mixed $in = null, array $options = []) {

php_handlebars_template.php

@@ -1457,6 +1457,28 @@ public static function whitespaceProvider(): array
                 'expected' => "NO\n",
             ],
 
+            'GH-1716: should strip trailing indent from chained else if blocks' => [
+                'template' => "{{#if a}}\n {{#if a.b}}\n no\n {{else if a.b}}\n no\n {{else}}\n yes\n {{/if}}\n after\n{{/if}}",
+                'data' => ['a' => ['c' => true]],
+                'expected' => " yes\n after\n",
+            ],
+
+            'GH-2031: whitespace control in one else if branch should not affect another branch' => [
+                'template' => "{{#if a}}\na\n{{else if b}}\nb\n{{else if c}}\nc\n{{~else if d}}\nd\n{{else if e}}\ne\n{{else if f}}\nf{{/if}}",
+                'data' => ['c' => 1],
+                'expected' => 'c',
+            ],
+            'GH-2031: whitespace control in one else if branch should not affect another branch (2)' => [
+                'template' => "{{#if a}}\na\n{{else if b}}\nb\n{{else if c}}\nc\n{{~else if d}}\nd\n{{else if e}}\ne\n{{else if f}}\nf{{/if}}",
+                'data' => ['d' => 1],
+                'expected' => "d\n",
+            ],
+            'GH-2031: whitespace control in one else if branch should not affect another branch (3)' => [
+                'template' => "{{#if a}}\na\n{{else if b}}\nb\n{{else if c}}\nc\n{{~else if d}}\nd\n{{else if e}}\ne\n{{else if f}}\nf{{/if}}",
+                'data' => ['e' => 1],
+                'expected' => "e\n",
+            ],
+
             'each with leading whitespace' => [
                 'template' => "  {{#each foo}}\n{{@key}}: {{.}}\n{{/each}}\nDONE",
                 'data' => ['foo' => ['a' => 'A', 'b' => 'BOY!']],

tests/RegressionTest.php

@@ -92,7 +92,7 @@
                                         <a href="{{replace linkTemplate "{id}" item.id}}">{{lookup item key}}</a>
                                     {{else}}
                                         {{lookup item key}}
-{{!--- avoid extra whitespace! ---}}{{/if}}
+                                    {{/if}}
                                 </td>
                             {{/each}}
                             {{#if ../showActions}}