✨ Group multiple Tab or multiple Whitespace in one token

Author: VincentLanglet

TwigCS/Sniff/Standard/DelimiterSpacingSniff.php

@@ -48,17 +48,17 @@ public function process(Token $token, $tokenPosition, $tokens)
      */
     public function processStart(Token $token, $tokenPosition, $tokens)
     {
-        $offset = 1;
-        while ($this->isTokenMatching($tokens[$tokenPosition + $offset], Token::WHITESPACE_TYPE)) {
-            ++$offset;
-        }
-
         // Ignore new line
-        if ($this->isTokenMatching($tokens[$tokenPosition + $offset], Token::EOL_TYPE)) {
+        if ($this->isTokenMatching($tokens[$tokenPosition + 1], Token::EOL_TYPE)) {
             return;
         }
 
-        $count = $offset - 1;
+        if ($this->isTokenMatching($tokens[$tokenPosition + 1], Token::WHITESPACE_TYPE)) {
+            $count = strlen($tokens[$tokenPosition + 1]->getValue());
+        } else {
+            $count = 0;
+        }
+
         if (1 !== $count) {
             $this->addMessage(
                 $this::MESSAGE_TYPE_ERROR,
@@ -77,17 +77,17 @@ public function processStart(Token $token, $tokenPosition, $tokens)
      */
     public function processEnd(Token $token, $tokenPosition, $tokens)
     {
-        $offset = 1;
-        while ($this->isTokenMatching($tokens[$tokenPosition - $offset], Token::WHITESPACE_TYPE)) {
-            ++$offset;
-        }
-
         // Ignore new line
-        if ($this->isTokenMatching($tokens[$tokenPosition - $offset], Token::EOL_TYPE)) {
+        if ($this->isTokenMatching($tokens[$tokenPosition - 1], Token::EOL_TYPE)) {
             return;
         }
 
-        $count = $offset - 1;
+        if ($this->isTokenMatching($tokens[$tokenPosition - 1], Token::WHITESPACE_TYPE)) {
+            $count = strlen($tokens[$tokenPosition - 1]->getValue());
+        } else {
+            $count = 0;
+        }
+
         if (1 !== $count) {
             $this->addMessage(
                 $this::MESSAGE_TYPE_ERROR,

TwigCS/Token/Tokenizer.php

@@ -435,14 +435,30 @@ protected function lexStart()
 
     protected function lexTab()
     {
-        $this->pushToken(Token::TAB_TYPE);
-        $this->moveCursor($this->code[$this->cursor]);
+        $currentToken = $this->code[$this->cursor];
+        $whitespace = '';
+
+        while (preg_match('/\t/', $currentToken)) {
+            $whitespace .= $currentToken;
+            $this->moveCursor($currentToken);
+            $currentToken = $this->code[$this->cursor];
+        }
+
+        $this->pushToken(Token::TAB_TYPE, $whitespace);
     }
 
     protected function lexWhitespace()
     {
-        $this->pushToken(Token::WHITESPACE_TYPE, $this->code[$this->cursor]);
-        $this->moveCursor($this->code[$this->cursor]);
+        $currentToken = $this->code[$this->cursor];
+        $whitespace = '';
+
+        while (' ' === $currentToken) {
+            $whitespace .= $currentToken;
+            $this->moveCursor($currentToken);
+            $currentToken = $this->code[$this->cursor];
+        }
+
+        $this->pushToken(Token::WHITESPACE_TYPE, $whitespace);
     }
 
     protected function lexEOL()