Merge pull request #100 from phug-php/feature/duplication-threshold

Fix duplicate code

split: b009a074f8968e58ff88fb409c6f9bc3ab34a0b7

Author: kylekatarnls

Lexer/Scanner/FilterScanner.php

@@ -7,16 +7,18 @@
 namespace Phug\Lexer\Scanner;
 
 use Phug\Lexer\Analyzer\LineAnalyzer;
+use Phug\Lexer\Scanner\Partial\TrailingOutdentHandlerTrait;
 use Phug\Lexer\ScannerInterface;
 use Phug\Lexer\State;
 use Phug\Lexer\Token\FilterToken;
 use Phug\Lexer\Token\IndentToken;
 use Phug\Lexer\Token\NewLineToken;
-use Phug\Lexer\Token\OutdentToken;
 use Phug\Lexer\Token\TextToken;
 
 class FilterScanner implements ScannerInterface
 {
+    use TrailingOutdentHandlerTrait;
+
     public function scan(State $state)
     {
         $reader = $state->getReader();
@@ -66,14 +68,8 @@ public function scan(State $state)
             $token->getSourceLocation()->setOffsetLength(1); //Let it have at least 1 length for debugging
             yield $token;
 
-            if ($reader->hasLength()) {
-                yield $state->createToken(NewLineToken::class);
-
-                $state->setLevel($analyzer->getNewLevel())->indent($analyzer->getLevel() + 1);
-
-                while ($state->nextOutdent() !== false) {
-                    yield $state->createToken(OutdentToken::class);
-                }
+            foreach ($this->yieldTrailingOutdent($analyzer, $state) as $token) {
+                yield $token;
             }
         }
     }

Lexer/Scanner/MultilineScanner.php

@@ -7,19 +7,21 @@
 namespace Phug\Lexer\Scanner;
 
 use Phug\Lexer\Analyzer\LineAnalyzer;
+use Phug\Lexer\Scanner\Partial\TrailingOutdentHandlerTrait;
 use Phug\Lexer\ScannerInterface;
 use Phug\Lexer\State;
 use Phug\Lexer\Token\IndentToken;
 use Phug\Lexer\Token\InterpolationEndToken;
 use Phug\Lexer\Token\InterpolationStartToken;
 use Phug\Lexer\Token\NewLineToken;
-use Phug\Lexer\Token\OutdentToken;
 use Phug\Lexer\Token\TagInterpolationEndToken;
 use Phug\Lexer\Token\TagInterpolationStartToken;
 use Phug\Lexer\Token\TextToken;
 
 class MultilineScanner implements ScannerInterface
 {
+    use TrailingOutdentHandlerTrait;
+
     protected function unEscapedToken(State $state, $buffer)
     {
         /** @var TextToken $token */
@@ -83,8 +85,6 @@ protected function getUnescapedLines(State $state, $lines)
 
     private function yieldLines(State $state, array $lines, LineAnalyzer $analyzer)
     {
-        $reader = $state->getReader();
-
         yield $state->createToken(IndentToken::class);
 
         $maxIndent = $analyzer->getMaxIndent();
@@ -101,14 +101,8 @@ private function yieldLines(State $state, array $lines, LineAnalyzer $analyzer)
             yield $token;
         }
 
-        if ($reader->hasLength()) {
-            yield $state->createToken(NewLineToken::class);
-
-            $state->setLevel($analyzer->getNewLevel())->indent($analyzer->getLevel() + 1);
-
-            while ($state->nextOutdent() !== false) {
-                yield $state->createToken(OutdentToken::class);
-            }
+        foreach ($this->yieldTrailingOutdent($analyzer, $state) as $token) {
+            yield $token;
         }
     }
 

Lexer/Scanner/Partial/TrailingOutdentHandlerTrait.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Phug\Lexer\Scanner\Partial;
+
+use Phug\Lexer\Analyzer\LineAnalyzer;
+use Phug\Lexer\State;
+use Phug\Lexer\Token\NewLineToken;
+use Phug\Lexer\Token\OutdentToken;
+
+trait TrailingOutdentHandlerTrait
+{
+    private function yieldTrailingOutdent(LineAnalyzer $analyzer, State $state)
+    {
+        $reader = $state->getReader();
+
+        if ($reader->hasLength()) {
+            yield $state->createToken(NewLineToken::class);
+
+            $state->setLevel($analyzer->getNewLevel())->indent($analyzer->getLevel() + 1);
+
+            while ($state->nextOutdent() !== false) {
+                yield $state->createToken(OutdentToken::class);
+            }
+        }
+    }
+}