Expressions in attributes (#6)

Improve code coverage, cleanup dead code
pug-php · Jun 25, 2016 · 392261f · 392261f
1 parent 7663210
commit 392261f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/src/Jade/Compiler/CodeHandler.php b/src/Jade/Compiler/CodeHandler.php
@@ -97,7 +97,9 @@ protected function parseBetweenSeparators()
             return substr(
                 $input,
                 $offset,
-                isset($end) ? $end[1] - $offset : strlen($input)
+                isset($end)
+                    ? $end[1] - $offset
+                    : strlen($input)
             );
         };
 

diff --git a/src/Jade/Compiler/CommonUtils.php b/src/Jade/Compiler/CommonUtils.php
@@ -23,7 +23,11 @@ public static function addDollarIfNeeded($call)
         if ($call === 'undefined') {
             return 'null';
         }
-        if ($call[0] !== '$' && $call[0] !== '\\' && !preg_match('#^(?:' . CompilerConfig::VARNAME . '\\s*\\(|(?:null|false|true)(?![a-z]))#i', $call)) {
+        if (
+            !in_array(substr($call, 0, 1), array('$', '\\')) &&
+            !preg_match('#^(?:' . CompilerConfig::VARNAME . '\\s*\\(|(?:null|false|true)(?![a-z]))#i', $call) &&
+            preg_match('#^' . CompilerConfig::VARNAME . '#', $call)
+        ) {
             $call = '$' . $call;
         }
 

diff --git a/src/Jade/Compiler/Visitor.php b/src/Jade/Compiler/Visitor.php
@@ -3,7 +3,6 @@
 namespace Jade\Compiler;
 
 use Jade\Nodes\Block;
-use Jade\Nodes\BlockComment;
 use Jade\Nodes\CaseNode;
 use Jade\Nodes\Comment;
 use Jade\Nodes\Doctype;
@@ -185,24 +184,6 @@ protected function visitComment(Comment $comment)
         }
     }
 
-    /**
-     * @param Nodes\BlockComment $comment
-     */
-    protected function visitBlockComment(BlockComment $comment)
-    {
-        if (!$comment->buffer) {
-            return;
-        }
-
-        list($open, $close) = strlen($comment->value) && 0 === strpos(trim($comment->value), 'if')
-            ? array('[' . trim($comment->value) . ']>', '<![endif]')
-            : array($comment->value, '');
-
-        $this->buffer('<!--' . $open);
-        $this->visit($comment->block);
-        $this->buffer($close . '-->');
-    }
-
     /**
      * @param $node
      */

diff --git a/tests/templates/attrs.expressions.html b/tests/templates/attrs.expressions.html
@@ -1 +1,4 @@
 <p answear="42"></p>
+<p answear="42"></p>
+<p answear="bar"></p>
+<p answear="bar"></p>
diff --git a/tests/templates/attrs.expressions.jade b/tests/templates/attrs.expressions.jade
@@ -7,3 +7,6 @@
     $ob = (object) array('foo' => array());
     $ob->foo['bar'] = new FooClass();
 p(answear=ob->foo["bar"]->met())
+p(answear=(ob->foo["bar"]->met()))
+p(answear=substr("foobar", strlen("foo")))
+p(answear=substr("foobar", strlen(strtoupper("F") . "oo")))