Merge pull request #119 from VincentLanglet/fixTernaryParser

Fix ternary parser

Author: VincentLanglet

TwigCS/src/Token/Tokenizer.php

@@ -631,14 +631,21 @@ protected function lexPunctuation(): void
     {
         $currentToken = $this->code[$this->cursor];
 
-        if (':' === $currentToken) {
-            $lastBracket = end($this->bracketsAndTernary);
-            if (false !== $lastBracket && '?' === $lastBracket[0]) {
+        $lastBracket = end($this->bracketsAndTernary);
+        if (false !== $lastBracket && '?' === $lastBracket[0]) {
+            if (':' === $currentToken) {
                 // This is a ternary instead
                 $this->lexOperator($currentToken);
 
                 return;
             }
+            if (false !== strpos(',)]}', $currentToken)) {
+                // Because {{ foo ? 'yes' }} is the same as {{ foo ? 'yes' : '' }}
+                do {
+                    array_pop($this->bracketsAndTernary);
+                    $lastBracket = end($this->bracketsAndTernary);
+                } while ('?' === $lastBracket[0]);
+            }
         }
 
         if (false !== strpos('([{', $currentToken)) {
@@ -649,10 +656,6 @@ protected function lexPunctuation(): void
             }
 
             $bracket = array_pop($this->bracketsAndTernary);
-            if ('?' === $bracket[0]) {
-                // Because {{ foo ? 'yes' }} is the same as {{ foo ? 'yes' : '' }}
-                $bracket = array_pop($this->bracketsAndTernary);
-            }
             if (strtr($bracket[0], '([{', ')]}') !== $currentToken) {
                 throw new Exception(sprintf('Unclosed "%s"', $bracket[0]));
             }

TwigCS/tests/Fixtures/BlankEOFTest.fixed.twig

@@ -144,7 +144,36 @@ public function tokenizeDataProvider(): array
                     46 => Token::WHITESPACE_TYPE,
                     47 => Token::VAR_END_TYPE,
                     48 => Token::EOL_TYPE,
-                    49 => Token::EOF_TYPE,
+                    49 => Token::BLOCK_START_TYPE,
+                    50 => Token::WHITESPACE_TYPE,
+                    51 => Token::BLOCK_TAG_TYPE,
+                    52 => Token::WHITESPACE_TYPE,
+                    53 => Token::NAME_TYPE,
+                    54 => Token::OPERATOR_TYPE,
+                    55 => Token::PUNCTUATION_TYPE,
+                    56 => Token::NAME_TYPE,
+                    57 => Token::PUNCTUATION_TYPE,
+                    58 => Token::WHITESPACE_TYPE,
+                    59 => Token::NAME_TYPE,
+                    60 => Token::WHITESPACE_TYPE,
+                    61 => Token::OPERATOR_TYPE,
+                    62 => Token::WHITESPACE_TYPE,
+                    63 => Token::NAME_TYPE,
+                    64 => Token::WHITESPACE_TYPE,
+                    65 => Token::OPERATOR_TYPE,
+                    66 => Token::WHITESPACE_TYPE,
+                    67 => Token::NUMBER_TYPE,
+                    68 => Token::PUNCTUATION_TYPE,
+                    69 => Token::WHITESPACE_TYPE,
+                    70 => Token::NAME_TYPE,
+                    71 => Token::PUNCTUATION_TYPE,
+                    72 => Token::WHITESPACE_TYPE,
+                    73 => Token::NUMBER_TYPE,
+                    74 => Token::PUNCTUATION_TYPE,
+                    75 => Token::WHITESPACE_TYPE,
+                    76 => Token::BLOCK_END_TYPE,
+                    77 => Token::EOL_TYPE,
+                    78 => Token::EOF_TYPE,
                 ],
             ],
             [

TwigCS/tests/Fixtures/BlankEOFTest.twig

@@ -1,3 +1,4 @@
 {{ 1+2-3*4%5 }}
 {{ bar ? 'string' : "string#" }}
 {{ baz ?: { a:[1, 2] }  }}
+{% set a={foo: bar ? baz ? 1, test: 1} %}