handle standalone {{else}}

zordius · Aug 18, 2014 · b6eecd3 · b6eecd3
1 parent 9a23bb0
commit b6eecd3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/lightncandy.php b/src/lightncandy.php
@@ -1456,11 +1456,12 @@ public static function noNamedArguments($token, &$context, $named, $suggest = '!
      * Internal method used by compileToken(). Modify $token when mustache rules matched.
      *
      * @param array<string> $token detected handlebars {{ }} token
+     * @param array<array|string|integer> $vars parsed arguments list
      * @param array<string,array|string|integer> $context current compile context
      *
      * @return string|null Return compiled code segment for the token
      */
-    public static function handleMustacheSpacing(&$token, &$context) {
+    public static function handleMustacheSpacing(&$token, $vars, &$context) {
         // Line change detection
         $lsp = preg_match('/^(.*)(\\r?\\n)([ \\t]*?)$/s', $token[self::POS_LSPACE], $lmatch);
         $rsp = preg_match('/^([ \\t]*?)(\\r?\\n)(.*)$/s', $token[self::POS_RSPACE], $rmatch);
@@ -1479,7 +1480,9 @@ public static function handleMustacheSpacing(&$token, &$context) {
 
         // Do need standalone detection for these tags
         if (!$token[self::POS_OP] || ($token[self::POS_OP] === '&')) {
-            return;
+            if (!$context['flags']['else'] || (isset($vars[0][0]) && ($vars[0][0] !== 'else'))) {
+                return;
+            }
         }
 
         // not standalone because other things in the same line ahead
@@ -1519,7 +1522,7 @@ public static function compileToken(&$token, &$context) {
 
         // Handle Mustache spacing
         if ($context['flags']['mustsp']) {
-            static::handleMustacheSpacing($token, $context);
+            static::handleMustacheSpacing($token, $vars, $context);
         }
 
         // Handle space control.

diff --git a/tests/regressionTest.php b/tests/regressionTest.php
@@ -517,6 +517,13 @@ public function issueProvider()
                 'expected' => "OK\n A\n d\n E\n  ",
             ),
 
+            Array(
+                'template' => "   {{#if foo}}\nYES\n{{else}}\nNO\n{{/if}}\n",
+                'data' => null,
+                'options' => Array('flags' => LightnCandy::FLAG_MUSTACHESP | LightnCandy::FLAG_ELSE),
+                'expected' => "NO\n",
+            ),
+
         );
 
         return array_map(function($i) {