Merge pull request #69 from VincentLanglet/fixDelimiterSpacing

🐛 Fix

Author: VincentLanglet

TwigCS/Ruleset/Generic/DelimiterSpacingSniff.php

@@ -51,7 +51,8 @@ public function processStart(int $tokenPosition, array $tokens)
         $token = $tokens[$tokenPosition];
 
         // Ignore new line
-        if ($this->isTokenMatching($tokens[$tokenPosition + 1], Token::EOL_TYPE)) {
+        $next = $this->findNext(Token::WHITESPACE_TYPE, $tokens, $tokenPosition + 1, true);
+        if ($this->isTokenMatching($tokens[$next], Token::EOL_TYPE)) {
             return;
         }
 
@@ -89,7 +90,8 @@ public function processEnd(int $tokenPosition, array $tokens)
         $token = $tokens[$tokenPosition];
 
         // Ignore new line
-        if ($this->isTokenMatching($tokens[$tokenPosition - 1], Token::EOL_TYPE)) {
+        $previous = $this->findPrevious(Token::WHITESPACE_TYPE, $tokens, $tokenPosition - 1, true);
+        if ($this->isTokenMatching($tokens[$previous], Token::EOL_TYPE)) {
             return;
         }
 

TwigCS/Sniff/AbstractSniff.php

@@ -61,6 +61,44 @@ public function isTokenMatching(Token $token, int $type, string $value = null)
         return $token->getType() === $type && (null === $value || $token->getValue() === $value);
     }
 
+    /**
+     * @param int   $type
+     * @param array $tokens
+     * @param int   $start
+     * @param bool  $exclude
+     *
+     * @return int
+     */
+    public function findNext(int $type, array $tokens, int $start, bool $exclude = false)
+    {
+        $i = 0;
+
+        while (isset($tokens[$start + $i]) && $exclude === $this->isTokenMatching($tokens[$start + $i], $type)) {
+            $i++;
+        }
+
+        return $start + $i;
+    }
+
+    /**
+     * @param int   $type
+     * @param array $tokens
+     * @param int   $start
+     * @param bool  $exclude
+     *
+     * @return int
+     */
+    public function findPrevious(int $type, array $tokens, int $start, bool $exclude = false)
+    {
+        $i = 0;
+
+        while (isset($tokens[$start - $i]) && $exclude === $this->isTokenMatching($tokens[$start - $i], $type)) {
+            $i++;
+        }
+
+        return $start - $i;
+    }
+
     /**
      * Adds a violation to the current report for the given token.
      *

TwigCS/Tests/Fixtures/DelimiterSpacingTest.fixed.twig

@@ -12,3 +12,9 @@
 {%- if foo -%}{%- endif -%}
 
 {{ foo({'bar': {'baz': 'shouldNotCareAboutDoubleHashes'}}) }}
+
+<div>
+    {{
+        shouldNotCareAboutNewLine
+    }}
+</div>

TwigCS/Tests/Fixtures/DelimiterSpacingTest.twig

@@ -12,3 +12,9 @@
 {%-if foo  -%}{%-  endif-%}
 
 {{ foo({'bar': {'baz': 'shouldNotCareAboutDoubleHashes'}}) }}
+
+<div>
+    {{
+        shouldNotCareAboutNewLine
+    }}
+</div>