refactor semi-colon stripping (again)

Author: robocoder

scss.inc.php

@@ -20,7 +20,6 @@
     include_once __DIR__ . '/src/Formatter/Expanded.php';
     include_once __DIR__ . '/src/Formatter/Nested.php';
     include_once __DIR__ . '/src/Formatter/OutputBlock.php';
-    include_once __DIR__ . '/src/Formatter/StripSemiColons.php';
     include_once __DIR__ . '/src/Node.php';
     include_once __DIR__ . '/src/Node/Number.php';
     include_once __DIR__ . '/src/Parser.php';

src/Formatter.php

@@ -55,6 +55,11 @@ abstract class Formatter
      */
     public $assignSeparator;
 
+    /**
+     * @var boolea
+     */
+    public $keepSemicolons;
+
     /**
      * Initialize formatter
      *
@@ -96,6 +101,15 @@ public function property($name, $value)
      */
     public function stripSemicolon(&$lines)
     {
+        if ($this->keepSemicolons) {
+            return;
+        }
+
+        if (($count = count($lines))
+            && substr($lines[$count - 1], -1) === ';'
+        ) {
+            $lines[$count - 1] = substr($lines[$count - 1], 0, -1);
+        }
     }
 
     /**

src/Formatter/Compact.php

@@ -32,6 +32,7 @@ public function __construct()
         $this->close = "}\n\n";
         $this->tagSeparator = ',';
         $this->assignSeparator = ':';
+        $this->keepSemicolons = true;
     }
 
     /**

src/Formatter/Compressed.php

@@ -21,7 +21,20 @@
  */
 class Compressed extends Formatter
 {
-    use StripSemiColons;
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        $this->indentLevel = 0;
+        $this->indentChar = '  ';
+        $this->break = '';
+        $this->open = '{';
+        $this->close = '}';
+        $this->tagSeparator = ',';
+        $this->assignSeparator = ':';
+        $this->keepSemicolons = false;
+    }
 
     /**
      * {@inheritdoc}

src/Formatter/Crunched.php

@@ -21,7 +21,20 @@
  */
 class Crunched extends Formatter
 {
-    use StripSemiColons;
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct()
+    {
+        $this->indentLevel = 0;
+        $this->indentChar = '  ';
+        $this->break = '';
+        $this->open = '{';
+        $this->close = '}';
+        $this->tagSeparator = ',';
+        $this->assignSeparator = ':';
+        $this->keepSemicolons = false;
+    }
 
     /**
      * {@inheritdoc}

src/Formatter/Debug.php

@@ -33,6 +33,7 @@ public function __construct()
         $this->close = ' }';
         $this->tagSeparator = ', ';
         $this->assignSeparator = ': ';
+        $this->keepSemicolons = true;
     }
 
     /**

src/Formatter/Expanded.php

@@ -33,6 +33,7 @@ public function __construct()
         $this->close = '}';
         $this->tagSeparator = ', ';
         $this->assignSeparator = ': ';
+        $this->keepSemicolons = true;
     }
 
     /**

src/Formatter/Nested.php

@@ -38,6 +38,7 @@ public function __construct()
         $this->close = ' }';
         $this->tagSeparator = ', ';
         $this->assignSeparator = ': ';
+        $this->keepSemicolons = true;
     }
 
     /**