Moving newline trimming into the regexp used to match end of tags.

diff --git a/lib/Twig/Lexer.php b/lib/Twig/Lexer.php
index 0664e8d..8df2324 100644 (file)
--- a/lib/Twig/Lexer.php
+++ b/lib/Twig/Lexer.php
@@ -179,16 +179,10 @@ class Twig_Lexer implements Twig_LexerInterface
         $trimTag = preg_quote($this->options['whitespace_trim'] . $this->options['tag_block'][1], '/');
         $endTag = preg_quote($this->options['tag_block'][1], '/');
 
-        if (empty($this->brackets) && preg_match('/\s*' . $trimTag . '\h*|\s*' . $endTag . '/A', $this->code, $match, null, $this->cursor)) {
+        if (empty($this->brackets) && preg_match('/\s*(' . $trimTag . '\h*|\s*' . $endTag . ')\n?/A', $this->code, $match, null, $this->cursor)) {
             $this->pushToken(Twig_Token::BLOCK_END_TYPE);
             $this->moveCursor($match[0]);
             $this->state = self::STATE_DATA;
-
-            // mimics the behavior of PHP by removing the newline that follows instructions if present
-            if ("\n" === substr($this->code, $this->cursor, 1)) {
-                ++$this->cursor;
-                ++$this->lineno;
-            }
         }
         else {
             $this->lexExpression();