From df07dde450669bc04081a7afb3ee68b8429c37fd Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 14 Mar 2017 07:04:41 -0400
Subject: [PATCH 001/254] Fix travis ci tests?

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 25e06b3e..df8c6adc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,10 @@ php:
   - 5.6
   - 7.0
   - 7.1
-# - nightly
+  - nightly
 
 script:
-  - phpunit tests
+  - vendor/bin/phpunit tests
 
 branches:
   only:

From 2b7ed3384a66ac5a69846c3d2e0eb204fb6cef34 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 14 Mar 2017 07:10:22 -0400
Subject: [PATCH 002/254] Travis: run composer install

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index df8c6adc..e0e9a57f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ php:
   - nightly
 
 script:
+  - composer install
   - vendor/bin/phpunit tests
 
 branches:

From 3814a55a4efe56ac33eb586b97845a8e88093225 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 14 Mar 2017 08:28:16 -0400
Subject: [PATCH 003/254] fixes #505 - remove .phar build

---
 .gitignore    |  2 +-
 Makefile      |  3 ---
 box.json.dist | 12 ------------
 composer.json |  4 +---
 4 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 box.json.dist

diff --git a/.gitignore b/.gitignore
index dbff826d..be6e5ecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 .sass-cache
+scss_cache
 composer.lock
-pscss.phar
 /*.css
 /*.scss
 /_site/
diff --git a/Makefile b/Makefile
index b42e4a2b..5115941c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,3 @@ compat:
 
 standard:
 	vendor/bin/phpcs --standard=PSR2 bin src tests *.php
-
-phar:
-	php -dphar.readonly=0 vendor/bin/box build -v
diff --git a/box.json.dist b/box.json.dist
deleted file mode 100644
index 63d13baf..00000000
--- a/box.json.dist
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "chmod": "0755",
-    "files": [
-        "LICENSE.md",
-        "scss.inc.php"
-    ],
-    "directories": ["src"],
-    "main": "bin/pscss",
-    "output": "pscss.phar",
-    "compactors": "Herrera\\Box\\Compactor\\Php",
-    "stub": true
-}
diff --git a/composer.json b/composer.json
index 112a6bde..95118a32 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,7 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.5",
-        "phpunit/phpunit": "~3.7",
-        "kherge/box": "~2.5"
+        "phpunit/phpunit": "~4.6"
     },
     "bin": ["bin/pscss"],
     "archive": {
@@ -35,7 +34,6 @@
             "/.gitattributes",
             "/.gitignore",
             "/.travis.yml",
-            "/box.json.dist",
             "/phpunit.xml.dist",
             "/tests"
         ]

From b6f1ea6baac258aacc3e44cd48df9b4b0dd95ef2 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 14 Mar 2017 09:04:34 -0400
Subject: [PATCH 004/254] Move Server class to example/ folder

---
 {src => example}/Server.php | 4 ++--
 scss.inc.php                | 1 -
 tests/ServerTest.php        | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename {src => example}/Server.php (98%)

diff --git a/src/Server.php b/example/Server.php
similarity index 98%
rename from src/Server.php
rename to example/Server.php
index c3fa985d..8dc3c7b2 100644
--- a/src/Server.php
+++ b/example/Server.php
@@ -434,7 +434,7 @@ public function __construct($dir, $cacheDir = null, $scss = null)
         $this->cacheDir = $cacheDir;
 
         if (! is_dir($this->cacheDir)) {
-            mkdir($this->cacheDir, 0755, true);
+            throw new ServerException('Cache directory doesn\'t exist: ' . $cacheDir);
         }
 
         if (! isset($scss)) {
@@ -446,7 +446,7 @@ public function __construct($dir, $cacheDir = null, $scss = null)
         $this->showErrorsAsCSS = false;
 
         if (! ini_get('date.timezone')) {
-            date_default_timezone_set('UTC');
+            throw new ServerException('Default date.timezone not set');
         }
     }
 }
diff --git a/scss.inc.php b/scss.inc.php
index b6892fec..d2ec2639 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -26,5 +26,4 @@
     include_once __DIR__ . '/src/Type.php';
     include_once __DIR__ . '/src/Util.php';
     include_once __DIR__ . '/src/Version.php';
-    include_once __DIR__ . '/src/Server.php';
 }
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index 2cecdd97..7c7ef6a9 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -8,9 +8,10 @@
  *
  * @link http://leafo.github.io/scssphp
  */
-
 namespace Leafo\ScssPhp\Tests;
 
+require_once __DIR__ . '/../example/Server.php';
+
 use Leafo\ScssPhp\Server;
 
 /**

From 53e86eae35448fbcce8f682ffcb9fa224cd40cc3 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 14 Mar 2017 10:58:24 -0400
Subject: [PATCH 005/254] Fix failing ServerTest

---
 tests/ServerTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index 7c7ef6a9..fcaea917 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -23,6 +23,10 @@ class ServerTest extends \PHPUnit_Framework_TestCase
 {
     public function testCheckedCachedCompile()
     {
+        if (! file_exists(__DIR__ . '/inputs/scss_cache')) {
+            mkdir(__DIR__ . '/inputs/scss_cache', 0755);
+        }
+
         $server = new Server(__DIR__ . '/inputs/');
         $css = $server->checkedCachedCompile(__DIR__ . '/inputs/import.scss', '/tmp/scss.css');
 

From 942c61055d53a893f79a7d34261d609b618a1ced Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 22 Aug 2017 07:20:58 -0400
Subject: [PATCH 006/254] Update scss.inc.php

---
 scss.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scss.inc.php b/scss.inc.php
index d2ec2639..83d23a6b 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -3,7 +3,7 @@
     throw new \Exception('scssphp requires PHP 5.4 or above');
 }
 
-if (! class_exists('scssc', false)) {
+if (! class_exists('Leafo\ScssPhp\Version', false)) {
     include_once __DIR__ . '/src/Base/Range.php';
     include_once __DIR__ . '/src/Block.php';
     include_once __DIR__ . '/src/Colors.php';

From 494c09f0c08261265ddca4ca51c51670e01680c4 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Fri, 29 Sep 2017 16:00:39 +0800
Subject: [PATCH 007/254] fixes #532 Substitute deprecated php function each()

---
 src/Node/Number.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Node/Number.php b/src/Node/Number.php
index d4f406fa..442d57d5 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -290,7 +290,7 @@ public function output(Compiler $compiler = null)
         }
 
         reset($units);
-        list($unit, ) = each($units);
+        $unit = key($units);
 
         return (string) $dimension . $unit;
     }

From 9eaf3a6db4d88ce2c265a89e3fc495fbec9bf7a6 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 13 Oct 2017 11:52:30 -0400
Subject: [PATCH 008/254] Bump to version 0.7.0

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 2d6eabc1..dd7cd384 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.6.7';
+    const VERSION = 'v0.7.0';
 }

From f79f49b9aebf7c1885a27f1152f2d58d1ba4b05a Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 13 Oct 2017 12:06:15 -0400
Subject: [PATCH 009/254] Workaround PHP 7.2 code sniff

---
 src/Parser.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index 619b7ba8..44043e65 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2468,7 +2468,13 @@ private function getSourcePosition($pos)
      */
     private function saveEncoding()
     {
-        if (ini_get('mbstring.func_overload') & 2) {
+        if (version_compare(PHP_VERSION, '7.2.0') >= 0) {
+            return;
+        }
+
+        $iniDirective = 'mbstring' . '.func_overload'; // deprecated in PHP 7.2
+
+        if (ini_get($iniDirective) & 2) {
             $this->encoding = mb_internal_encoding();
 
             mb_internal_encoding('iso-8859-1');

From 192f9b29d41ba0e2c610c2343da61bdde28f6436 Mon Sep 17 00:00:00 2001
From: Thomas Eiling <teiling88@gmail.com>
Date: Fri, 13 Oct 2017 12:48:50 -0400
Subject: [PATCH 010/254] misc - fix some phpdoc comments and code styles

---
 src/Compiler.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 68003b90..89119933 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1181,7 +1181,7 @@ protected function flattenSelectorSingle($single)
     /**
      * Compile selector to string; self(&) should have been replaced by now
      *
-     * @param array $selector
+     * @param string|array $selector
      *
      * @return string
      */
@@ -1203,7 +1203,7 @@ protected function compileSelector($selector)
     /**
      * Compile selector part
      *
-     * @param arary $piece
+     * @param array $piece
      *
      * @return string
      */
@@ -1963,7 +1963,7 @@ protected function shouldEval($value)
      * @param array   $value
      * @param boolean $inExp
      *
-     * @return array
+     * @return array|\Leafo\ScssPhp\Node\Number
      */
     protected function reduce($value, $inExp = false)
     {
@@ -2238,7 +2238,7 @@ public function normalizeValue($value)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return \Leafo\ScssPhp\Node\Number
      */
     protected function opAddNumberNumber($left, $right)
     {
@@ -2251,7 +2251,7 @@ protected function opAddNumberNumber($left, $right)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return \Leafo\ScssPhp\Node\Number
      */
     protected function opMulNumberNumber($left, $right)
     {
@@ -2264,7 +2264,7 @@ protected function opMulNumberNumber($left, $right)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return \Leafo\ScssPhp\Node\Number
      */
     protected function opSubNumberNumber($left, $right)
     {
@@ -2277,7 +2277,7 @@ protected function opSubNumberNumber($left, $right)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return array|\Leafo\ScssPhp\Node\Number
      */
     protected function opDivNumberNumber($left, $right)
     {
@@ -2294,7 +2294,7 @@ protected function opDivNumberNumber($left, $right)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return \Leafo\ScssPhp\Node\Number
      */
     protected function opModNumberNumber($left, $right)
     {
@@ -2580,7 +2580,7 @@ protected function opLtNumberNumber($left, $right)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return \Leafo\ScssPhp\Node\Number
      */
     protected function opCmpNumberNumber($left, $right)
     {
@@ -3505,7 +3505,7 @@ protected function fileExists($name)
      * Call SCSS @function
      *
      * @param string $name
-     * @param array  $args
+     * @param array  $argValues
      * @param array  $returnValue
      *
      * @return boolean Returns true if returnValue is set; otherwise, false
@@ -3777,7 +3777,7 @@ protected function applyArguments($argDef, $argValues)
      *
      * @param mixed $value
      *
-     * @return array
+     * @return array|\Leafo\ScssPhp\Node\Number
      */
     private function coerceValue($value)
     {
@@ -3850,7 +3850,8 @@ protected function coerceMap($item)
     /**
      * Coerce something to list
      *
-     * @param array $item
+     * @param array  $item
+     * @param string $delim
      *
      * @return array
      */
@@ -5210,6 +5211,8 @@ protected function libVariableExists($args)
      * Workaround IE7's content counter bug.
      *
      * @param array $args
+     *
+     * @return array
      */
     protected function libCounter($args)
     {

From b413ff279f5f0ba5938e1315a8068a06643c9443 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 13 Oct 2017 13:29:38 -0400
Subject: [PATCH 011/254] Change default precision to 10 (introduced in sass
 3.5.0)

---
 bin/pscss           | 2 +-
 src/Node/Number.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/pscss b/bin/pscss
index 4ec061b8..70a2be3c 100755
--- a/bin/pscss
+++ b/bin/pscss
@@ -76,7 +76,7 @@ Options include:
     -i=path             Set import path
     --iso8859-1         Use iso8859-1 encoding instead of utf-8 (default utf-8)
     --line-numbers      Annotate selectors with comments referring to the source file and line number
-    -p=precision        Set decimal number precision (default 5)
+    -p=precision        Set decimal number precision (default 10)
     -T                  Dump formatted parse tree
     -v, --version       Print the version
 
diff --git a/src/Node/Number.php b/src/Node/Number.php
index 442d57d5..5faedfdf 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -31,7 +31,7 @@ class Number extends Node implements \ArrayAccess
     /**
      * @var integer
      */
-    static public $precision = 5;
+    static public $precision = 10;
 
     /**
      * @see http://www.w3.org/TR/2012/WD-css3-values-20120308/

From 75c9fb79ae362a84e89736c2812fc022332e0f5a Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 13:29:08 -0400
Subject: [PATCH 012/254] Remove setlocale() to mitigate Windows side-effects

---
 src/Compiler.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 89119933..0d67c525 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -165,9 +165,6 @@ public function __construct()
      */
     public function compile($code, $path = null)
     {
-        $locale = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
-
         $this->indentLevel    = -1;
         $this->commentsSeen   = [];
         $this->extends        = [];
@@ -196,8 +193,6 @@ public function compile($code, $path = null)
 
         $out = $this->formatter->format($this->scope);
 
-        setlocale(LC_NUMERIC, $locale);
-
         return $out;
     }
 

From 9b3c1ff4eab71cdda612646fc94cfba0de9b6672 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 13:33:24 -0400
Subject: [PATCH 013/254] Use number_format to output locale-independent floats

---
 src/Node/Number.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Node/Number.php b/src/Node/Number.php
index 5faedfdf..df1b79cc 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -292,7 +292,7 @@ public function output(Compiler $compiler = null)
         reset($units);
         $unit = key($units);
 
-        return (string) $dimension . $unit;
+        return preg_replace('/[.]0*$/', '', number_format($dimension, static::$precision)) . $unit;
     }
 
     /**

From 3cbdd6330958420b949fd19ef24472edfd3ee517 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 14:31:52 -0400
Subject: [PATCH 014/254] Trim trailing zeros

---
 src/Node/Number.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Node/Number.php b/src/Node/Number.php
index df1b79cc..59eb811a 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -291,8 +291,9 @@ public function output(Compiler $compiler = null)
 
         reset($units);
         $unit = key($units);
-
-        return preg_replace('/[.]0*$/', '', number_format($dimension, static::$precision)) . $unit;
+        $dimension = number_format($dimension, static::$precision, '.', '');
+        
+        return (static::$precision ? rtrim($dimension, '0') : $dimension) . $unit;
     }
 
     /**

From db5273cd3a33cc0fb1b1fbba85dbb00deb61446b Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 14:35:20 -0400
Subject: [PATCH 015/254] Trim trailing decimal point.

---
 src/Node/Number.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Node/Number.php b/src/Node/Number.php
index 59eb811a..acfdaf29 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -293,7 +293,7 @@ public function output(Compiler $compiler = null)
         $unit = key($units);
         $dimension = number_format($dimension, static::$precision, '.', '');
         
-        return (static::$precision ? rtrim($dimension, '0') : $dimension) . $unit;
+        return (static::$precision ? rtrim($dimension, '.0') : $dimension) . $unit;
     }
 
     /**

From c0ec63ff8eaff626ddeee1245b9119c82990c0ff Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 14:40:55 -0400
Subject: [PATCH 016/254] Fix previous edit from my phone. =P

---
 src/Node/Number.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Node/Number.php b/src/Node/Number.php
index acfdaf29..3dcdd2ca 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -293,7 +293,7 @@ public function output(Compiler $compiler = null)
         $unit = key($units);
         $dimension = number_format($dimension, static::$precision, '.', '');
         
-        return (static::$precision ? rtrim($dimension, '.0') : $dimension) . $unit;
+        return (static::$precision ? rtrim(rtrim($dimension, '0'), '.') : $dimension) . $unit;
     }
 
     /**

From f735beeb2b8926f4d361d2c51bbefbc5271fbdfc Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 14:46:23 -0400
Subject: [PATCH 017/254] Fix unit test (1/2)

---
 tests/outputs/operators.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/outputs/operators.css b/tests/outputs/operators.css
index fb492c82..50aaa8c0 100644
--- a/tests/outputs/operators.css
+++ b/tests/outputs/operators.css
@@ -6,7 +6,7 @@ body {
   color: 5px;
   top: 1.5em;
   left: -1cm;
-  top: 6.29921; }
+  top: 6.2992125984; }
 
 div {
   color: false;
@@ -19,7 +19,7 @@ div {
   color: 1; }
 
 #units {
-  test: 2.5748in;
+  test: 2.5748031496in;
   test: 13mm;
   test: 4em;
   test: 11mm;
@@ -169,7 +169,7 @@ div {
   margin: 0 -2em; }
 
 div {
-  *margin-left: 2.07447%; }
+  *margin-left: 2.0744680851%; }
 
 .foo {
   width: 12.5%; }

From 69cb0ca734665c9a9ea41dd3e3d6f7a65dfdd93d Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 14:48:01 -0400
Subject: [PATCH 018/254] Fix unit test (2/2)

---
 tests/outputs_numbered/operators.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/outputs_numbered/operators.css b/tests/outputs_numbered/operators.css
index c3ea3d1d..ad4d678e 100644
--- a/tests/outputs_numbered/operators.css
+++ b/tests/outputs_numbered/operators.css
@@ -7,7 +7,7 @@ body {
   color: 5px;
   top: 1.5em;
   left: -1cm;
-  top: 6.29921; }
+  top: 6.2992125984; }
 /* line 15, inputs/operators.scss */
 div {
   color: false;
@@ -20,7 +20,7 @@ div {
   color: 1; }
 /* line 29, inputs/operators.scss */
 #units {
-  test: 2.5748in;
+  test: 2.5748031496in;
   test: 13mm;
   test: 4em;
   test: 11mm;
@@ -170,7 +170,7 @@ div {
   margin: 0 -2em; }
 /* line 184, inputs/operators.scss */
 div {
-  *margin-left: 2.07447%; }
+  *margin-left: 2.0744680851%; }
 /* line 190, inputs/operators.scss */
 .foo {
   width: 12.5%; }

From 4f605a51462c85cf6df5bb45460483a138e04025 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 14 Oct 2017 17:35:01 -0400
Subject: [PATCH 019/254] Bump version to 0.7.2

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index dd7cd384..0dd95fe6 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.0';
+    const VERSION = 'v0.7.2';
 }

From c96edd1bedd3ba3e8ebeaf5ddd1f8669fb6f5625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20FRAN=C3=87OIS?= <nicolas.francois@frog-labs.com>
Date: Thu, 9 Nov 2017 11:16:12 +0100
Subject: [PATCH 020/254] add inline sourceMaps support

---
 src/Block.php                        |   5 +
 src/Compiler.php                     |  49 +++++-
 src/Formatter.php                    |  77 ++++++++-
 src/Formatter/Compressed.php         |   4 +-
 src/Formatter/Crunched.php           |   4 +-
 src/Formatter/Debug.php              |  16 +-
 src/Formatter/Expanded.php           |   4 +-
 src/Formatter/Nested.php             |  20 ++-
 src/Formatter/OutputBlock.php        |  15 ++
 src/Parser.php                       |   1 +
 src/SourceMap/Base64VLQEncoder.php   | 174 +++++++++++++++++++
 src/SourceMap/SourceMapGenerator.php | 241 +++++++++++++++++++++++++++
 12 files changed, 579 insertions(+), 31 deletions(-)
 create mode 100644 src/SourceMap/Base64VLQEncoder.php
 create mode 100644 src/SourceMap/SourceMapGenerator.php

diff --git a/src/Block.php b/src/Block.php
index a6b5f3f0..87cfd6d8 100644
--- a/src/Block.php
+++ b/src/Block.php
@@ -28,6 +28,11 @@ class Block
      */
     public $parent;
 
+    /**
+     * @var string;
+     */
+    public $sourceName;
+
     /**
      * @var integer
      */
diff --git a/src/Compiler.php b/src/Compiler.php
index 0d67c525..a677760d 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -18,6 +18,7 @@
 use Leafo\ScssPhp\Exception\CompilerException;
 use Leafo\ScssPhp\Formatter\OutputBlock;
 use Leafo\ScssPhp\Node;
+use Leafo\ScssPhp\SourceMap\SourceMapGenerator;
 use Leafo\ScssPhp\Type;
 use Leafo\ScssPhp\Parser;
 use Leafo\ScssPhp\Util;
@@ -64,6 +65,9 @@ class Compiler
     const WITH_SUPPORTS = 4;
     const WITH_ALL      = 7;
 
+    const SOURCE_MAP_NONE = 0;
+    const SOURCE_MAP_INLINE = 1;
+
     /**
      * @var array
      */
@@ -120,11 +124,16 @@ class Compiler
     protected $encoding = null;
     protected $lineNumberStyle = null;
 
+    protected $sourceMap = self::SOURCE_MAP_NONE;
+    protected $sourceMapOptions = [];
+
+    /** @var string|Formatter */
     protected $formatter = 'Leafo\ScssPhp\Formatter\Nested';
 
     protected $rootEnv;
     protected $rootBlock;
 
+    /** @var  Environment */
     protected $env;
     protected $scope;
     protected $storeEnv;
@@ -191,8 +200,21 @@ public function compile($code, $path = null)
         $this->compileRoot($tree);
         $this->popEnv();
 
-        $out = $this->formatter->format($this->scope);
+        $sourceMapGenerator = null;
+        if($this->sourceMap &&  $this->sourceMap !== self::SOURCE_MAP_NONE) {
+            $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
+        }
+        $out = $this->formatter->format($this->scope, $sourceMapGenerator);
+        if($this->sourceMap &&  $this->sourceMap !== self::SOURCE_MAP_NONE) {
+            $sourceMap = $sourceMapGenerator->generateJson();
+
+            $sourceMapUrl = null;
+            if($this->sourceMap == self::SOURCE_MAP_INLINE) {
+                $sourceMapUrl = sprintf('data:application/json,%s', self::encodeURIComponent($sourceMap));
+            }
 
+            $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
+        }
         return $out;
     }
 
@@ -274,6 +296,9 @@ protected function makeOutputBlock($type, $selectors = null)
         $out->parent    = $this->scope;
         $out->selectors = $selectors;
         $out->depth     = $this->env->depth;
+        $out->sourceName = $this->env->block->sourceName;
+        $out->sourceLine = $this->env->block->sourceLine;
+        $out->sourceColumn = $this->env->block->sourceColumn;
 
         return $out;
     }
@@ -656,6 +681,7 @@ protected function compileMedia(Block $media)
 
             if ($needsWrap) {
                 $wrapped = new Block;
+                $wrapped->sourceName = $media->sourceName;
                 $wrapped->sourceIndex  = $media->sourceIndex;
                 $wrapped->sourceLine   = $media->sourceLine;
                 $wrapped->sourceColumn = $media->sourceColumn;
@@ -729,6 +755,7 @@ protected function compileAtRoot(Block $block)
         // wrap inline selector
         if ($block->selector) {
             $wrapped = new Block;
+            $wrapped->sourceName   = $block->sourceName;
             $wrapped->sourceIndex  = $block->sourceIndex;
             $wrapped->sourceLine   = $block->sourceLine;
             $wrapped->sourceColumn = $block->sourceColumn;
@@ -785,6 +812,7 @@ private function spliceTree($envs, Block $block, $without)
             }
 
             $b = new Block;
+            $b->sourceName   = $e->block->sourceName;
             $b->sourceIndex  = $e->block->sourceIndex;
             $b->sourceLine   = $e->block->sourceLine;
             $b->sourceColumn = $e->block->sourceColumn;
@@ -1076,6 +1104,13 @@ protected function evalSelectors($selectors)
         return $selectors;
     }
 
+    /**
+     * @param array $sourceMapOptions
+     */
+    public function setSourceMapOptions($sourceMapOptions) {
+        $this->sourceMapOptions = $sourceMapOptions;
+    }
+
     /**
      * Evaluate selector
      *
@@ -3299,6 +3334,13 @@ public function setLineNumberStyle($lineNumberStyle)
         $this->lineNumberStyle = $lineNumberStyle;
     }
 
+    /**
+     * @param int $sourceMap
+     */
+    public function setSourceMap($sourceMap) {
+        $this->sourceMap = $sourceMap;
+    }
+
     /**
      * Register function
      *
@@ -5256,4 +5298,9 @@ protected function libInspect($args)
 
         return $args[0];
     }
+
+    public static function encodeURIComponent($string){
+        $revert = array('%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')');
+        return strtr(rawurlencode($string), $revert);
+    }
 }
diff --git a/src/Formatter.php b/src/Formatter.php
index 0d2635f1..487b6612 100644
--- a/src/Formatter.php
+++ b/src/Formatter.php
@@ -12,6 +12,7 @@
 namespace Leafo\ScssPhp;
 
 use Leafo\ScssPhp\Formatter\OutputBlock;
+use Leafo\ScssPhp\SourceMap\SourceMapGenerator;
 
 /**
  * Base formatter
@@ -56,10 +57,31 @@ abstract class Formatter
     public $assignSeparator;
 
     /**
-     * @var boolea
+     * @var boolean
      */
     public $keepSemicolons;
 
+    /**
+     * @var OutputBlock;
+     */
+    protected $currentBlock;
+
+
+    /**
+     * @var int
+     */
+    protected $currentLine;
+
+    /**
+     * @var int;
+     */
+    protected $currentColumn;
+
+    /**
+     * @var SourceMapGenerator
+     */
+    protected $sourceMapGenerator;
+
     /**
      * Initialize formatter
      *
@@ -123,10 +145,10 @@ protected function blockLines(OutputBlock $block)
 
         $glue = $this->break . $inner;
 
-        echo $inner . implode($glue, $block->lines);
+        $this->write($inner . implode($glue, $block->lines));
 
         if (! empty($block->children)) {
-            echo $this->break;
+            $this->write($this->break);
         }
     }
 
@@ -139,9 +161,9 @@ protected function blockSelectors(OutputBlock $block)
     {
         $inner = $this->indentStr();
 
-        echo $inner
+        $this->write($inner
             . implode($this->tagSeparator, $block->selectors)
-            . $this->open . $this->break;
+            . $this->open . $this->break);
     }
 
     /**
@@ -167,6 +189,8 @@ protected function block(OutputBlock $block)
             return;
         }
 
+        $this->currentBlock = $block;
+
         $pre = $this->indentStr();
 
         if (! empty($block->selectors)) {
@@ -187,10 +211,10 @@ protected function block(OutputBlock $block)
             $this->indentLevel--;
 
             if (empty($block->children)) {
-                echo $this->break;
+                $this->write($this->break);
             }
 
-            echo $pre . $this->close . $this->break;
+            $this->write($pre . $this->close . $this->break);
         }
     }
 
@@ -201,10 +225,19 @@ protected function block(OutputBlock $block)
      *
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $block An abstract syntax tree
      *
+     * @param SourceMapGenerator|null $sourceMapGenerator
      * @return string
+     * @internal param bool $collectSourceMap
      */
-    public function format(OutputBlock $block)
+    public function format(OutputBlock $block, SourceMapGenerator $sourceMapGenerator = null)
     {
+        if($sourceMapGenerator) {
+            $this->currentLine = 1;
+            $this->currentColumn = 0;
+            $this->sourceMapGenerator = $sourceMapGenerator;
+        } else {
+            $this->sourceMapGenerator = null;
+        }
         ob_start();
 
         $this->block($block);
@@ -213,4 +246,32 @@ public function format(OutputBlock $block)
 
         return $out;
     }
+
+    /**
+     * @param $str
+     */
+    protected function write($str) {
+        if($this->sourceMapGenerator) {
+            $this->sourceMapGenerator->addMapping(
+                $this->currentLine,
+                $this->currentColumn,
+                $this->currentBlock->sourceLine,
+                $this->currentBlock->sourceColumn,
+                $this->currentBlock->sourceName
+            );
+
+            $lines = explode("\n", $str);
+            $lineCount = count($lines);
+            $this->currentLine += $lineCount-1;
+
+            $lastLine = array_pop($lines);
+            if($lineCount == 1) {
+                $this->currentColumn += mb_strlen($lastLine);
+            } else {
+                $this->currentColumn = mb_strlen($lastLine);
+            }
+        }
+
+        echo $str;
+    }
 }
diff --git a/src/Formatter/Compressed.php b/src/Formatter/Compressed.php
index 17aca54a..69a67850 100644
--- a/src/Formatter/Compressed.php
+++ b/src/Formatter/Compressed.php
@@ -53,10 +53,10 @@ public function blockLines(OutputBlock $block)
             }
         }
 
-        echo $inner . implode($glue, $block->lines);
+        $this->write( $inner . implode($glue, $block->lines));
 
         if (! empty($block->children)) {
-            echo $this->break;
+            $this->write( $this->break);
         }
     }
 }
diff --git a/src/Formatter/Crunched.php b/src/Formatter/Crunched.php
index 0a89bc48..43d63833 100644
--- a/src/Formatter/Crunched.php
+++ b/src/Formatter/Crunched.php
@@ -51,10 +51,10 @@ public function blockLines(OutputBlock $block)
             }
         }
 
-        echo $inner . implode($glue, $block->lines);
+        $this->write($inner . implode($glue, $block->lines));
 
         if (! empty($block->children)) {
-            echo $this->break;
+            $this->write($this->break);
         }
     }
 }
diff --git a/src/Formatter/Debug.php b/src/Formatter/Debug.php
index 321c5368..cb29641a 100644
--- a/src/Formatter/Debug.php
+++ b/src/Formatter/Debug.php
@@ -52,13 +52,13 @@ protected function blockLines(OutputBlock $block)
         $indent = $this->indentStr();
 
         if (empty($block->lines)) {
-            echo "{$indent}block->lines: []\n";
+            $this->write("{$indent}block->lines: []\n");
 
             return;
         }
 
         foreach ($block->lines as $index => $line) {
-            echo "{$indent}block->lines[{$index}]: $line\n";
+            $this->write( "{$indent}block->lines[{$index}]: $line\n");
         }
     }
 
@@ -70,13 +70,13 @@ protected function blockSelectors(OutputBlock $block)
         $indent = $this->indentStr();
 
         if (empty($block->selectors)) {
-            echo "{$indent}block->selectors: []\n";
+            $this->write( "{$indent}block->selectors: []\n");
 
             return;
         }
 
         foreach ($block->selectors as $index => $selector) {
-            echo "{$indent}block->selectors[{$index}]: $selector\n";
+            $this->write( "{$indent}block->selectors[{$index}]: $selector\n");
         }
     }
 
@@ -88,7 +88,7 @@ protected function blockChildren(OutputBlock $block)
         $indent = $this->indentStr();
 
         if (empty($block->children)) {
-            echo "{$indent}block->children: []\n";
+            $this->write( "{$indent}block->children: []\n");
 
             return;
         }
@@ -109,8 +109,10 @@ protected function block(OutputBlock $block)
     {
         $indent = $this->indentStr();
 
-        echo "{$indent}block->type: {$block->type}\n" .
-             "{$indent}block->depth: {$block->depth}\n";
+        $this->write( "{$indent}block->type: {$block->type}\n" .
+             "{$indent}block->depth: {$block->depth}\n");
+
+        $this->currentBlock = $block;
 
         $this->blockSelectors($block);
         $this->blockLines($block);
diff --git a/src/Formatter/Expanded.php b/src/Formatter/Expanded.php
index dff17e6b..0449787d 100644
--- a/src/Formatter/Expanded.php
+++ b/src/Formatter/Expanded.php
@@ -59,10 +59,10 @@ protected function blockLines(OutputBlock $block)
             }
         }
 
-        echo $inner . implode($glue, $block->lines);
+        $this->write($inner . implode($glue, $block->lines));
 
         if (empty($block->selectors) || ! empty($block->children)) {
-            echo $this->break;
+            $this->write($this->break);
         }
     }
 }
diff --git a/src/Formatter/Nested.php b/src/Formatter/Nested.php
index c4ff803c..48e19ef7 100644
--- a/src/Formatter/Nested.php
+++ b/src/Formatter/Nested.php
@@ -12,7 +12,6 @@
 namespace Leafo\ScssPhp\Formatter;
 
 use Leafo\ScssPhp\Formatter;
-use Leafo\ScssPhp\Formatter\OutputBlock;
 
 /**
  * Nested formatter
@@ -66,10 +65,10 @@ protected function blockLines(OutputBlock $block)
             }
         }
 
-        echo $inner . implode($glue, $block->lines);
+        $this->write( $inner . implode($glue, $block->lines));
 
         if (! empty($block->children)) {
-            echo $this->break;
+            $this->write( $this->break);
         }
     }
 
@@ -80,9 +79,9 @@ protected function blockSelectors(OutputBlock $block)
     {
         $inner = $this->indentStr();
 
-        echo $inner
+        $this->write( $inner
             . implode($this->tagSeparator, $block->selectors)
-            . $this->open . $this->break;
+            . $this->open . $this->break);
     }
 
     /**
@@ -94,13 +93,13 @@ protected function blockChildren(OutputBlock $block)
             $this->block($child);
 
             if ($i < count($block->children) - 1) {
-                echo $this->break;
+                $this->write( $this->break);
 
                 if (isset($block->children[$i + 1])) {
                     $next = $block->children[$i + 1];
 
                     if ($next->depth === max($block->depth, 1) && $child->depth >= $next->depth) {
-                        echo $this->break;
+                        $this->write( $this->break);
                     }
                 }
             }
@@ -120,6 +119,9 @@ protected function block(OutputBlock $block)
             return;
         }
 
+        $this->currentBlock = $block;
+
+
         $this->depth = $block->depth;
 
         if (! empty($block->selectors)) {
@@ -139,11 +141,11 @@ protected function block(OutputBlock $block)
         if (! empty($block->selectors)) {
             $this->indentLevel--;
 
-            echo $this->close;
+            $this->write( $this->close);
         }
 
         if ($block->type === 'root') {
-            echo $this->break;
+            $this->write( $this->break);
         }
     }
 
diff --git a/src/Formatter/OutputBlock.php b/src/Formatter/OutputBlock.php
index 88e86402..7d233a8d 100644
--- a/src/Formatter/OutputBlock.php
+++ b/src/Formatter/OutputBlock.php
@@ -47,4 +47,19 @@ class OutputBlock
      * @var \Leafo\ScssPhp\Formatter\OutputBlock
      */
     public $parent;
+
+    /**
+     * @var string
+     */
+    public $sourceName;
+
+    /**
+     * @var int
+     */
+    public $sourceLine;
+
+    /**
+     * @var int
+     */
+    public $sourceColumn;
 }
diff --git a/src/Parser.php b/src/Parser.php
index 44043e65..cc0a51df 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -708,6 +708,7 @@ protected function pushBlock($selectors, $pos = 0)
         list($line, $column) = $this->getSourcePosition($pos);
 
         $b = new Block;
+        $b->sourceName = $this->sourceName;
         $b->sourceLine   = $line;
         $b->sourceColumn = $column;
         $b->sourceIndex  = $this->sourceIndex;
diff --git a/src/SourceMap/Base64VLQEncoder.php b/src/SourceMap/Base64VLQEncoder.php
new file mode 100644
index 00000000..14652fbe
--- /dev/null
+++ b/src/SourceMap/Base64VLQEncoder.php
@@ -0,0 +1,174 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: nico
+ * Date: 08/11/17
+ * Time: 19:14
+ */
+
+namespace Leafo\ScssPhp\SourceMap;
+
+
+class Base64VLQEncoder {
+    /**
+     * Shift
+     *
+     * @var integer
+     */
+    private $shift = 5;
+    /**
+     * Mask
+     *
+     * @var integer
+     */
+    private $mask = 0x1F; // == (1 << shift) == 0b00011111
+    /**
+     * Continuation bit
+     *
+     * @var integer
+     */
+    private $continuationBit = 0x20; // == (mask - 1 ) == 0b00100000
+    /**
+     * Char to integer map
+     *
+     * @var array
+     */
+    private $charToIntMap = array(
+        'A' => 0, 'B' => 1, 'C' => 2, 'D' => 3, 'E' => 4, 'F' => 5, 'G' => 6,
+        'H' => 7,'I' => 8, 'J' => 9, 'K' => 10, 'L' => 11, 'M' => 12, 'N' => 13,
+        'O' => 14, 'P' => 15, 'Q' => 16, 'R' => 17, 'S' => 18, 'T' => 19, 'U' => 20,
+        'V' => 21, 'W' => 22, 'X' => 23, 'Y' => 24, 'Z' => 25, 'a' => 26, 'b' => 27,
+        'c' => 28, 'd' => 29, 'e' => 30, 'f' => 31, 'g' => 32, 'h' => 33, 'i' => 34,
+        'j' => 35, 'k' => 36, 'l' => 37, 'm' => 38, 'n' => 39, 'o' => 40, 'p' => 41,
+        'q' => 42, 'r' => 43, 's' => 44, 't' => 45, 'u' => 46, 'v' => 47, 'w' => 48,
+        'x' => 49, 'y' => 50, 'z' => 51, 0 => 52, 1 => 53, 2 => 54, 3 => 55, 4 => 56,
+        5 => 57,	6 => 58, 7 => 59, 8 => 60, 9 => 61, '+' => 62, '/' => 63,
+    );
+    /**
+     * Integer to char map
+     *
+     * @var array
+     */
+    private $intToCharMap = array(
+        0 => 'A', 1 => 'B', 2 => 'C', 3 => 'D', 4 => 'E', 5 => 'F', 6 => 'G',
+        7 => 'H', 8 => 'I', 9 => 'J', 10 => 'K', 11 => 'L', 12 => 'M', 13 => 'N',
+        14 => 'O', 15 => 'P', 16 => 'Q', 17 => 'R', 18 => 'S', 19 => 'T', 20 => 'U',
+        21 => 'V', 22 => 'W', 23 => 'X', 24 => 'Y', 25 => 'Z', 26 => 'a', 27 => 'b',
+        28 => 'c', 29 => 'd', 30 => 'e', 31 => 'f', 32 => 'g', 33 => 'h', 34 => 'i',
+        35 => 'j', 36 => 'k', 37 => 'l', 38 => 'm', 39 => 'n', 40 => 'o', 41 => 'p',
+        42 => 'q', 43 => 'r', 44 => 's', 45 => 't', 46 => 'u', 47 => 'v', 48 => 'w',
+        49 => 'x', 50 => 'y', 51 => 'z', 52 => '0', 53 => '1', 54 => '2', 55 => '3',
+        56 => '4', 57 => '5', 58 => '6', 59 => '7', 60 => '8', 61 => '9', 62 => '+',
+        63 => '/',
+    );
+    /**
+     * Constructor
+     */
+    public function __construct(){
+        // I leave it here for future reference
+        // foreach(str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') as $i => $char)
+        // {
+        //	 $this->charToIntMap[$char] = $i;
+        //	 $this->intToCharMap[$i] = $char;
+        // }
+    }
+    /**
+     * Convert from a two-complement value to a value where the sign bit is
+     * is placed in the least significant bit.	For example, as decimals:
+     *	 1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
+     *	 2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
+     * We generate the value for 32 bit machines, hence -2147483648 becomes 1, not 4294967297,
+     * even on a 64 bit machine.
+     * @param string $aValue
+     */
+    public function toVLQSigned($aValue){
+        return 0xffffffff & ($aValue < 0 ? ((-$aValue) << 1) + 1 : ($aValue << 1) + 0);
+    }
+    /**
+     * Convert to a two-complement value from a value where the sign bit is
+     * is placed in the least significant bit. For example, as decimals:
+     *	 2 (10 binary) becomes 1, 3 (11 binary) becomes -1
+     *	 4 (100 binary) becomes 2, 5 (101 binary) becomes -2
+     * We assume that the value was generated with a 32 bit machine in mind.
+     * Hence
+     *	 1 becomes -2147483648
+     * even on a 64 bit machine.
+     * @param integer $aValue
+     */
+    public function fromVLQSigned($aValue){
+        return $aValue & 1 ? $this->zeroFill(~$aValue + 2, 1) | (-1 - 0x7fffffff) : $this->zeroFill($aValue, 1);
+    }
+    /**
+     * Return the base 64 VLQ encoded value.
+     *
+     * @param string $aValue The value to encode
+     * @return string The encoded value
+     */
+    public function encode($aValue){
+        $encoded = '';
+        $vlq = $this->toVLQSigned($aValue);
+        do
+        {
+            $digit = $vlq & $this->mask;
+            $vlq = $this->zeroFill($vlq, $this->shift);
+            if($vlq > 0){
+                $digit |= $this->continuationBit;
+            }
+            $encoded .= $this->base64Encode($digit);
+        } while($vlq > 0);
+        return $encoded;
+    }
+    /**
+     * Return the value decoded from base 64 VLQ.
+     *
+     * @param string $encoded The encoded value to decode
+     * @return integer The decoded value
+     */
+    public function decode($encoded){
+        $vlq = 0;
+        $i = 0;
+        do
+        {
+            $digit = $this->base64Decode($encoded[$i]);
+            $vlq |= ($digit & $this->mask) << ($i * $this->shift);
+            $i++;
+        } while($digit & $this->continuationBit);
+        return $this->fromVLQSigned($vlq);
+    }
+    /**
+     * Right shift with zero fill.
+     *
+     * @param integer $a number to shift
+     * @param integer $b number of bits to shift
+     * @return integer
+     */
+    public function zeroFill($a, $b){
+        return ($a >= 0) ? ($a >> $b) : ($a >> $b) & (PHP_INT_MAX >> ($b - 1));
+    }
+    /**
+     * Encode single 6-bit digit as base64.
+     *
+     * @param integer $number
+     * @return string
+     * @throws Exception If the number is invalid
+     */
+    public function base64Encode($number){
+        if($number < 0 || $number > 63){
+            throw new Exception(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
+        }
+        return $this->intToCharMap[$number];
+    }
+    /**
+     * Decode single 6-bit digit from base64
+     *
+     * @param string $char
+     * @return number
+     * @throws Exception If the number is invalid
+     */
+    public function base64Decode($char){
+        if(!array_key_exists($char, $this->charToIntMap)){
+            throw new Exception(sprintf('Invalid base 64 digit "%s" given.', $char));
+        }
+        return $this->charToIntMap[$char];
+    }
+}
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
new file mode 100644
index 00000000..3d21f4fe
--- /dev/null
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: nico
+ * Date: 08/11/17
+ * Time: 19:16
+ */
+
+namespace Leafo\ScssPhp\SourceMap;
+
+class SourceMapGenerator {
+    /**
+     * What version of source map does the generator generate?
+     */
+    const VERSION = 3;
+    /**
+     * Array of default options
+     *
+     * @var array
+     */
+    protected $defaultOptions = array(
+        // an optional source root, useful for relocating source files
+        // on a server or removing repeated values in the 'sources' entry.
+        // This value is prepended to the individual entries in the 'source' field.
+        'sourceRoot' => '',
+        // an optional name of the generated code that this source map is associated with.
+        'sourceMapFilename' => null,
+        // url of the map
+        'sourceMapURL' => null,
+        // absolute path to a file to write the map to
+        'sourceMapWriteTo' => null,
+        // output source contents?
+        'outputSourceFiles' => false,
+        // base path for filename normalization
+        'sourceMapRootpath' => '',
+        // base path for filename normalization
+        'sourceMapBasepath' => ''
+    );
+
+    /**
+     * The base64 VLQ encoder
+     *
+     * @var Base64VLQEncoder
+     */
+    protected $encoder;
+    /**
+     * Array of mappings
+     *
+     * @var array
+     */
+    protected $mappings = array();
+
+    /**
+     * Array of contents map
+     *
+     * @var array
+     */
+    protected $contentsMap = array();
+    /**
+     * File to content map
+     *
+     * @var array
+     */
+    protected $sources = array();
+    protected $source_keys = array();
+    /**
+     * @var array
+     */
+    private $options;
+
+    public function __construct(array $options = []) {
+        $this->options = array_merge($this->defaultOptions, $options);
+        $this->encoder = new Base64VLQEncoder();
+    }
+
+    /**
+     * Adds a mapping
+     *
+     * @param integer $generatedLine The line number in generated file
+     * @param integer $generatedColumn The column number in generated file
+     * @param integer $originalLine The line number in original file
+     * @param integer $originalColumn The column number in original file
+     * @param string $sourceFile The original source file
+     */
+    public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile) {
+        $this->mappings[] = array(
+            'generated_line' => $generatedLine,
+            'generated_column' => $generatedColumn,
+            'original_line' => $originalLine,
+            'original_column' => $originalColumn,
+            'source_file' => $sourceFile
+        );
+
+        $this->sources[$sourceFile] = $sourceFile;
+    }
+
+    /**
+     * Generates the JSON source map
+     *
+     * @return string
+     * @see https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#
+     */
+    public function generateJson() {
+        $sourceMap = array();
+        $mappings = $this->generateMappings();
+        // File version (always the first entry in the object) and must be a positive integer.
+        $sourceMap['version'] = self::VERSION;
+        // An optional name of the generated code that this source map is associated with.
+        $file = $this->options['sourceMapFilename'];
+        if($file) {
+            $sourceMap['file'] = $file;
+        }
+        // An optional source root, useful for relocating source files on a server or removing repeated values in the 'sources' entry.	This value is prepended to the individual entries in the 'source' field.
+        $root = $this->options['sourceRoot'];
+        if($root) {
+            $sourceMap['sourceRoot'] = $root;
+        }
+        // A list of original sources used by the 'mappings' entry.
+        $sourceMap['sources'] = array();
+        foreach($this->sources as $source_uri => $source_filename) {
+            $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
+        }
+        // A list of symbol names used by the 'mappings' entry.
+        $sourceMap['names'] = array();
+        // A string with the encoded mapping data.
+        $sourceMap['mappings'] = $mappings;
+        if($this->options['outputSourceFiles']) {
+            // An optional list of source content, useful when the 'source' can't be hosted.
+            // The contents are listed in the same order as the sources above.
+            // 'null' may be used if some original sources should be retrieved by name.
+            $sourceMap['sourcesContent'] = $this->getSourcesContent();
+        }
+        // less.js compat fixes
+        if(count($sourceMap['sources']) && empty($sourceMap['sourceRoot'])) {
+            unset($sourceMap['sourceRoot']);
+        }
+        return json_encode($sourceMap);
+    }
+
+    /**
+     * Returns the sources contents
+     *
+     * @return array|null
+     */
+    protected function getSourcesContent() {
+        if(empty($this->sources)) {
+            return null;
+        }
+        $content = array();
+        foreach($this->sources as $sourceFile) {
+            $content[] = file_get_contents($sourceFile);
+        }
+        return $content;
+    }
+
+    /**
+     * Generates the mappings string
+     *
+     * @return string
+     */
+    public function generateMappings() {
+        if(!count($this->mappings)) {
+            return '';
+        }
+        $this->source_keys = array_flip(array_keys($this->sources));
+        // group mappings by generated line number.
+        $groupedMap = $groupedMapEncoded = array();
+        foreach($this->mappings as $m) {
+            $groupedMap[$m['generated_line']][] = $m;
+        }
+        ksort($groupedMap);
+        $lastGeneratedLine = $lastOriginalIndex = $lastOriginalLine = $lastOriginalColumn = 0;
+        foreach($groupedMap as $lineNumber => $line_map) {
+            while(++$lastGeneratedLine < $lineNumber) {
+                $groupedMapEncoded[] = ';';
+            }
+            $lineMapEncoded = array();
+            $lastGeneratedColumn = 0;
+            foreach($line_map as $m) {
+                $mapEncoded = $this->encoder->encode($m['generated_column'] - $lastGeneratedColumn);
+                $lastGeneratedColumn = $m['generated_column'];
+                // find the index
+                if($m['source_file']) {
+                    $index = $this->findFileIndex($m['source_file']);
+                    if($index !== false) {
+                        $mapEncoded .= $this->encoder->encode($index - $lastOriginalIndex);
+                        $lastOriginalIndex = $index;
+                        // lines are stored 0-based in SourceMap spec version 3
+                        $mapEncoded .= $this->encoder->encode($m['original_line'] - 1 - $lastOriginalLine);
+                        $lastOriginalLine = $m['original_line'] - 1;
+                        $mapEncoded .= $this->encoder->encode($m['original_column'] - $lastOriginalColumn);
+                        $lastOriginalColumn = $m['original_column'];
+                    }
+                }
+                $lineMapEncoded[] = $mapEncoded;
+            }
+            $groupedMapEncoded[] = implode(',', $lineMapEncoded) . ';';
+        }
+        return rtrim(implode($groupedMapEncoded), ';');
+    }
+
+    /**
+     * Finds the index for the filename
+     *
+     * @param string $filename
+     * @return integer|false
+     */
+    protected function findFileIndex($filename) {
+        return $this->source_keys[$filename];
+    }
+
+    protected function normalizeFilename($filename) {
+        $filename = $this->fixWindowsPath($filename);
+        $rootpath = $this->options['sourceMapRootpath'];
+        $basePath = $this->options['sourceMapBasepath'];
+        // "Trim" the 'sourceMapBasepath' from the output filename.
+        if(strpos($filename, $basePath) === 0) {
+            $filename = substr($filename, strlen($basePath));
+        }
+        // Remove extra leading path separators.
+        if(strpos($filename, '\\') === 0 || strpos($filename, '/') === 0) {
+            $filename = substr($filename, 1);
+        }
+        return $rootpath . $filename;
+    }
+
+    /**
+     * fix windows paths
+     * @param  string $path
+     * @param bool $addEndSlash
+     * @return string
+     */
+    public function fixWindowsPath($path, $addEndSlash = false) {
+        $slash = ($addEndSlash) ? '/' : '';
+        if(!empty($path)) {
+            $path = str_replace('\\', '/', $path);
+            $path = rtrim($path, '/') . $slash;
+        }
+        return $path;
+    }
+}

From 87c8b53442f0be9c8dd33cbac2308842dd240240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20FRAN=C3=87OIS?= <nicolas.francois@frog-labs.com>
Date: Thu, 9 Nov 2017 13:37:18 +0100
Subject: [PATCH 021/254] inline sourceMaps: fix off-by-one column in source
 maps

---
 src/Formatter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Formatter.php b/src/Formatter.php
index 487b6612..7939113b 100644
--- a/src/Formatter.php
+++ b/src/Formatter.php
@@ -256,7 +256,7 @@ protected function write($str) {
                 $this->currentLine,
                 $this->currentColumn,
                 $this->currentBlock->sourceLine,
-                $this->currentBlock->sourceColumn,
+                $this->currentBlock->sourceColumn - 1, //columns from parser are off by one
                 $this->currentBlock->sourceName
             );
 

From ce6c958bc90b729467b010d35fece984e6edec44 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 14 Dec 2017 12:34:12 -0500
Subject: [PATCH 022/254] Remove trailing whitespace

---
 src/Node/Number.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Node/Number.php b/src/Node/Number.php
index 3dcdd2ca..efa83f5b 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -292,7 +292,7 @@ public function output(Compiler $compiler = null)
         reset($units);
         $unit = key($units);
         $dimension = number_format($dimension, static::$precision, '.', '');
-        
+
         return (static::$precision ? rtrim(rtrim($dimension, '0'), '.') : $dimension) . $unit;
     }
 

From eb4ab3f9be1d7fe854017c3bf97a3ca8c27730fb Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Fri, 15 Dec 2017 12:42:20 -0500
Subject: [PATCH 023/254] Adds File based source map (in addition to inline
 source map) - SOURCE_MAP_FILE, using code from less.php; ONLY if there is
 output from the scss file.

---
 scss.inc.php                         |  4 ++++
 src/Compiler.php                     |  5 ++++-
 src/SourceMap/SourceMapGenerator.php | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/scss.inc.php b/scss.inc.php
index 83d23a6b..77303ba3 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -11,6 +11,7 @@
     include_once __DIR__ . '/src/Compiler/Environment.php';
     include_once __DIR__ . '/src/Exception/CompilerException.php';
     include_once __DIR__ . '/src/Exception/ParserException.php';
+    include_once __DIR__ . '/src/Exception/RangeException.php';  //exp
     include_once __DIR__ . '/src/Exception/ServerException.php';
     include_once __DIR__ . '/src/Formatter.php';
     include_once __DIR__ . '/src/Formatter/Compact.php';
@@ -23,6 +24,9 @@
     include_once __DIR__ . '/src/Node.php';
     include_once __DIR__ . '/src/Node/Number.php';
     include_once __DIR__ . '/src/Parser.php';
+//    include_once __DIR__ . '/src/example/Server.php';
+    include_once __DIR__ . '/src/SourceMap/Base64VLQEncoder.php';
+    include_once __DIR__ . '/src/SourceMap/SourceMapGenerator.php';
     include_once __DIR__ . '/src/Type.php';
     include_once __DIR__ . '/src/Util.php';
     include_once __DIR__ . '/src/Version.php';
diff --git a/src/Compiler.php b/src/Compiler.php
index a677760d..2dc50531 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -67,6 +67,7 @@ class Compiler
 
     const SOURCE_MAP_NONE = 0;
     const SOURCE_MAP_INLINE = 1;
+    const SOURCE_MAP_FILE = 2;
 
     /**
      * @var array
@@ -205,12 +206,14 @@ public function compile($code, $path = null)
             $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
         }
         $out = $this->formatter->format($this->scope, $sourceMapGenerator);
-        if($this->sourceMap &&  $this->sourceMap !== self::SOURCE_MAP_NONE) {
+        if(!empty($out) && $this->sourceMap &&  $this->sourceMap !== self::SOURCE_MAP_NONE) {
             $sourceMap = $sourceMapGenerator->generateJson();
 
             $sourceMapUrl = null;
             if($this->sourceMap == self::SOURCE_MAP_INLINE) {
                 $sourceMapUrl = sprintf('data:application/json,%s', self::encodeURIComponent($sourceMap));
+            } elseif ($this->sourceMap == self::SOURCE_MAP_FILE) {
+                $sourceMapUrl = $sourceMapGenerator->saveMap($sourceMap);
             }
 
             $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 3d21f4fe..300a5a08 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -8,6 +8,8 @@
 
 namespace Leafo\ScssPhp\SourceMap;
 
+use Leafo\ScssPhp\Exception\CompilerException;
+
 class SourceMapGenerator {
     /**
      * What version of source map does the generator generate?
@@ -94,6 +96,28 @@ public function addMapping($generatedLine, $generatedColumn, $originalLine, $ori
         $this->sources[$sourceFile] = $sourceFile;
     }
 
+    /**
+   	 * Saves the source map to a file
+   	 *
+   	 * @param string $file The absolute path to a file
+   	 * @param string $content The content to write
+   	 * @throws Exception If the file could not be saved
+   	 */
+   	public function saveMap($content){
+   	    $file = $this->options['sourceMapWriteTo'];
+   		$dir = dirname($file);
+   		// directory does not exist
+   		if( !is_dir($dir) ){
+   			// FIXME: create the dir automatically?
+   			throw new CompilerException(sprintf('The directory "%s" does not exist. Cannot save the source map.', $dir));
+   		}
+   		// FIXME: proper saving, with dir write check!
+   		if(file_put_contents($file, $content) === false){
+   			throw new CompilerException(sprintf('Cannot save the source map to "%s"', $file));
+   		}
+   		return $this->options['sourceMapURL'];
+   	}
+
     /**
      * Generates the JSON source map
      *

From 201b8978143ac913f00ab5a04a11cf2ba7151091 Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Fri, 15 Dec 2017 12:42:58 -0500
Subject: [PATCH 024/254] Adds cachedCompile function to Server example
 (taken/modified from less.php)

---
 example/Server.php | 63 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/example/Server.php b/example/Server.php
index 8dc3c7b2..a6e8b986 100644
--- a/example/Server.php
+++ b/example/Server.php
@@ -416,6 +416,69 @@ public function checkedCachedCompile($in, $out, $force = false)
         return $css;
     }
 
+    /**
+   	 * Execute scssphp on a .scss file or a scssphp cache structure
+   	 *
+   	 * The scssphp cache structure contains information about a specific
+   	 * scss file having been parsed. It can be used as a hint for future
+   	 * calls to determine whether or not a rebuild is required.
+   	 *
+   	 * The cache structure contains two important keys that may be used
+   	 * externally:
+   	 *
+   	 * compiled: The final compiled CSS
+   	 * updated: The time (in seconds) the CSS was last compiled
+   	 *
+   	 * The cache structure is a plain-ol' PHP associative array and can
+   	 * be serialized and unserialized without a hitch.
+   	 *
+   	 * @param mixed $in Input
+   	 * @param bool $force Force rebuild?
+   	 * @return array scssphp cache structure
+   	 */
+   	public function cachedCompile($in, $force = false) {
+   		// assume no root
+   		$root = null;
+
+   		if (is_string($in)) {
+   			$root = $in;
+   		} elseif (is_array($in) and isset($in['root'])) {
+   			if ($force or ! isset($in['files'])) {
+   				// If we are forcing a recompile or if for some reason the
+   				// structure does not contain any file information we should
+   				// specify the root to trigger a rebuild.
+   				$root = $in['root'];
+   			} elseif (isset($in['files']) and is_array($in['files'])) {
+   				foreach ($in['files'] as $fname => $ftime ) {
+   					if (!file_exists($fname) or filemtime($fname) > $ftime) {
+   						// One of the files we knew about previously has changed
+   						// so we should look at our incoming root again.
+   						$root = $in['root'];
+   						break;
+   					}
+   				}
+   			}
+   		} else {
+   			// TODO: Throw an exception? We got neither a string nor something
+   			// that looks like a compatible lessphp cache structure.
+   			return null;
+   		}
+
+   		if ($root !== null) {
+   			// If we have a root value which means we should rebuild.
+   			$out = array();
+   			$out['root'] = $root;
+   			$out['compiled'] = $this->compileFile($root);
+   			$out['files'] = $this->scss->getParsedFiles();
+   			$out['updated'] = time();
+   			return $out;
+   		} else {
+   			// No changes, pass back the structure
+   			// we were given initially.
+   			return $in;
+   		}
+   	}
+
     /**
      * Constructor
      *

From 89d9dabd18f8f068c62d7d0949da0c608ae5ed94 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Mon, 18 Dec 2017 17:32:42 -0500
Subject: [PATCH 025/254] Coding style (phpcs) cleanup

---
 Makefile                             |   2 +-
 example/Server.php                   | 124 +++++++++---------
 scss.inc.php                         |   3 +-
 src/Block.php                        |   2 +-
 src/Compiler.php                     |  48 +++++--
 src/Formatter.php                    |  27 ++--
 src/Formatter/Compressed.php         |   4 +-
 src/Formatter/Debug.php              |  10 +-
 src/Formatter/Nested.php             |  14 +-
 src/Formatter/OutputBlock.php        |   4 +-
 src/SourceMap/Base64VLQEncoder.php   | 136 ++++++++++++--------
 src/SourceMap/SourceMapGenerator.php | 186 ++++++++++++++++++---------
 src/Util.php                         |   8 +-
 tests/ServerTest.php                 |   1 +
 14 files changed, 342 insertions(+), 227 deletions(-)

diff --git a/Makefile b/Makefile
index 5115941c..fb50ffdb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,4 +5,4 @@ compat:
 	TEST_SCSS_COMPAT=1 vendor/bin/phpunit --colors tests | tail -2
 
 standard:
-	vendor/bin/phpcs --standard=PSR2 bin src tests *.php
+	vendor/bin/phpcs --standard=PSR2 bin src example tests *.php
diff --git a/example/Server.php b/example/Server.php
index a6e8b986..a8dc0457 100644
--- a/example/Server.php
+++ b/example/Server.php
@@ -417,67 +417,69 @@ public function checkedCachedCompile($in, $out, $force = false)
     }
 
     /**
-   	 * Execute scssphp on a .scss file or a scssphp cache structure
-   	 *
-   	 * The scssphp cache structure contains information about a specific
-   	 * scss file having been parsed. It can be used as a hint for future
-   	 * calls to determine whether or not a rebuild is required.
-   	 *
-   	 * The cache structure contains two important keys that may be used
-   	 * externally:
-   	 *
-   	 * compiled: The final compiled CSS
-   	 * updated: The time (in seconds) the CSS was last compiled
-   	 *
-   	 * The cache structure is a plain-ol' PHP associative array and can
-   	 * be serialized and unserialized without a hitch.
-   	 *
-   	 * @param mixed $in Input
-   	 * @param bool $force Force rebuild?
-   	 * @return array scssphp cache structure
-   	 */
-   	public function cachedCompile($in, $force = false) {
-   		// assume no root
-   		$root = null;
-
-   		if (is_string($in)) {
-   			$root = $in;
-   		} elseif (is_array($in) and isset($in['root'])) {
-   			if ($force or ! isset($in['files'])) {
-   				// If we are forcing a recompile or if for some reason the
-   				// structure does not contain any file information we should
-   				// specify the root to trigger a rebuild.
-   				$root = $in['root'];
-   			} elseif (isset($in['files']) and is_array($in['files'])) {
-   				foreach ($in['files'] as $fname => $ftime ) {
-   					if (!file_exists($fname) or filemtime($fname) > $ftime) {
-   						// One of the files we knew about previously has changed
-   						// so we should look at our incoming root again.
-   						$root = $in['root'];
-   						break;
-   					}
-   				}
-   			}
-   		} else {
-   			// TODO: Throw an exception? We got neither a string nor something
-   			// that looks like a compatible lessphp cache structure.
-   			return null;
-   		}
-
-   		if ($root !== null) {
-   			// If we have a root value which means we should rebuild.
-   			$out = array();
-   			$out['root'] = $root;
-   			$out['compiled'] = $this->compileFile($root);
-   			$out['files'] = $this->scss->getParsedFiles();
-   			$out['updated'] = time();
-   			return $out;
-   		} else {
-   			// No changes, pass back the structure
-   			// we were given initially.
-   			return $in;
-   		}
-   	}
+     * Execute scssphp on a .scss file or a scssphp cache structure
+     *
+     * The scssphp cache structure contains information about a specific
+     * scss file having been parsed. It can be used as a hint for future
+     * calls to determine whether or not a rebuild is required.
+     *
+     * The cache structure contains two important keys that may be used
+     * externally:
+     *
+     * compiled: The final compiled CSS
+     * updated: The time (in seconds) the CSS was last compiled
+     *
+     * The cache structure is a plain-ol' PHP associative array and can
+     * be serialized and unserialized without a hitch.
+     *
+     * @param mixed   $in    Input
+     * @param boolean $force Force rebuild?
+     *
+     * @return array scssphp cache structure
+     */
+    public function cachedCompile($in, $force = false)
+    {
+        // assume no root
+        $root = null;
+
+        if (is_string($in)) {
+            $root = $in;
+        } elseif (is_array($in) and isset($in['root'])) {
+            if ($force or ! isset($in['files'])) {
+                // If we are forcing a recompile or if for some reason the
+                // structure does not contain any file information we should
+                // specify the root to trigger a rebuild.
+                $root = $in['root'];
+            } elseif (isset($in['files']) and is_array($in['files'])) {
+                foreach ($in['files'] as $fname => $ftime) {
+                    if (! file_exists($fname) or filemtime($fname) > $ftime) {
+                        // One of the files we knew about previously has changed
+                        // so we should look at our incoming root again.
+                        $root = $in['root'];
+                        break;
+                    }
+                }
+            }
+        } else {
+            // TODO: Throw an exception? We got neither a string nor something
+            // that looks like a compatible lessphp cache structure.
+            return null;
+        }
+
+        if ($root !== null) {
+            // If we have a root value which means we should rebuild.
+            $out = array();
+            $out['root'] = $root;
+            $out['compiled'] = $this->compileFile($root);
+            $out['files'] = $this->scss->getParsedFiles();
+            $out['updated'] = time();
+            return $out;
+        } else {
+            // No changes, pass back the structure
+            // we were given initially.
+            return $in;
+        }
+    }
 
     /**
      * Constructor
diff --git a/scss.inc.php b/scss.inc.php
index 77303ba3..13c84bf5 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -11,7 +11,7 @@
     include_once __DIR__ . '/src/Compiler/Environment.php';
     include_once __DIR__ . '/src/Exception/CompilerException.php';
     include_once __DIR__ . '/src/Exception/ParserException.php';
-    include_once __DIR__ . '/src/Exception/RangeException.php';  //exp
+    include_once __DIR__ . '/src/Exception/RangeException.php';
     include_once __DIR__ . '/src/Exception/ServerException.php';
     include_once __DIR__ . '/src/Formatter.php';
     include_once __DIR__ . '/src/Formatter/Compact.php';
@@ -24,7 +24,6 @@
     include_once __DIR__ . '/src/Node.php';
     include_once __DIR__ . '/src/Node/Number.php';
     include_once __DIR__ . '/src/Parser.php';
-//    include_once __DIR__ . '/src/example/Server.php';
     include_once __DIR__ . '/src/SourceMap/Base64VLQEncoder.php';
     include_once __DIR__ . '/src/SourceMap/SourceMapGenerator.php';
     include_once __DIR__ . '/src/Type.php';
diff --git a/src/Block.php b/src/Block.php
index 87cfd6d8..fc21e5a4 100644
--- a/src/Block.php
+++ b/src/Block.php
@@ -29,7 +29,7 @@ class Block
     public $parent;
 
     /**
-     * @var string;
+     * @var string
      */
     public $sourceName;
 
diff --git a/src/Compiler.php b/src/Compiler.php
index 2dc50531..64399b2a 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -128,13 +128,17 @@ class Compiler
     protected $sourceMap = self::SOURCE_MAP_NONE;
     protected $sourceMapOptions = [];
 
-    /** @var string|Formatter */
+    /**
+     * @var string|\Leafo\ScssPhp\Formatter
+     */
     protected $formatter = 'Leafo\ScssPhp\Formatter\Nested';
 
     protected $rootEnv;
     protected $rootBlock;
 
-    /** @var  Environment */
+    /**
+     * @var \Leafo\ScssPhp\Compiler\Environment
+     */
     protected $env;
     protected $scope;
     protected $storeEnv;
@@ -202,22 +206,30 @@ public function compile($code, $path = null)
         $this->popEnv();
 
         $sourceMapGenerator = null;
-        if($this->sourceMap &&  $this->sourceMap !== self::SOURCE_MAP_NONE) {
+
+        if ($this->sourceMap && $this->sourceMap !== self::SOURCE_MAP_NONE) {
             $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
         }
+
         $out = $this->formatter->format($this->scope, $sourceMapGenerator);
-        if(!empty($out) && $this->sourceMap &&  $this->sourceMap !== self::SOURCE_MAP_NONE) {
-            $sourceMap = $sourceMapGenerator->generateJson();
 
+        if (! empty($out) && $this->sourceMap && $this->sourceMap !== self::SOURCE_MAP_NONE) {
+            $sourceMap    = $sourceMapGenerator->generateJson();
             $sourceMapUrl = null;
-            if($this->sourceMap == self::SOURCE_MAP_INLINE) {
-                $sourceMapUrl = sprintf('data:application/json,%s', self::encodeURIComponent($sourceMap));
-            } elseif ($this->sourceMap == self::SOURCE_MAP_FILE) {
-                $sourceMapUrl = $sourceMapGenerator->saveMap($sourceMap);
+
+            switch ($this->sourceMap) {
+                case self::SOURCE_MAP_INLINE:
+                    $sourceMapUrl = sprintf('data:application/json,%s', self::encodeURIComponent($sourceMap));
+                    break;
+
+                case self::SOURCE_MAP_FILE:
+                    $sourceMapUrl = $sourceMapGenerator->saveMap($sourceMap);
+                    break;
             }
 
             $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
         }
+
         return $out;
     }
 
@@ -1110,7 +1122,8 @@ protected function evalSelectors($selectors)
     /**
      * @param array $sourceMapOptions
      */
-    public function setSourceMapOptions($sourceMapOptions) {
+    public function setSourceMapOptions($sourceMapOptions)
+    {
         $this->sourceMapOptions = $sourceMapOptions;
     }
 
@@ -1959,7 +1972,7 @@ protected function isTruthy($value)
      *
      * @param string $value
      *
-     * @return bool
+     * @return boolean
      */
     protected function isImmediateRelationshipCombinator($value)
     {
@@ -3338,9 +3351,14 @@ public function setLineNumberStyle($lineNumberStyle)
     }
 
     /**
-     * @param int $sourceMap
+     * Set source map option
+     *
+     * @api
+     *
+     * @param integer $sourceMap
      */
-    public function setSourceMap($sourceMap) {
+    public function setSourceMap($sourceMap)
+    {
         $this->sourceMap = $sourceMap;
     }
 
@@ -5302,8 +5320,10 @@ protected function libInspect($args)
         return $args[0];
     }
 
-    public static function encodeURIComponent($string){
+    public static function encodeURIComponent($string)
+    {
         $revert = array('%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')');
+
         return strtr(rawurlencode($string), $revert);
     }
 }
diff --git a/src/Formatter.php b/src/Formatter.php
index 7939113b..68d20c88 100644
--- a/src/Formatter.php
+++ b/src/Formatter.php
@@ -62,18 +62,18 @@ abstract class Formatter
     public $keepSemicolons;
 
     /**
-     * @var OutputBlock;
+     * @var \Leafo\ScssPhp\Formatter\OutputBlock
      */
     protected $currentBlock;
 
 
     /**
-     * @var int
+     * @var integer
      */
     protected $currentLine;
 
     /**
-     * @var int;
+     * @var integer
      */
     protected $currentColumn;
 
@@ -231,13 +231,14 @@ protected function block(OutputBlock $block)
      */
     public function format(OutputBlock $block, SourceMapGenerator $sourceMapGenerator = null)
     {
-        if($sourceMapGenerator) {
+        $this->sourceMapGenerator = null;
+
+        if ($sourceMapGenerator) {
             $this->currentLine = 1;
             $this->currentColumn = 0;
             $this->sourceMapGenerator = $sourceMapGenerator;
-        } else {
-            $this->sourceMapGenerator = null;
         }
+
         ob_start();
 
         $this->block($block);
@@ -248,10 +249,11 @@ public function format(OutputBlock $block, SourceMapGenerator $sourceMapGenerato
     }
 
     /**
-     * @param $str
+     * @param string $str
      */
-    protected function write($str) {
-        if($this->sourceMapGenerator) {
+    protected function write($str)
+    {
+        if ($this->sourceMapGenerator) {
             $this->sourceMapGenerator->addMapping(
                 $this->currentLine,
                 $this->currentColumn,
@@ -265,11 +267,8 @@ protected function write($str) {
             $this->currentLine += $lineCount-1;
 
             $lastLine = array_pop($lines);
-            if($lineCount == 1) {
-                $this->currentColumn += mb_strlen($lastLine);
-            } else {
-                $this->currentColumn = mb_strlen($lastLine);
-            }
+
+            $this->currentColumn = ($lineCount === 1 ? $this->currentColumn : 0) + strlen($lastLine);
         }
 
         echo $str;
diff --git a/src/Formatter/Compressed.php b/src/Formatter/Compressed.php
index 69a67850..21cbf28e 100644
--- a/src/Formatter/Compressed.php
+++ b/src/Formatter/Compressed.php
@@ -53,10 +53,10 @@ public function blockLines(OutputBlock $block)
             }
         }
 
-        $this->write( $inner . implode($glue, $block->lines));
+        $this->write($inner . implode($glue, $block->lines));
 
         if (! empty($block->children)) {
-            $this->write( $this->break);
+            $this->write($this->break);
         }
     }
 }
diff --git a/src/Formatter/Debug.php b/src/Formatter/Debug.php
index cb29641a..b31c8c7a 100644
--- a/src/Formatter/Debug.php
+++ b/src/Formatter/Debug.php
@@ -58,7 +58,7 @@ protected function blockLines(OutputBlock $block)
         }
 
         foreach ($block->lines as $index => $line) {
-            $this->write( "{$indent}block->lines[{$index}]: $line\n");
+            $this->write("{$indent}block->lines[{$index}]: $line\n");
         }
     }
 
@@ -70,13 +70,13 @@ protected function blockSelectors(OutputBlock $block)
         $indent = $this->indentStr();
 
         if (empty($block->selectors)) {
-            $this->write( "{$indent}block->selectors: []\n");
+            $this->write("{$indent}block->selectors: []\n");
 
             return;
         }
 
         foreach ($block->selectors as $index => $selector) {
-            $this->write( "{$indent}block->selectors[{$index}]: $selector\n");
+            $this->write("{$indent}block->selectors[{$index}]: $selector\n");
         }
     }
 
@@ -88,7 +88,7 @@ protected function blockChildren(OutputBlock $block)
         $indent = $this->indentStr();
 
         if (empty($block->children)) {
-            $this->write( "{$indent}block->children: []\n");
+            $this->write("{$indent}block->children: []\n");
 
             return;
         }
@@ -109,7 +109,7 @@ protected function block(OutputBlock $block)
     {
         $indent = $this->indentStr();
 
-        $this->write( "{$indent}block->type: {$block->type}\n" .
+        $this->write("{$indent}block->type: {$block->type}\n" .
              "{$indent}block->depth: {$block->depth}\n");
 
         $this->currentBlock = $block;
diff --git a/src/Formatter/Nested.php b/src/Formatter/Nested.php
index 48e19ef7..7573a596 100644
--- a/src/Formatter/Nested.php
+++ b/src/Formatter/Nested.php
@@ -65,10 +65,10 @@ protected function blockLines(OutputBlock $block)
             }
         }
 
-        $this->write( $inner . implode($glue, $block->lines));
+        $this->write($inner . implode($glue, $block->lines));
 
         if (! empty($block->children)) {
-            $this->write( $this->break);
+            $this->write($this->break);
         }
     }
 
@@ -79,7 +79,7 @@ protected function blockSelectors(OutputBlock $block)
     {
         $inner = $this->indentStr();
 
-        $this->write( $inner
+        $this->write($inner
             . implode($this->tagSeparator, $block->selectors)
             . $this->open . $this->break);
     }
@@ -93,13 +93,13 @@ protected function blockChildren(OutputBlock $block)
             $this->block($child);
 
             if ($i < count($block->children) - 1) {
-                $this->write( $this->break);
+                $this->write($this->break);
 
                 if (isset($block->children[$i + 1])) {
                     $next = $block->children[$i + 1];
 
                     if ($next->depth === max($block->depth, 1) && $child->depth >= $next->depth) {
-                        $this->write( $this->break);
+                        $this->write($this->break);
                     }
                 }
             }
@@ -141,11 +141,11 @@ protected function block(OutputBlock $block)
         if (! empty($block->selectors)) {
             $this->indentLevel--;
 
-            $this->write( $this->close);
+            $this->write($this->close);
         }
 
         if ($block->type === 'root') {
-            $this->write( $this->break);
+            $this->write($this->break);
         }
     }
 
diff --git a/src/Formatter/OutputBlock.php b/src/Formatter/OutputBlock.php
index 7d233a8d..e4092175 100644
--- a/src/Formatter/OutputBlock.php
+++ b/src/Formatter/OutputBlock.php
@@ -54,12 +54,12 @@ class OutputBlock
     public $sourceName;
 
     /**
-     * @var int
+     * @var integer
      */
     public $sourceLine;
 
     /**
-     * @var int
+     * @var integer
      */
     public $sourceColumn;
 }
diff --git a/src/SourceMap/Base64VLQEncoder.php b/src/SourceMap/Base64VLQEncoder.php
index 14652fbe..d1d1ed2a 100644
--- a/src/SourceMap/Base64VLQEncoder.php
+++ b/src/SourceMap/Base64VLQEncoder.php
@@ -1,140 +1,167 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: nico
- * Date: 08/11/17
- * Time: 19:14
+ * SCSSPHP
+ *
+ * @copyright 2012-2017 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
  */
 
 namespace Leafo\ScssPhp\SourceMap;
 
-
-class Base64VLQEncoder {
+/**
+ * Base64 VLQ Encoder
+ *
+ * {@internal Derivative of oyejorge/less.php's lib/SourceMap/Base64VLQ.php, relicensed with permission. }}
+ *
+ * @author Josh Schmidt <oyejorge@gmail.com>
+ * @author Nicolas FRANÇOIS <nicolas.francois@frog-labs.com>
+ */
+class Base64VLQEncoder
+{
     /**
      * Shift
      *
      * @var integer
      */
     private $shift = 5;
+
     /**
      * Mask
      *
      * @var integer
      */
     private $mask = 0x1F; // == (1 << shift) == 0b00011111
+
     /**
      * Continuation bit
      *
      * @var integer
      */
     private $continuationBit = 0x20; // == (mask - 1 ) == 0b00100000
+
     /**
      * Char to integer map
      *
      * @var array
      */
     private $charToIntMap = array(
-        'A' => 0, 'B' => 1, 'C' => 2, 'D' => 3, 'E' => 4, 'F' => 5, 'G' => 6,
-        'H' => 7,'I' => 8, 'J' => 9, 'K' => 10, 'L' => 11, 'M' => 12, 'N' => 13,
-        'O' => 14, 'P' => 15, 'Q' => 16, 'R' => 17, 'S' => 18, 'T' => 19, 'U' => 20,
-        'V' => 21, 'W' => 22, 'X' => 23, 'Y' => 24, 'Z' => 25, 'a' => 26, 'b' => 27,
-        'c' => 28, 'd' => 29, 'e' => 30, 'f' => 31, 'g' => 32, 'h' => 33, 'i' => 34,
-        'j' => 35, 'k' => 36, 'l' => 37, 'm' => 38, 'n' => 39, 'o' => 40, 'p' => 41,
-        'q' => 42, 'r' => 43, 's' => 44, 't' => 45, 'u' => 46, 'v' => 47, 'w' => 48,
-        'x' => 49, 'y' => 50, 'z' => 51, 0 => 52, 1 => 53, 2 => 54, 3 => 55, 4 => 56,
-        5 => 57,	6 => 58, 7 => 59, 8 => 60, 9 => 61, '+' => 62, '/' => 63,
+        'A' => 0,  'B' => 1,  'C' => 2,  'D' => 3,  'E' => 4,  'F' => 5,  'G' => 6,  'H' => 7,
+        'I' => 8,  'J' => 9,  'K' => 10, 'L' => 11, 'M' => 12, 'N' => 13, 'O' => 14, 'P' => 15,
+        'Q' => 16, 'R' => 17, 'S' => 18, 'T' => 19, 'U' => 20, 'V' => 21, 'W' => 22, 'X' => 23,
+        'Y' => 24, 'Z' => 25, 'a' => 26, 'b' => 27, 'c' => 28, 'd' => 29, 'e' => 30, 'f' => 31,
+        'g' => 32, 'h' => 33, 'i' => 34, 'j' => 35, 'k' => 36, 'l' => 37, 'm' => 38, 'n' => 39,
+        'o' => 40, 'p' => 41, 'q' => 42, 'r' => 43, 's' => 44, 't' => 45, 'u' => 46, 'v' => 47,
+        'w' => 48, 'x' => 49, 'y' => 50, 'z' => 51,   0 => 52,   1 => 53,   2 => 54,   3 => 55,
+          4 => 56,   5 => 57,   6 => 58,   7 => 59,   8 => 60,   9 => 61, '+' => 62, '/' => 63,
     );
+
     /**
      * Integer to char map
      *
      * @var array
      */
     private $intToCharMap = array(
-        0 => 'A', 1 => 'B', 2 => 'C', 3 => 'D', 4 => 'E', 5 => 'F', 6 => 'G',
-        7 => 'H', 8 => 'I', 9 => 'J', 10 => 'K', 11 => 'L', 12 => 'M', 13 => 'N',
-        14 => 'O', 15 => 'P', 16 => 'Q', 17 => 'R', 18 => 'S', 19 => 'T', 20 => 'U',
-        21 => 'V', 22 => 'W', 23 => 'X', 24 => 'Y', 25 => 'Z', 26 => 'a', 27 => 'b',
-        28 => 'c', 29 => 'd', 30 => 'e', 31 => 'f', 32 => 'g', 33 => 'h', 34 => 'i',
-        35 => 'j', 36 => 'k', 37 => 'l', 38 => 'm', 39 => 'n', 40 => 'o', 41 => 'p',
-        42 => 'q', 43 => 'r', 44 => 's', 45 => 't', 46 => 'u', 47 => 'v', 48 => 'w',
-        49 => 'x', 50 => 'y', 51 => 'z', 52 => '0', 53 => '1', 54 => '2', 55 => '3',
-        56 => '4', 57 => '5', 58 => '6', 59 => '7', 60 => '8', 61 => '9', 62 => '+',
-        63 => '/',
+         0 => 'A',  1 => 'B',  2 => 'C',  3 => 'D',  4 => 'E',  5 => 'F',  6 => 'G',  7 => 'H',
+         8 => 'I',  9 => 'J', 10 => 'K', 11 => 'L', 12 => 'M', 13 => 'N', 14 => 'O', 15 => 'P',
+        16 => 'Q', 17 => 'R', 18 => 'S', 19 => 'T', 20 => 'U', 21 => 'V', 22 => 'W', 23 => 'X',
+        24 => 'Y', 25 => 'Z', 26 => 'a', 27 => 'b', 28 => 'c', 29 => 'd', 30 => 'e', 31 => 'f',
+        32 => 'g', 33 => 'h', 34 => 'i', 35 => 'j', 36 => 'k', 37 => 'l', 38 => 'm', 39 => 'n',
+        40 => 'o', 41 => 'p', 42 => 'q', 43 => 'r', 44 => 's', 45 => 't', 46 => 'u', 47 => 'v',
+        48 => 'w', 49 => 'x', 50 => 'y', 51 => 'z', 52 => '0', 53 => '1', 54 => '2', 55 => '3',
+        56 => '4', 57 => '5', 58 => '6', 59 => '7', 60 => '8', 61 => '9', 62 => '+', 63 => '/',
     );
+
     /**
      * Constructor
      */
-    public function __construct(){
+    public function __construct()
+    {
         // I leave it here for future reference
-        // foreach(str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') as $i => $char)
+        // foreach (str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/') as $i => $char)
         // {
-        //	 $this->charToIntMap[$char] = $i;
-        //	 $this->intToCharMap[$i] = $char;
+        //     $this->charToIntMap[$char] = $i;
+        //     $this->intToCharMap[$i] = $char;
         // }
     }
+
     /**
      * Convert from a two-complement value to a value where the sign bit is
-     * is placed in the least significant bit.	For example, as decimals:
-     *	 1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
-     *	 2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
+     * is placed in the least significant bit. For example, as decimals:
+     *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
+     *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
      * We generate the value for 32 bit machines, hence -2147483648 becomes 1, not 4294967297,
      * even on a 64 bit machine.
      * @param string $aValue
      */
-    public function toVLQSigned($aValue){
+    public function toVLQSigned($aValue)
+    {
         return 0xffffffff & ($aValue < 0 ? ((-$aValue) << 1) + 1 : ($aValue << 1) + 0);
     }
+
     /**
      * Convert to a two-complement value from a value where the sign bit is
      * is placed in the least significant bit. For example, as decimals:
-     *	 2 (10 binary) becomes 1, 3 (11 binary) becomes -1
-     *	 4 (100 binary) becomes 2, 5 (101 binary) becomes -2
+     *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
+     *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
      * We assume that the value was generated with a 32 bit machine in mind.
      * Hence
-     *	 1 becomes -2147483648
+     *   1 becomes -2147483648
      * even on a 64 bit machine.
      * @param integer $aValue
      */
-    public function fromVLQSigned($aValue){
+    public function fromVLQSigned($aValue)
+    {
         return $aValue & 1 ? $this->zeroFill(~$aValue + 2, 1) | (-1 - 0x7fffffff) : $this->zeroFill($aValue, 1);
     }
+
     /**
      * Return the base 64 VLQ encoded value.
      *
      * @param string $aValue The value to encode
      * @return string The encoded value
      */
-    public function encode($aValue){
+    public function encode($aValue)
+    {
         $encoded = '';
         $vlq = $this->toVLQSigned($aValue);
-        do
-        {
+
+        do {
             $digit = $vlq & $this->mask;
             $vlq = $this->zeroFill($vlq, $this->shift);
-            if($vlq > 0){
+
+            if ($vlq > 0) {
                 $digit |= $this->continuationBit;
             }
+
             $encoded .= $this->base64Encode($digit);
-        } while($vlq > 0);
+        } while ($vlq > 0);
+
         return $encoded;
     }
+
     /**
      * Return the value decoded from base 64 VLQ.
      *
      * @param string $encoded The encoded value to decode
      * @return integer The decoded value
      */
-    public function decode($encoded){
+    public function decode($encoded)
+    {
         $vlq = 0;
         $i = 0;
-        do
-        {
+
+        do {
             $digit = $this->base64Decode($encoded[$i]);
             $vlq |= ($digit & $this->mask) << ($i * $this->shift);
             $i++;
-        } while($digit & $this->continuationBit);
+        } while ($digit & $this->continuationBit);
+
         return $this->fromVLQSigned($vlq);
     }
+
     /**
      * Right shift with zero fill.
      *
@@ -142,9 +169,11 @@ public function decode($encoded){
      * @param integer $b number of bits to shift
      * @return integer
      */
-    public function zeroFill($a, $b){
+    public function zeroFill($a, $b)
+    {
         return ($a >= 0) ? ($a >> $b) : ($a >> $b) & (PHP_INT_MAX >> ($b - 1));
     }
+
     /**
      * Encode single 6-bit digit as base64.
      *
@@ -152,12 +181,15 @@ public function zeroFill($a, $b){
      * @return string
      * @throws Exception If the number is invalid
      */
-    public function base64Encode($number){
-        if($number < 0 || $number > 63){
+    public function base64Encode($number)
+    {
+        if ($number < 0 || $number > 63) {
             throw new Exception(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
         }
+
         return $this->intToCharMap[$number];
     }
+
     /**
      * Decode single 6-bit digit from base64
      *
@@ -165,10 +197,12 @@ public function base64Encode($number){
      * @return number
      * @throws Exception If the number is invalid
      */
-    public function base64Decode($char){
-        if(!array_key_exists($char, $this->charToIntMap)){
+    public function base64Decode($char)
+    {
+        if (! array_key_exists($char, $this->charToIntMap)) {
             throw new Exception(sprintf('Invalid base 64 digit "%s" given.', $char));
         }
+
         return $this->charToIntMap[$char];
     }
 }
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 300a5a08..31905b10 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -1,20 +1,33 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: nico
- * Date: 08/11/17
- * Time: 19:16
+ * SCSSPHP
+ *
+ * @copyright 2012-2017 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
  */
 
 namespace Leafo\ScssPhp\SourceMap;
 
 use Leafo\ScssPhp\Exception\CompilerException;
 
-class SourceMapGenerator {
+/**
+ * Source Map Generator
+ *
+ * {@internal Derivative of oyejorge/less.php's lib/SourceMap/Generator.php, relicensed with permission. }}
+ *
+ * @author Josh Schmidt <oyejorge@gmail.com>
+ * @author Nicolas FRANÇOIS <nicolas.francois@frog-labs.com>
+ */
+class SourceMapGenerator
+{
     /**
      * What version of source map does the generator generate?
      */
     const VERSION = 3;
+
     /**
      * Array of default options
      *
@@ -25,16 +38,22 @@ class SourceMapGenerator {
         // on a server or removing repeated values in the 'sources' entry.
         // This value is prepended to the individual entries in the 'source' field.
         'sourceRoot' => '',
+
         // an optional name of the generated code that this source map is associated with.
         'sourceMapFilename' => null,
+
         // url of the map
         'sourceMapURL' => null,
+
         // absolute path to a file to write the map to
         'sourceMapWriteTo' => null,
+
         // output source contents?
         'outputSourceFiles' => false,
+
         // base path for filename normalization
         'sourceMapRootpath' => '',
+
         // base path for filename normalization
         'sourceMapBasepath' => ''
     );
@@ -42,9 +61,10 @@ class SourceMapGenerator {
     /**
      * The base64 VLQ encoder
      *
-     * @var Base64VLQEncoder
+     * @var \Leafo\ScssPhp\SourceMap\Base64VLQEncoder
      */
     protected $encoder;
+
     /**
      * Array of mappings
      *
@@ -58,6 +78,7 @@ class SourceMapGenerator {
      * @var array
      */
     protected $contentsMap = array();
+
     /**
      * File to content map
      *
@@ -65,12 +86,14 @@ class SourceMapGenerator {
      */
     protected $sources = array();
     protected $source_keys = array();
+
     /**
      * @var array
      */
     private $options;
 
-    public function __construct(array $options = []) {
+    public function __construct(array $options = [])
+    {
         $this->options = array_merge($this->defaultOptions, $options);
         $this->encoder = new Base64VLQEncoder();
     }
@@ -84,7 +107,8 @@ public function __construct(array $options = []) {
      * @param integer $originalColumn The column number in original file
      * @param string $sourceFile The original source file
      */
-    public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile) {
+    public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile)
+    {
         $this->mappings[] = array(
             'generated_line' => $generatedLine,
             'generated_column' => $generatedColumn,
@@ -97,26 +121,30 @@ public function addMapping($generatedLine, $generatedColumn, $originalLine, $ori
     }
 
     /**
-   	 * Saves the source map to a file
-   	 *
-   	 * @param string $file The absolute path to a file
-   	 * @param string $content The content to write
-   	 * @throws Exception If the file could not be saved
-   	 */
-   	public function saveMap($content){
-   	    $file = $this->options['sourceMapWriteTo'];
-   		$dir = dirname($file);
-   		// directory does not exist
-   		if( !is_dir($dir) ){
-   			// FIXME: create the dir automatically?
-   			throw new CompilerException(sprintf('The directory "%s" does not exist. Cannot save the source map.', $dir));
-   		}
-   		// FIXME: proper saving, with dir write check!
-   		if(file_put_contents($file, $content) === false){
-   			throw new CompilerException(sprintf('Cannot save the source map to "%s"', $file));
-   		}
-   		return $this->options['sourceMapURL'];
-   	}
+     * Saves the source map to a file
+     *
+     * @param string $file The absolute path to a file
+     * @param string $content The content to write
+     * @throws Exception If the file could not be saved
+     */
+    public function saveMap($content)
+    {
+        $file = $this->options['sourceMapWriteTo'];
+        $dir  = dirname($file);
+
+        // directory does not exist
+        if (! is_dir($dir)) {
+            // FIXME: create the dir automatically?
+            throw new CompilerException(sprintf('The directory "%s" does not exist. Cannot save the source map.', $dir));
+        }
+
+        // FIXME: proper saving, with dir write check!
+        if (file_put_contents($file, $content) === false) {
+            throw new CompilerException(sprintf('Cannot save the source map to "%s"', $file));
+        }
+
+        return $this->options['sourceMapURL'];
+    }
 
     /**
      * Generates the JSON source map
@@ -124,40 +152,44 @@ public function saveMap($content){
      * @return string
      * @see https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#
      */
-    public function generateJson() {
+    public function generateJson()
+    {
         $sourceMap = array();
-        $mappings = $this->generateMappings();
+        $mappings  = $this->generateMappings();
+
         // File version (always the first entry in the object) and must be a positive integer.
         $sourceMap['version'] = self::VERSION;
+
         // An optional name of the generated code that this source map is associated with.
         $file = $this->options['sourceMapFilename'];
-        if($file) {
+
+        if ($file) {
             $sourceMap['file'] = $file;
         }
-        // An optional source root, useful for relocating source files on a server or removing repeated values in the 'sources' entry.	This value is prepended to the individual entries in the 'source' field.
+
+        // An optional source root, useful for relocating source files on a server or removing repeated values in the
+        // 'sources' entry. This value is prepended to the individual entries in the 'source' field.
         $root = $this->options['sourceRoot'];
-        if($root) {
-            $sourceMap['sourceRoot'] = $root;
-        }
-        // A list of original sources used by the 'mappings' entry.
-        $sourceMap['sources'] = array();
-        foreach($this->sources as $source_uri => $source_filename) {
-            $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
+
+        if ($root) {
+            $sourceMap['names'] = array();
         }
-        // A list of symbol names used by the 'mappings' entry.
-        $sourceMap['names'] = array();
+
         // A string with the encoded mapping data.
         $sourceMap['mappings'] = $mappings;
-        if($this->options['outputSourceFiles']) {
+
+        if ($this->options['outputSourceFiles']) {
             // An optional list of source content, useful when the 'source' can't be hosted.
             // The contents are listed in the same order as the sources above.
             // 'null' may be used if some original sources should be retrieved by name.
             $sourceMap['sourcesContent'] = $this->getSourcesContent();
         }
+
         // less.js compat fixes
-        if(count($sourceMap['sources']) && empty($sourceMap['sourceRoot'])) {
+        if (count($sourceMap['sources']) && empty($sourceMap['sourceRoot'])) {
             unset($sourceMap['sourceRoot']);
         }
+
         return json_encode($sourceMap);
     }
 
@@ -166,14 +198,18 @@ public function generateJson() {
      *
      * @return array|null
      */
-    protected function getSourcesContent() {
-        if(empty($this->sources)) {
+    protected function getSourcesContent()
+    {
+        if (empty($this->sources)) {
             return null;
         }
+
         $content = array();
-        foreach($this->sources as $sourceFile) {
+
+        foreach ($this->sources as $sourceFile) {
             $content[] = file_get_contents($sourceFile);
         }
+
         return $content;
     }
 
@@ -182,31 +218,41 @@ protected function getSourcesContent() {
      *
      * @return string
      */
-    public function generateMappings() {
-        if(!count($this->mappings)) {
+    public function generateMappings()
+    {
+        if (! count($this->mappings)) {
             return '';
         }
+
         $this->source_keys = array_flip(array_keys($this->sources));
+
         // group mappings by generated line number.
         $groupedMap = $groupedMapEncoded = array();
-        foreach($this->mappings as $m) {
+
+        foreach ($this->mappings as $m) {
             $groupedMap[$m['generated_line']][] = $m;
         }
+
         ksort($groupedMap);
         $lastGeneratedLine = $lastOriginalIndex = $lastOriginalLine = $lastOriginalColumn = 0;
-        foreach($groupedMap as $lineNumber => $line_map) {
-            while(++$lastGeneratedLine < $lineNumber) {
+
+        foreach ($groupedMap as $lineNumber => $line_map) {
+            while (++$lastGeneratedLine < $lineNumber) {
                 $groupedMapEncoded[] = ';';
             }
+
             $lineMapEncoded = array();
             $lastGeneratedColumn = 0;
-            foreach($line_map as $m) {
+
+            foreach ($line_map as $m) {
                 $mapEncoded = $this->encoder->encode($m['generated_column'] - $lastGeneratedColumn);
                 $lastGeneratedColumn = $m['generated_column'];
+
                 // find the index
-                if($m['source_file']) {
+                if ($m['source_file']) {
                     $index = $this->findFileIndex($m['source_file']);
-                    if($index !== false) {
+
+                    if ($index !== false) {
                         $mapEncoded .= $this->encoder->encode($index - $lastOriginalIndex);
                         $lastOriginalIndex = $index;
                         // lines are stored 0-based in SourceMap spec version 3
@@ -216,10 +262,13 @@ public function generateMappings() {
                         $lastOriginalColumn = $m['original_column'];
                     }
                 }
+
                 $lineMapEncoded[] = $mapEncoded;
             }
+
             $groupedMapEncoded[] = implode(',', $lineMapEncoded) . ';';
         }
+
         return rtrim(implode($groupedMapEncoded), ';');
     }
 
@@ -227,39 +276,50 @@ public function generateMappings() {
      * Finds the index for the filename
      *
      * @param string $filename
+     *
      * @return integer|false
      */
-    protected function findFileIndex($filename) {
+    protected function findFileIndex($filename)
+    {
         return $this->source_keys[$filename];
     }
 
-    protected function normalizeFilename($filename) {
+    protected function normalizeFilename($filename)
+    {
         $filename = $this->fixWindowsPath($filename);
         $rootpath = $this->options['sourceMapRootpath'];
         $basePath = $this->options['sourceMapBasepath'];
+
         // "Trim" the 'sourceMapBasepath' from the output filename.
-        if(strpos($filename, $basePath) === 0) {
+        if (strpos($filename, $basePath) === 0) {
             $filename = substr($filename, strlen($basePath));
         }
+
         // Remove extra leading path separators.
-        if(strpos($filename, '\\') === 0 || strpos($filename, '/') === 0) {
+        if (strpos($filename, '\\') === 0 || strpos($filename, '/') === 0) {
             $filename = substr($filename, 1);
         }
+
         return $rootpath . $filename;
     }
 
     /**
-     * fix windows paths
-     * @param  string $path
-     * @param bool $addEndSlash
+     * Fix windows paths
+     *
+     * @param string  $path
+     * @param boolean $addEndSlash
+     *
      * @return string
      */
-    public function fixWindowsPath($path, $addEndSlash = false) {
+    public function fixWindowsPath($path, $addEndSlash = false)
+    {
         $slash = ($addEndSlash) ? '/' : '';
-        if(!empty($path)) {
+
+        if (! empty($path)) {
             $path = str_replace('\\', '/', $path);
             $path = rtrim($path, '/') . $slash;
         }
+
         return $path;
     }
 }
diff --git a/src/Util.php b/src/Util.php
index b2a05db8..f5aca7a4 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -25,10 +25,10 @@ class Util
      * Asserts that `value` falls within `range` (inclusive), leaving
      * room for slight floating-point errors.
      *
-     * @param string $name  The name of the value. Used in the error message.
-     * @param Range  $range Range of values.
-     * @param array  $value The value to check.
-     * @param string $unit  The unit of the value. Used in error reporting.
+     * @param string                    $name  The name of the value. Used in the error message.
+     * @param \Leafo\ScssPhp\Base\Range $range Range of values.
+     * @param array                     $value The value to check.
+     * @param string                    $unit  The unit of the value. Used in error reporting.
      *
      * @return mixed `value` adjusted to fall within range, if it was outside by a floating-point margin.
      *
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index fcaea917..290d8fbf 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -8,6 +8,7 @@
  *
  * @link http://leafo.github.io/scssphp
  */
+
 namespace Leafo\ScssPhp\Tests;
 
 require_once __DIR__ . '/../example/Server.php';

From 266913f8bf86b0e6a144e75225c82dc12652bedc Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 19 Dec 2017 16:24:54 -0500
Subject: [PATCH 026/254] More coding style tweaks

---
 src/Compiler.php                     | 57 +++++++++++++---------------
 src/Formatter.php                    |  8 ++--
 src/Formatter/Nested.php             |  1 +
 src/Parser.php                       |  2 +-
 src/SourceMap/Base64VLQEncoder.php   | 19 +++++++---
 src/SourceMap/SourceMapGenerator.php | 14 ++++---
 src/Util.php                         | 16 +++++++-
 7 files changed, 69 insertions(+), 48 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 64399b2a..f12cf7ee 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -65,9 +65,9 @@ class Compiler
     const WITH_SUPPORTS = 4;
     const WITH_ALL      = 7;
 
-    const SOURCE_MAP_NONE = 0;
+    const SOURCE_MAP_NONE   = 0;
     const SOURCE_MAP_INLINE = 1;
-    const SOURCE_MAP_FILE = 2;
+    const SOURCE_MAP_FILE   = 2;
 
     /**
      * @var array
@@ -219,7 +219,7 @@ public function compile($code, $path = null)
 
             switch ($this->sourceMap) {
                 case self::SOURCE_MAP_INLINE:
-                    $sourceMapUrl = sprintf('data:application/json,%s', self::encodeURIComponent($sourceMap));
+                    $sourceMapUrl = sprintf('data:application/json,%s', Util::encodeURIComponent($sourceMap));
                     break;
 
                 case self::SOURCE_MAP_FILE:
@@ -305,14 +305,14 @@ protected function pushExtends($target, $origin, $block)
     protected function makeOutputBlock($type, $selectors = null)
     {
         $out = new OutputBlock;
-        $out->type      = $type;
-        $out->lines     = [];
-        $out->children  = [];
-        $out->parent    = $this->scope;
-        $out->selectors = $selectors;
-        $out->depth     = $this->env->depth;
-        $out->sourceName = $this->env->block->sourceName;
-        $out->sourceLine = $this->env->block->sourceLine;
+        $out->type         = $type;
+        $out->lines        = [];
+        $out->children     = [];
+        $out->parent       = $this->scope;
+        $out->selectors    = $selectors;
+        $out->depth        = $this->env->depth;
+        $out->sourceName   = $this->env->block->sourceName;
+        $out->sourceLine   = $this->env->block->sourceLine;
         $out->sourceColumn = $this->env->block->sourceColumn;
 
         return $out;
@@ -696,7 +696,7 @@ protected function compileMedia(Block $media)
 
             if ($needsWrap) {
                 $wrapped = new Block;
-                $wrapped->sourceName = $media->sourceName;
+                $wrapped->sourceName   = $media->sourceName;
                 $wrapped->sourceIndex  = $media->sourceIndex;
                 $wrapped->sourceLine   = $media->sourceLine;
                 $wrapped->sourceColumn = $media->sourceColumn;
@@ -1119,14 +1119,6 @@ protected function evalSelectors($selectors)
         return $selectors;
     }
 
-    /**
-     * @param array $sourceMapOptions
-     */
-    public function setSourceMapOptions($sourceMapOptions)
-    {
-        $this->sourceMapOptions = $sourceMapOptions;
-    }
-
     /**
      * Evaluate selector
      *
@@ -3351,7 +3343,7 @@ public function setLineNumberStyle($lineNumberStyle)
     }
 
     /**
-     * Set source map option
+     * Enable/disable source maps
      *
      * @api
      *
@@ -3362,6 +3354,18 @@ public function setSourceMap($sourceMap)
         $this->sourceMap = $sourceMap;
     }
 
+    /**
+     * Set source map options
+     *
+     * @api
+     *
+     * @param array $sourceMapOptions
+     */
+    public function setSourceMapOptions($sourceMapOptions)
+    {
+        $this->sourceMapOptions = $sourceMapOptions;
+    }
+
     /**
      * Register function
      *
@@ -5188,7 +5192,7 @@ protected function libToLowerCase($args)
         $string = $this->coerceString($args[0]);
         $stringContent = $this->compileStringContent($string);
 
-        $string[2] = [mb_strtolower($stringContent)];
+        $string[2] = [function_exists('mb_strtolower') ? mb_strtolower($stringContent) : strtolower($stringContent)];
 
         return $string;
     }
@@ -5199,7 +5203,7 @@ protected function libToUpperCase($args)
         $string = $this->coerceString($args[0]);
         $stringContent = $this->compileStringContent($string);
 
-        $string[2] = [mb_strtoupper($stringContent)];
+        $string[2] = [function_exists('mb_strtoupper') ? mb_strtoupper($stringContent) : strtoupper($stringContent)];
 
         return $string;
     }
@@ -5319,11 +5323,4 @@ protected function libInspect($args)
 
         return $args[0];
     }
-
-    public static function encodeURIComponent($string)
-    {
-        $revert = array('%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')');
-
-        return strtr(rawurlencode($string), $revert);
-    }
 }
diff --git a/src/Formatter.php b/src/Formatter.php
index 68d20c88..4d2fdd08 100644
--- a/src/Formatter.php
+++ b/src/Formatter.php
@@ -66,7 +66,6 @@ abstract class Formatter
      */
     protected $currentBlock;
 
-
     /**
      * @var integer
      */
@@ -78,7 +77,7 @@ abstract class Formatter
     protected $currentColumn;
 
     /**
-     * @var SourceMapGenerator
+     * @var \Leafo\ScssPhp\SourceMap\SourceMapGenerator
      */
     protected $sourceMapGenerator;
 
@@ -223,11 +222,10 @@ protected function block(OutputBlock $block)
      *
      * @api
      *
-     * @param \Leafo\ScssPhp\Formatter\OutputBlock $block An abstract syntax tree
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock             $block              An abstract syntax tree
+     * @param \Leafo\ScssPhp\SourceMap\SourceMapGenerator|null $sourceMapGenerator Optional source map generator
      *
-     * @param SourceMapGenerator|null $sourceMapGenerator
      * @return string
-     * @internal param bool $collectSourceMap
      */
     public function format(OutputBlock $block, SourceMapGenerator $sourceMapGenerator = null)
     {
diff --git a/src/Formatter/Nested.php b/src/Formatter/Nested.php
index 7573a596..626fec13 100644
--- a/src/Formatter/Nested.php
+++ b/src/Formatter/Nested.php
@@ -12,6 +12,7 @@
 namespace Leafo\ScssPhp\Formatter;
 
 use Leafo\ScssPhp\Formatter;
+use Leafo\ScssPhp\Formatter\OutputBlock;
 
 /**
  * Nested formatter
diff --git a/src/Parser.php b/src/Parser.php
index cc0a51df..ccac0d3f 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -708,7 +708,7 @@ protected function pushBlock($selectors, $pos = 0)
         list($line, $column) = $this->getSourcePosition($pos);
 
         $b = new Block;
-        $b->sourceName = $this->sourceName;
+        $b->sourceName   = $this->sourceName;
         $b->sourceLine   = $line;
         $b->sourceColumn = $column;
         $b->sourceIndex  = $this->sourceIndex;
diff --git a/src/SourceMap/Base64VLQEncoder.php b/src/SourceMap/Base64VLQEncoder.php
index d1d1ed2a..435a7c60 100644
--- a/src/SourceMap/Base64VLQEncoder.php
+++ b/src/SourceMap/Base64VLQEncoder.php
@@ -94,6 +94,7 @@ public function __construct()
      *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
      * We generate the value for 32 bit machines, hence -2147483648 becomes 1, not 4294967297,
      * even on a 64 bit machine.
+     *
      * @param string $aValue
      */
     public function toVLQSigned($aValue)
@@ -110,6 +111,7 @@ public function toVLQSigned($aValue)
      * Hence
      *   1 becomes -2147483648
      * even on a 64 bit machine.
+     *
      * @param integer $aValue
      */
     public function fromVLQSigned($aValue)
@@ -121,6 +123,7 @@ public function fromVLQSigned($aValue)
      * Return the base 64 VLQ encoded value.
      *
      * @param string $aValue The value to encode
+     *
      * @return string The encoded value
      */
     public function encode($aValue)
@@ -146,6 +149,7 @@ public function encode($aValue)
      * Return the value decoded from base 64 VLQ.
      *
      * @param string $encoded The encoded value to decode
+     *
      * @return integer The decoded value
      */
     public function decode($encoded)
@@ -167,6 +171,7 @@ public function decode($encoded)
      *
      * @param integer $a number to shift
      * @param integer $b number of bits to shift
+     *
      * @return integer
      */
     public function zeroFill($a, $b)
@@ -178,13 +183,15 @@ public function zeroFill($a, $b)
      * Encode single 6-bit digit as base64.
      *
      * @param integer $number
+     *
      * @return string
-     * @throws Exception If the number is invalid
+     *
+     * @throws \Exception If the number is invalid
      */
     public function base64Encode($number)
     {
         if ($number < 0 || $number > 63) {
-            throw new Exception(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
+            throw new \Exception(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
         }
 
         return $this->intToCharMap[$number];
@@ -194,13 +201,15 @@ public function base64Encode($number)
      * Decode single 6-bit digit from base64
      *
      * @param string $char
-     * @return number
-     * @throws Exception If the number is invalid
+     *
+     * @return integer
+     *
+     * @throws \Exception If the number is invalid
      */
     public function base64Decode($char)
     {
         if (! array_key_exists($char, $this->charToIntMap)) {
-            throw new Exception(sprintf('Invalid base 64 digit "%s" given.', $char));
+            throw new \Exception(sprintf('Invalid base 64 digit "%s" given.', $char));
         }
 
         return $this->charToIntMap[$char];
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 31905b10..cbfaa7cf 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -101,11 +101,11 @@ public function __construct(array $options = [])
     /**
      * Adds a mapping
      *
-     * @param integer $generatedLine The line number in generated file
+     * @param integer $generatedLine   The line number in generated file
      * @param integer $generatedColumn The column number in generated file
-     * @param integer $originalLine The line number in original file
-     * @param integer $originalColumn The column number in original file
-     * @param string $sourceFile The original source file
+     * @param integer $originalLine    The line number in original file
+     * @param integer $originalColumn  The column number in original file
+     * @param string  $sourceFile      The original source file
      */
     public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile)
     {
@@ -123,9 +123,10 @@ public function addMapping($generatedLine, $generatedColumn, $originalLine, $ori
     /**
      * Saves the source map to a file
      *
-     * @param string $file The absolute path to a file
+     * @param string $file    The absolute path to a file
      * @param string $content The content to write
-     * @throws Exception If the file could not be saved
+     *
+     * @throws \Leafo\ScssPhp\Exception\CompilerException If the file could not be saved
      */
     public function saveMap($content)
     {
@@ -150,6 +151,7 @@ public function saveMap($content)
      * Generates the JSON source map
      *
      * @return string
+     *
      * @see https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#
      */
     public function generateJson()
diff --git a/src/Util.php b/src/Util.php
index f5aca7a4..d49b265c 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -15,7 +15,7 @@
 use Leafo\ScssPhp\Exception\RangeException;
 
 /**
- * Utilties
+ * Utilty functions
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
  */
@@ -53,4 +53,18 @@ public static function checkRange($name, Range $range, $value, $unit = '')
 
         throw new RangeException("$name {$val} must be between {$range->first} and {$range->last}$unit");
     }
+
+    /**
+     * Encode URI component
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    public static function encodeURIComponent($string)
+    {
+        $revert = array('%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')');
+
+        return strtr(rawurlencode($string), $revert);
+    }
 }

From f92d3e46cf98f1ba7a6af0d8ceee1beeaff75827 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 19 Dec 2017 16:31:11 -0500
Subject: [PATCH 027/254] Version bump to v0.7.3; fixed #135

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 0dd95fe6..e9c0218c 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.2';
+    const VERSION = 'v0.7.3';
 }

From b373570479027fa226afec3762852e54ee560bdd Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 19 Dec 2017 16:45:24 -0500
Subject: [PATCH 028/254] Add --sourcemap flag to bin/pscss

---
 bin/pscss | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/bin/pscss b/bin/pscss
index 70a2be3c..be1cb51c 100755
--- a/bin/pscss
+++ b/bin/pscss
@@ -32,6 +32,7 @@ $debugInfo = false;
 $lineNumbers = false;
 $ignoreErrors = false;
 $encoding = false;
+$sourceMap = false;
 
 /**
  * Parse argument
@@ -77,6 +78,7 @@ Options include:
     --iso8859-1         Use iso8859-1 encoding instead of utf-8 (default utf-8)
     --line-numbers      Annotate selectors with comments referring to the source file and line number
     -p=precision        Set decimal number precision (default 10)
+    --sourcemap         Create source map file
     -T                  Dump formatted parse tree
     -v, --version       Print the version
 
@@ -108,6 +110,11 @@ EOT;
         continue;
     }
 
+    if ($argv[$i] === '--sourcemap') {
+        $sourceMap = true;
+        continue;
+    }
+
     if ($argv[$i] === '-T') {
         $dumpTree = true;
         continue;
@@ -193,6 +200,10 @@ if ($style) {
     $scss->setFormatter('Leafo\\ScssPhp\\Formatter\\' . ucfirst($style));
 }
 
+if ($sourceMap) {
+    $scss->setSourceMap(Compiler::SOURCE_MAP_FILE);
+}
+
 if ($encoding) {
     $scss->setEncoding($encoding);
 }

From 1e862d7f28bbcce159e3c75eee8069e059f95563 Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Wed, 20 Dec 2017 09:08:18 -0500
Subject: [PATCH 029/254] Fix/restore working source map generation in 0.7.3

---
 src/SourceMap/SourceMapGenerator.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index cbfaa7cf..3a55851a 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -174,9 +174,17 @@ public function generateJson()
         $root = $this->options['sourceRoot'];
 
         if ($root) {
+//            $sourceMap['sourceRoot'] = $root;
+            // A list of symbol names used by the 'mappings' entry.
             $sourceMap['names'] = array();
         }
 
+        // A list of original sources used by the 'mappings' entry.
+        $sourceMap['sources'] = array();
+        foreach($this->sources as $source_uri => $source_filename) {
+            $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
+        }
+
         // A string with the encoded mapping data.
         $sourceMap['mappings'] = $mappings;
 

From e8e4df7c5447165638ac255bd86a08b093bc9fb0 Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Wed, 20 Dec 2017 16:03:15 -0500
Subject: [PATCH 030/254] Regression fix last push to fix 0.7.3 source maps

---
 src/SourceMap/SourceMapGenerator.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 3a55851a..c0f96dab 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -172,11 +172,9 @@ public function generateJson()
         // An optional source root, useful for relocating source files on a server or removing repeated values in the
         // 'sources' entry. This value is prepended to the individual entries in the 'source' field.
         $root = $this->options['sourceRoot'];
-
         if ($root) {
-//            $sourceMap['sourceRoot'] = $root;
+            $sourceMap['sourceRoot'] = $root;
             // A list of symbol names used by the 'mappings' entry.
-            $sourceMap['names'] = array();
         }
 
         // A list of original sources used by the 'mappings' entry.
@@ -184,6 +182,7 @@ public function generateJson()
         foreach($this->sources as $source_uri => $source_filename) {
             $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
         }
+        $sourceMap['names'] = array();
 
         // A string with the encoded mapping data.
         $sourceMap['mappings'] = $mappings;

From 045f3087bcb7a293ca2f6da02109fa17d20834a5 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 20 Dec 2017 19:17:12 -0500
Subject: [PATCH 031/254] Update SourceMapGenerator.php

---
 src/SourceMap/SourceMapGenerator.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index c0f96dab..08e06168 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -172,16 +172,19 @@ public function generateJson()
         // An optional source root, useful for relocating source files on a server or removing repeated values in the
         // 'sources' entry. This value is prepended to the individual entries in the 'source' field.
         $root = $this->options['sourceRoot'];
+
         if ($root) {
             $sourceMap['sourceRoot'] = $root;
-            // A list of symbol names used by the 'mappings' entry.
         }
 
         // A list of original sources used by the 'mappings' entry.
         $sourceMap['sources'] = array();
-        foreach($this->sources as $source_uri => $source_filename) {
+
+        foreach ($this->sources as $source_uri => $source_filename) {
             $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
         }
+
+        // A list of symbol names used by the 'mappings' entry.
         $sourceMap['names'] = array();
 
         // A string with the encoded mapping data.

From d7296256bd1bfacb8bd24e69030fd5e187181835 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 20 Dec 2017 19:18:53 -0500
Subject: [PATCH 032/254] Version bump

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index e9c0218c..6d07d5ab 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.3';
+    const VERSION = 'v0.7.4';
 }

From 11f556571b2d4d531a6215398f39e313e48d1aa2 Mon Sep 17 00:00:00 2001
From: dleffler <dleffler@hughes.net>
Date: Mon, 5 Feb 2018 09:23:38 -0500
Subject: [PATCH 033/254] Add option to pass a custom SourceMapGenerator object

---
 src/Compiler.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index f12cf7ee..35a3f866 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -207,8 +207,13 @@ public function compile($code, $path = null)
 
         $sourceMapGenerator = null;
 
-        if ($this->sourceMap && $this->sourceMap !== self::SOURCE_MAP_NONE) {
-            $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
+        if ($this->sourceMap) {
+            if (is_object($this->sourceMap) && is_a($this->sourceMap, 'SourceMapGenerator')) {
+                $sourceMapGenerator = $this->sourceMap;
+                $this->sourceMap = self::SOURCE_MAP_FILE;
+            } elseif ($this->sourceMap !== self::SOURCE_MAP_NONE) {
+                $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
+            }
         }
 
         $out = $this->formatter->format($this->scope, $sourceMapGenerator);

From a73e32a5e110a8de9919939b3f5371d44c1299b5 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 6 Feb 2018 03:14:51 -0500
Subject: [PATCH 034/254] is_a() -> instanceof

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 35a3f866..03c94d9a 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -208,7 +208,7 @@ public function compile($code, $path = null)
         $sourceMapGenerator = null;
 
         if ($this->sourceMap) {
-            if (is_object($this->sourceMap) && is_a($this->sourceMap, 'SourceMapGenerator')) {
+            if (is_object($this->sourceMap) && $this->sourceMap instanceof SourceMapGenerator) {
                 $sourceMapGenerator = $this->sourceMap;
                 $this->sourceMap = self::SOURCE_MAP_FILE;
             } elseif ($this->sourceMap !== self::SOURCE_MAP_NONE) {

From 593b92929c3f0e9d82c84ace7d29e8550e386413 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 6 Feb 2018 03:19:06 -0500
Subject: [PATCH 035/254] No side-effect in abs(), ceil(), floor(), round();
 fixes #551

---
 src/Compiler.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 03c94d9a..8da8be77 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -4740,36 +4740,32 @@ protected function libPercentage($args)
     protected function libRound($args)
     {
         $num = $args[0];
-        $num[1] = round($num[1]);
 
-        return $num;
+        return new Node\Number(round($num[1]), $num[2]);
     }
 
     protected static $libFloor = ['value'];
     protected function libFloor($args)
     {
         $num = $args[0];
-        $num[1] = floor($num[1]);
 
-        return $num;
+        return new Node\Number(floor($num[1]), $num[2]);
     }
 
     protected static $libCeil = ['value'];
     protected function libCeil($args)
     {
         $num = $args[0];
-        $num[1] = ceil($num[1]);
 
-        return $num;
+        return new Node\Number(ceil($num[1]), $num[2]);
     }
 
     protected static $libAbs = ['value'];
     protected function libAbs($args)
     {
         $num = $args[0];
-        $num[1] = abs($num[1]);
 
-        return $num;
+        return new Node\Number(abs($num[1]), $num[2]);
     }
 
     protected function libMin($args)

From d3801706dbf2423a380b7815383c0cbc9203c58a Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 6 Feb 2018 03:50:15 -0500
Subject: [PATCH 036/254] `@for` with units; fixes #548

---
 src/Compiler.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 8da8be77..d46d5332 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1772,9 +1772,18 @@ protected function compileChild($child, OutputBlock $out)
                 list(, $for) = $child;
 
                 $start = $this->reduce($for->start, true);
+                $end   = $this->reduce($for->end, true);
+
+                if ( ! ($start[2] == $end[2] || $end->unitless())) {
+                    $this->throwError('Incompatible units: "%s" and "%s".', $start->unitStr(), $end->unitStr());
+
+                    break;
+                }
+
+                $unit  = $start[2];
                 $start = $start[1];
-                $end = $this->reduce($for->end, true);
-                $end = $end[1];
+                $end   = $end[1];
+
                 $d = $start < $end ? 1 : -1;
 
                 for (;;) {
@@ -1784,7 +1793,7 @@ protected function compileChild($child, OutputBlock $out)
                         break;
                     }
 
-                    $this->set($for->var, new Node\Number($start, ''));
+                    $this->set($for->var, new Node\Number($start, $unit));
                     $start += $d;
 
                     $ret = $this->compileChildren($for->children, $out);

From a4b566f0571f63a2cc00ee03025f6a498092383f Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 6 Feb 2018 04:03:48 -0500
Subject: [PATCH 037/254] Update docblocks

---
 src/Base/Range.php                   | 2 +-
 src/Block.php                        | 2 +-
 src/Colors.php                       | 2 +-
 src/Compiler.php                     | 4 ++--
 src/Compiler/Environment.php         | 2 +-
 src/Exception/CompilerException.php  | 2 +-
 src/Exception/ParserException.php    | 2 +-
 src/Exception/RangeException.php     | 2 +-
 src/Exception/ServerException.php    | 2 +-
 src/Formatter.php                    | 2 +-
 src/Formatter/Compact.php            | 2 +-
 src/Formatter/Compressed.php         | 2 +-
 src/Formatter/Crunched.php           | 2 +-
 src/Formatter/Debug.php              | 2 +-
 src/Formatter/Expanded.php           | 2 +-
 src/Formatter/Nested.php             | 2 +-
 src/Formatter/OutputBlock.php        | 2 +-
 src/Node.php                         | 2 +-
 src/Node/Number.php                  | 2 +-
 src/Parser.php                       | 2 +-
 src/SourceMap/Base64VLQEncoder.php   | 2 +-
 src/SourceMap/SourceMapGenerator.php | 2 +-
 src/Type.php                         | 2 +-
 src/Util.php                         | 2 +-
 src/Version.php                      | 2 +-
 25 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Base/Range.php b/src/Base/Range.php
index 3f3a067d..8bcc6ecf 100644
--- a/src/Base/Range.php
+++ b/src/Base/Range.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2017 Leaf Corcoran
+ * @copyright 2015-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Block.php b/src/Block.php
index fc21e5a4..a6ef8e03 100644
--- a/src/Block.php
+++ b/src/Block.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Colors.php b/src/Colors.php
index 61a71ab6..2314ea58 100644
--- a/src/Colors.php
+++ b/src/Colors.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Compiler.php b/src/Compiler.php
index d46d5332..292e960e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -1774,7 +1774,7 @@ protected function compileChild($child, OutputBlock $out)
                 $start = $this->reduce($for->start, true);
                 $end   = $this->reduce($for->end, true);
 
-                if ( ! ($start[2] == $end[2] || $end->unitless())) {
+                if (! ($start[2] == $end[2] || $end->unitless())) {
                     $this->throwError('Incompatible units: "%s" and "%s".', $start->unitStr(), $end->unitStr());
 
                     break;
diff --git a/src/Compiler/Environment.php b/src/Compiler/Environment.php
index b4b86e32..fe309dd3 100644
--- a/src/Compiler/Environment.php
+++ b/src/Compiler/Environment.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Exception/CompilerException.php b/src/Exception/CompilerException.php
index 45fc1671..7ca2e2b3 100644
--- a/src/Exception/CompilerException.php
+++ b/src/Exception/CompilerException.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Exception/ParserException.php b/src/Exception/ParserException.php
index c0ee002d..6d64335f 100644
--- a/src/Exception/ParserException.php
+++ b/src/Exception/ParserException.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Exception/RangeException.php b/src/Exception/RangeException.php
index 47192ff5..3ba6bf14 100644
--- a/src/Exception/RangeException.php
+++ b/src/Exception/RangeException.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Exception/ServerException.php b/src/Exception/ServerException.php
index 68d3a290..d0ed0842 100644
--- a/src/Exception/ServerException.php
+++ b/src/Exception/ServerException.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter.php b/src/Formatter.php
index 4d2fdd08..b4f90aa9 100644
--- a/src/Formatter.php
+++ b/src/Formatter.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/Compact.php b/src/Formatter/Compact.php
index aaf972b7..4efa1a08 100644
--- a/src/Formatter/Compact.php
+++ b/src/Formatter/Compact.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/Compressed.php b/src/Formatter/Compressed.php
index 21cbf28e..1faa7e11 100644
--- a/src/Formatter/Compressed.php
+++ b/src/Formatter/Compressed.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/Crunched.php b/src/Formatter/Crunched.php
index 43d63833..42d77b5f 100644
--- a/src/Formatter/Crunched.php
+++ b/src/Formatter/Crunched.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/Debug.php b/src/Formatter/Debug.php
index b31c8c7a..bfcbf41a 100644
--- a/src/Formatter/Debug.php
+++ b/src/Formatter/Debug.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/Expanded.php b/src/Formatter/Expanded.php
index 0449787d..d8c1e887 100644
--- a/src/Formatter/Expanded.php
+++ b/src/Formatter/Expanded.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/Nested.php b/src/Formatter/Nested.php
index 626fec13..8f72206f 100644
--- a/src/Formatter/Nested.php
+++ b/src/Formatter/Nested.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Formatter/OutputBlock.php b/src/Formatter/OutputBlock.php
index e4092175..5eb589c9 100644
--- a/src/Formatter/OutputBlock.php
+++ b/src/Formatter/OutputBlock.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Node.php b/src/Node.php
index eb543c73..b9f7945a 100644
--- a/src/Node.php
+++ b/src/Node.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Node/Number.php b/src/Node/Number.php
index efa83f5b..42c16803 100644
--- a/src/Node/Number.php
+++ b/src/Node/Number.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Parser.php b/src/Parser.php
index ccac0d3f..6fdea3e2 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/SourceMap/Base64VLQEncoder.php b/src/SourceMap/Base64VLQEncoder.php
index 435a7c60..1189ce0e 100644
--- a/src/SourceMap/Base64VLQEncoder.php
+++ b/src/SourceMap/Base64VLQEncoder.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 08e06168..70b47cdc 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Type.php b/src/Type.php
index 2d659e4d..e84c47e4 100644
--- a/src/Type.php
+++ b/src/Type.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Util.php b/src/Util.php
index d49b265c..7526e020 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
diff --git a/src/Version.php b/src/Version.php
index 6d07d5ab..2bda80ff 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -2,7 +2,7 @@
 /**
  * SCSSPHP
  *
- * @copyright 2012-2017 Leaf Corcoran
+ * @copyright 2012-2018 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *

From 8b538d828bbb75276974605c4a1a435e939da74e Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 8 Feb 2018 21:04:21 -0500
Subject: [PATCH 038/254] Bump version

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 2bda80ff..3b8dcd00 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.4';
+    const VERSION = 'v0.7.5';
 }

From 9410cbb398d17b096ce4bdd533f1712a651aca3d Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 28 Feb 2018 23:06:40 -0500
Subject: [PATCH 039/254] Fixes #559 - mix() fix

---
 src/Compiler.php                     | 2 +-
 tests/inputs/functions.scss          | 9 ++++++++-
 tests/outputs/functions.css          | 3 +++
 tests/outputs_numbered/functions.css | 3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 292e960e..698d4d89 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -4526,7 +4526,7 @@ protected function libMix($args)
         ];
 
         if ($firstAlpha != 1.0 || $secondAlpha != 1.0) {
-            $new[] = $firstAlpha * $weight + $secondAlpha * ($weight - 1);
+            $new[] = $firstAlpha * $weight + $secondAlpha * (1 - $weight);
         }
 
         return $this->fixColor($new);
diff --git a/tests/inputs/functions.scss b/tests/inputs/functions.scss
index bf3edf1f..9ebd544f 100644
--- a/tests/inputs/functions.scss
+++ b/tests/inputs/functions.scss
@@ -165,4 +165,11 @@ $str: 'global';
 div {
   margin: mapping(one two);
   @include test();
-}
\ No newline at end of file
+}
+
+$a: rgba(#000, 0.5);
+$b: rgba(#fff, 0.75);
+
+.test {
+    color: mix($a, $b);
+}
diff --git a/tests/outputs/functions.css b/tests/outputs/functions.css
index aa0bebbb..e89beb8f 100644
--- a/tests/outputs/functions.css
+++ b/tests/outputs/functions.css
@@ -49,3 +49,6 @@ p {
 div {
   margin: 1px 1px 2px 2px;
   padding: 1px 1px 2px 2px; }
+
+.test {
+  color: rgba(159, 159, 159, 0.625); }
diff --git a/tests/outputs_numbered/functions.css b/tests/outputs_numbered/functions.css
index 6583ff05..6841fa05 100644
--- a/tests/outputs_numbered/functions.css
+++ b/tests/outputs_numbered/functions.css
@@ -51,3 +51,6 @@ p {
 div {
   margin: 1px 1px 2px 2px;
   padding: 1px 1px 2px 2px; }
+/* line 173, inputs/functions.scss */
+.test {
+  color: rgba(159, 159, 159, 0.625); }

From 847f9f2d6cb64042ed6ca91938f8aa7d20dcadba Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 19 Apr 2018 11:42:23 -0400
Subject: [PATCH 040/254] fixes #568 example/Server: set default timezone to
 UTC

---
 example/Server.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/example/Server.php b/example/Server.php
index a8dc0457..6ea97018 100644
--- a/example/Server.php
+++ b/example/Server.php
@@ -207,7 +207,7 @@ protected function compile($in, $out)
         $elapsed = round((microtime(true) - $start), 4);
 
         $v    = Version::VERSION;
-        $t    = date('r');
+        $t    = gmdate('r');
         $css  = "/* compiled by scssphp $v on $t (${elapsed}s) */\n\n" . $css;
         $etag = md5($css);
 
@@ -329,7 +329,7 @@ public function serve($salt = '')
                 try {
                     list($css, $etag) = $this->compile($input, $output);
 
-                    $lastModified = gmdate('D, d M Y H:i:s', filemtime($output)) . ' GMT';
+                    $lastModified = gmdate('r', filemtime($output));
 
                     header('Last-Modified: ' . $lastModified);
                     header('Content-type: text/css');
@@ -371,7 +371,7 @@ public function serve($salt = '')
                 return;
             }
 
-            $lastModified  = gmdate('D, d M Y H:i:s', $mtime) . ' GMT';
+            $lastModified  = gmdate('r', $mtime);
             header('Last-Modified: ' . $lastModified);
 
             echo file_get_contents($output);
@@ -510,8 +510,6 @@ public function __construct($dir, $cacheDir = null, $scss = null)
         $this->scss = $scss;
         $this->showErrorsAsCSS = false;
 
-        if (! ini_get('date.timezone')) {
-            throw new ServerException('Default date.timezone not set');
-        }
+        date_default_timezone_set('UTC');
     }
 }

From 53bb5275a7e3fad3676f1e01f3014d39a0c6d675 Mon Sep 17 00:00:00 2001
From: AzJezz <sgmati48@gmail.com>
Date: Sun, 29 Apr 2018 16:32:07 +0100
Subject: [PATCH 041/254] Update Compiler.php

---
 src/Compiler.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 698d4d89..32e9b774 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -316,10 +316,15 @@ protected function makeOutputBlock($type, $selectors = null)
         $out->parent       = $this->scope;
         $out->selectors    = $selectors;
         $out->depth        = $this->env->depth;
-        $out->sourceName   = $this->env->block->sourceName;
-        $out->sourceLine   = $this->env->block->sourceLine;
-        $out->sourceColumn = $this->env->block->sourceColumn;
-
+        if($this->env->block instanceof Block) {
+            $out->sourceName   = $this->env->block->sourceName;
+            $out->sourceLine   = $this->env->block->sourceLine;
+            $out->sourceColumn = $this->env->block->sourceColumn;
+        } else {
+            $out->sourceName   = null;
+            $out->sourceLine   = null;
+            $out->sourceColum  = null;   
+        }
         return $out;
     }
 

From ddebe1a68a53c4b8524c03f8cb2c24174cb028dc Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 18 May 2018 14:48:28 -0400
Subject: [PATCH 042/254] Fix #573

---
 src/Compiler.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 32e9b774..1aad621b 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2699,7 +2699,9 @@ public function compileValue($value)
                 $b = round($b);
 
                 if (count($value) === 5 && $value[4] !== 1) { // rgba
-                    return 'rgba(' . $r . ', ' . $g . ', ' . $b . ', ' . $value[4] . ')';
+                    $a = new Node\Number($value[4]);
+
+                    return 'rgba(' . $r . ', ' . $g . ', ' . $b . ', ' . $a . ')';
                 }
 
                 $h = sprintf('#%02x%02x%02x', $r, $g, $b);
@@ -4336,7 +4338,7 @@ protected function libRgb($args)
     protected function libRgba($args)
     {
         if ($color = $this->coerceColor($args[0])) {
-            $num = ! isset($args[1]) ? $args[3] : $args[1];
+            $num = isset($args[3]) ? $args[3] : $args[1];
             $alpha = $this->assertNumber($num);
             $color[4] = $alpha;
 

From 57292fba51af83b0e812bc1cb31c7816b3f61936 Mon Sep 17 00:00:00 2001
From: Tim Elsass <timelsass@users.noreply.github.com>
Date: Sun, 20 May 2018 00:52:50 -0400
Subject: [PATCH 043/254] Fix #575

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 1aad621b..746c6422 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2699,7 +2699,7 @@ public function compileValue($value)
                 $b = round($b);
 
                 if (count($value) === 5 && $value[4] !== 1) { // rgba
-                    $a = new Node\Number($value[4]);
+                    $a = new Node\Number($value[4],'');
 
                     return 'rgba(' . $r . ', ' . $g . ', ' . $b . ', ' . $a . ')';
                 }

From 04482345fc0dd1b5305bcd5032ac4deb8a9ebbeb Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sun, 20 May 2018 10:11:19 -0400
Subject: [PATCH 044/254] Update Compiler.php

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 746c6422..b727f178 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2699,7 +2699,7 @@ public function compileValue($value)
                 $b = round($b);
 
                 if (count($value) === 5 && $value[4] !== 1) { // rgba
-                    $a = new Node\Number($value[4],'');
+                    $a = new Node\Number($value[4], '');
 
                     return 'rgba(' . $r . ', ' . $g . ', ' . $b . ', ' . $a . ')';
                 }

From 1a819c3b926c251891ede7c6bd12d91e403dc384 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 23 May 2018 18:05:54 -0400
Subject: [PATCH 045/254] Fix phpcs warnings

---
 src/Compiler.php |  4 ++--
 src/Parser.php   | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index b727f178..bfda455f 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -316,14 +316,14 @@ protected function makeOutputBlock($type, $selectors = null)
         $out->parent       = $this->scope;
         $out->selectors    = $selectors;
         $out->depth        = $this->env->depth;
-        if($this->env->block instanceof Block) {
+        if ($this->env->block instanceof Block) {
             $out->sourceName   = $this->env->block->sourceName;
             $out->sourceLine   = $this->env->block->sourceLine;
             $out->sourceColumn = $this->env->block->sourceColumn;
         } else {
             $out->sourceName   = null;
             $out->sourceLine   = null;
-            $out->sourceColum  = null;   
+            $out->sourceColum  = null;
         }
         return $out;
     }
diff --git a/src/Parser.php b/src/Parser.php
index 6fdea3e2..b8bfdc36 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1302,6 +1302,21 @@ protected function value(&$out)
     {
         $s = $this->seek();
 
+        if ($this->literal('url(') && $this->match('data:image\/([a-z0-9+-]+);base64,', $m, false)) {
+            $len = strspn($this->buffer, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=', $this->count);
+
+            $this->count += $len;
+
+            if ($this->literal(')')) {
+                $content = substr($this->buffer, $s, $this->count - $s);
+                $out = [Type::T_KEYWORD, $content];
+
+                return true;
+            }
+        }
+
+        $this->seek($s);
+
         if ($this->literal('not', false) && $this->whitespace() && $this->value($inner)) {
             $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
 

From e94a5c21addf8541a710d5ac6507532118ba3295 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 23 May 2018 18:12:08 -0400
Subject: [PATCH 046/254] Refs #527 - parsing base64

---
 src/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index b8bfdc36..de86f094 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1302,7 +1302,7 @@ protected function value(&$out)
     {
         $s = $this->seek();
 
-        if ($this->literal('url(') && $this->match('data:image\/([a-z0-9+-]+);base64,', $m, false)) {
+        if ($this->literal('url(') && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
             $len = strspn($this->buffer, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=', $this->count);
 
             $this->count += $len;

From deaf1dede19347fed905931ad80b495b077e4220 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 23 May 2018 21:33:11 -0400
Subject: [PATCH 047/254] Fix typo

---
 src/Compiler.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index bfda455f..72df991e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -316,6 +316,7 @@ protected function makeOutputBlock($type, $selectors = null)
         $out->parent       = $this->scope;
         $out->selectors    = $selectors;
         $out->depth        = $this->env->depth;
+
         if ($this->env->block instanceof Block) {
             $out->sourceName   = $this->env->block->sourceName;
             $out->sourceLine   = $this->env->block->sourceLine;
@@ -323,8 +324,9 @@ protected function makeOutputBlock($type, $selectors = null)
         } else {
             $out->sourceName   = null;
             $out->sourceLine   = null;
-            $out->sourceColum  = null;
+            $out->sourceColumn = null;
         }
+
         return $out;
     }
 

From 585f6ae84de62ffecf69c23805f25d78d7e4b794 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 23 May 2018 22:18:53 -0400
Subject: [PATCH 048/254] Bump version

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 3b8dcd00..c8a56a5b 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.5';
+    const VERSION = 'v0.7.6';
 }

From 0b94ebc2b0e61e797bfc0cb74acab5f3e95a09fd Mon Sep 17 00:00:00 2001
From: Stephan <s7eph4n@protonmail.com>
Date: Sun, 10 Jun 2018 01:09:50 +0200
Subject: [PATCH 049/254] Actually merge maps instead of just concatenating

---
 src/Compiler.php               | 12 +++++++++++-
 tests/inputs/map.scss          |  5 +++--
 tests/outputs/map.css          |  4 ++++
 tests/outputs_numbered/map.css | 10 ++++++++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 72df991e..8551f001 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -4985,7 +4985,17 @@ protected function libMapMerge($args)
         $map1 = $this->assertMap($args[0]);
         $map2 = $this->assertMap($args[1]);
 
-        return [Type::T_MAP, array_merge($map1[1], $map2[1]), array_merge($map1[2], $map2[2])];
+        foreach ($map2[1] as $i2 => $key2) {
+            foreach ($map1[1] as $i1 => $key1) {
+                if ($this->compileStringContent($this->coerceString($key1)) === $this->compileStringContent($this->coerceString($key2))) {
+                    $map1[2][$i1] = $map2[2][$i2];
+                    continue 2;
+                }
+            }
+            $map1[1][] = $map2[1][$i2];
+            $map1[2][] = $map2[2][$i2];
+        }
+        return $map1;
     }
 
     protected static $libKeywords = ['args'];
diff --git a/tests/inputs/map.scss b/tests/inputs/map.scss
index 0fb6be19..7f8adeba 100644
--- a/tests/inputs/map.scss
+++ b/tests/inputs/map.scss
@@ -25,9 +25,10 @@ div {
     bar: nth(nth($map, 1), 1);
 }
 
-$color: ("black" : #000000);
+$color: ("black" : #000000, "grey" : #777777);
+$color2: ("grey" : #888888, "white" : #ffffff);
 
-@each $color_name, $color_value in $color {
+@each $color_name, $color_value in map_merge( $color, $color2 ) {
     .#{$color_name} {
         background-color: $color_value !important;
     }
diff --git a/tests/outputs/map.css b/tests/outputs/map.css
index 9c38094a..a8898915 100644
--- a/tests/outputs/map.css
+++ b/tests/outputs/map.css
@@ -12,6 +12,10 @@ div {
   bar: color; }
   .black {
     background-color: #000 !important; }
+  .grey {
+    background-color: #888 !important; }
+  .white {
+    background-color: #fff !important; }
 
 div {
   a: 1;
diff --git a/tests/outputs_numbered/map.css b/tests/outputs_numbered/map.css
index 16de52b9..23c144fb 100644
--- a/tests/outputs_numbered/map.css
+++ b/tests/outputs_numbered/map.css
@@ -11,10 +11,16 @@ div {
 div {
   foo: color black;
   bar: color; }
-/* line 31, inputs/map.scss */
+/* line 32, inputs/map.scss */
 .black {
   background-color: #000 !important; }
-/* line 52, inputs/map.scss */
+/* line 32, inputs/map.scss */
+.grey {
+  background-color: #888 !important; }
+/* line 32, inputs/map.scss */
+.white {
+  background-color: #fff !important; }
+/* line 53, inputs/map.scss */
 div {
   a: 1;
   b: 2;

From 4963903c0a88db128026f1a78de205a7153d4b48 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 19 Jun 2018 18:06:25 -0400
Subject: [PATCH 050/254] #569 attempt to fix call() with ellipsis

---
 src/Compiler.php                    | 38 +++++++++++++++++++++--------
 tests/inputs/builtins.scss          | 20 +++++++++++++++
 tests/outputs/builtins.css          | 12 +++++++++
 tests/outputs_numbered/builtins.css | 12 +++++++++
 4 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 72df991e..7d8db736 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3655,7 +3655,7 @@ protected function callNativeFunction($name, $args, &$returnValue)
             return false;
         }
 
-        list($sorted, $kwargs) = $this->sortArgs($prototype, $args);
+        @list($sorted, $kwargs) = $this->sortArgs($prototype, $args);
 
         if ($name !== 'if' && $name !== 'call') {
             foreach ($sorted as &$val) {
@@ -3714,7 +3714,7 @@ protected function sortArgs($prototype, $args)
             $key = $key[1];
 
             if (empty($key)) {
-                $posArgs[] = $value;
+                $posArgs[] = empty($arg[2]) ? $value : $arg;
             } else {
                 $keyArgs[$key] = $value;
             }
@@ -4266,20 +4266,38 @@ protected function libCall($args, $kwargs)
     {
         $name = $this->compileStringContent($this->coerceString($this->reduce(array_shift($args), true)));
 
-        $args = array_map(
-            function ($a) {
-                return [null, $a, false];
-            },
-            $args
-        );
+        $posArgs = [];
+
+        foreach ($args as $arg) {
+            if (empty($arg[0])) {
+                if ($arg[2] === true) {
+                    $tmp = $this->reduce($arg[1]);
+
+                    if ($tmp[0] === Type::T_LIST) {
+                        foreach ($tmp[2] as $item) {
+                            $posArgs[] = [null, $item, false];
+                        }
+                    } else {
+                        $posArgs[] = [null, $tmp, true];
+                    }
+
+                    continue;
+                }
+
+                $posArgs[] = [null, $this->reduce($arg), false];
+                continue;
+            }
+
+            $posArgs[] = [null, $arg, false];
+        }
 
         if (count($kwargs)) {
             foreach ($kwargs as $key => $value) {
-                $args[] = [[Type::T_VARIABLE, $key], $value, false];
+                $posArgs[] = [[Type::T_VARIABLE, $key], $value, false];
             }
         }
 
-        return $this->reduce([Type::T_FUNCTION_CALL, $name, $args]);
+        return $this->reduce([Type::T_FUNCTION_CALL, $name, $posArgs]);
     }
 
     protected static $libIf = ['condition', 'if-true', 'if-false'];
diff --git a/tests/inputs/builtins.scss b/tests/inputs/builtins.scss
index a80db5b1..00cd3c63 100644
--- a/tests/inputs/builtins.scss
+++ b/tests/inputs/builtins.scss
@@ -216,3 +216,23 @@ $type: text;
 div.unquote-test {
   a: unquote('[type=\'#{$type}\']');
 }
+
+.does-compile-1 {
+  color: call(lighten, #000, 40%);
+}
+
+.does-compile-2 {
+  $color: #000;
+  $percent: 40%;
+  color: call(lighten, $color, $percent);
+}
+
+.does-compile-3 {
+  $args: (#000, 40%);
+  color: call(lighten, nth($args, 1), nth($args, 2));
+}
+
+.does-compile-4 {
+  $args: (#000, 40%);
+  color: call(lighten, $args...);
+}
diff --git a/tests/outputs/builtins.css b/tests/outputs/builtins.css
index 50e2a82e..db43727d 100644
--- a/tests/outputs/builtins.css
+++ b/tests/outputs/builtins.css
@@ -159,3 +159,15 @@ div.call-tests {
 
 div.unquote-test {
   a: [type='text']; }
+
+.does-compile-1 {
+  color: #666; }
+
+.does-compile-2 {
+  color: #666; }
+
+.does-compile-3 {
+  color: #666; }
+
+.does-compile-4 {
+  color: #666; }
diff --git a/tests/outputs_numbered/builtins.css b/tests/outputs_numbered/builtins.css
index 722c6af4..e84d727c 100644
--- a/tests/outputs_numbered/builtins.css
+++ b/tests/outputs_numbered/builtins.css
@@ -160,3 +160,15 @@ div.call-tests {
 /* line 216, inputs/builtins.scss */
 div.unquote-test {
   a: [type='text']; }
+/* line 220, inputs/builtins.scss */
+.does-compile-1 {
+  color: #666; }
+/* line 224, inputs/builtins.scss */
+.does-compile-2 {
+  color: #666; }
+/* line 230, inputs/builtins.scss */
+.does-compile-3 {
+  color: #666; }
+/* line 235, inputs/builtins.scss */
+.does-compile-4 {
+  color: #666; }

From 3d3fd508102242ab5744b91e51ff78e262db9467 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 19 Jun 2018 23:10:38 -0400
Subject: [PATCH 051/254] refs #548 - treat 0 as a special unitless number

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 7d8db736..62d125d8 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -4856,7 +4856,7 @@ protected function getNormalizedNumbers($args)
             if (null === $unit) {
                 $unit = $number[2];
                 $originalUnit = $item->unitStr();
-            } elseif ($unit !== $number[2]) {
+            } elseif ($number[1] && $unit !== $number[2]) {
                 $this->throwError('Incompatible units: "%s" and "%s".', $originalUnit, $item->unitStr());
                 break;
             }

From 1d656f8c02a3a69404bba6b28ec4e06edddf0f49 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sat, 21 Jul 2018 21:22:08 -0400
Subject: [PATCH 052/254] refs #578 peephole optimization

---
 src/Compiler.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 414e4401..637f1c1c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -5004,15 +5004,19 @@ protected function libMapMerge($args)
         $map2 = $this->assertMap($args[1]);
 
         foreach ($map2[1] as $i2 => $key2) {
+            $key = $this->compileStringContent($this->coerceString($key2));
+
             foreach ($map1[1] as $i1 => $key1) {
-                if ($this->compileStringContent($this->coerceString($key1)) === $this->compileStringContent($this->coerceString($key2))) {
+                if ($key === $this->compileStringContent($this->coerceString($key1))) {
                     $map1[2][$i1] = $map2[2][$i2];
                     continue 2;
                 }
             }
+
             $map1[1][] = $map2[1][$i2];
             $map1[2][] = $map2[2][$i2];
         }
+
         return $map1;
     }
 

From b72d613f682b714f498412483aff353cde977c00 Mon Sep 17 00:00:00 2001
From: Jiong Ye <dexxaye@gmail.com>
Date: Fri, 17 Aug 2018 16:24:08 -0400
Subject: [PATCH 053/254] leafo/scssphp#581 generate inline sourcemap in
 commandline

---
 bin/pscss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/pscss b/bin/pscss
index be1cb51c..ce80e6a9 100755
--- a/bin/pscss
+++ b/bin/pscss
@@ -201,7 +201,7 @@ if ($style) {
 }
 
 if ($sourceMap) {
-    $scss->setSourceMap(Compiler::SOURCE_MAP_FILE);
+    $scss->setSourceMap(Compiler::SOURCE_MAP_INLINE);
 }
 
 if ($encoding) {

From a7be38d3dabb6d3c15e28073541163428ad819ab Mon Sep 17 00:00:00 2001
From: Bastian Rihm <me@bastianjoel.de>
Date: Thu, 30 Aug 2018 14:43:47 +0200
Subject: [PATCH 054/254] #515 Fix backslash escape

---
 src/Parser.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index de86f094..748d38ae 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1737,6 +1737,8 @@ protected function string(&$out)
                     $content[] = $m[2] . '"';
                 } elseif ($this->literal("'", false)) {
                     $content[] = $m[2] . "'";
+                } elseif ($this->literal("\\", false)) {
+                    $content[] = $m[2] . "\\";
                 } else {
                     $content[] = $m[2];
                 }
@@ -1753,7 +1755,9 @@ protected function string(&$out)
                 $delim = '"';
 
                 foreach ($content as &$string) {
-                    if ($string === "\\'") {
+                    if ($string === "\\\\") {
+                        $string = "\\";
+                    } elseif ($string === "\\'") {
                         $string = "'";
                     } elseif ($string === '\\"') {
                         $string = '"';

From 0b589890bfbdd2e14d272f78d9d49038c051f12c Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 24 Jul 2018 10:47:05 -0400
Subject: [PATCH 055/254] Bump version

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index c8a56a5b..ec0fee6f 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.6';
+    const VERSION = 'v0.7.8';
 }

From 2a88d3e9ba903e1568cda7cd33add91d093a639c Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 26 Sep 2018 16:46:29 -0400
Subject: [PATCH 056/254] Update unit tests (fixes #515)

---
 tests/inputs/builtins.scss          |  1 +
 tests/outputs/builtins.css          |  1 +
 tests/outputs_numbered/builtins.css | 27 ++++++++++++++-------------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/tests/inputs/builtins.scss b/tests/inputs/builtins.scss
index 00cd3c63..c75a854e 100644
--- a/tests/inputs/builtins.scss
+++ b/tests/inputs/builtins.scss
@@ -78,6 +78,7 @@
     color: quote("I do?");
     color: str_index(abc, b);
     color: str_insert(string, insert, 2);
+    color: str_insert(string, "\\", 2);
     color: str_length(string);
     color: str_slice(string, 2, 4);
     color: str-slice(string, 2, 0);
diff --git a/tests/outputs/builtins.css b/tests/outputs/builtins.css
index db43727d..94f29b4e 100644
--- a/tests/outputs/builtins.css
+++ b/tests/outputs/builtins.css
@@ -53,6 +53,7 @@
   color: "I do?";
   color: 2;
   color: sinserttring;
+  color: s\\tring;
   color: 6;
   color: tri;
   color: trin;
diff --git a/tests/outputs_numbered/builtins.css b/tests/outputs_numbered/builtins.css
index e84d727c..559b6a30 100644
--- a/tests/outputs_numbered/builtins.css
+++ b/tests/outputs_numbered/builtins.css
@@ -54,6 +54,7 @@
   color: "I do?";
   color: 2;
   color: sinserttring;
+  color: s\\tring;
   color: 6;
   color: tri;
   color: trin;
@@ -74,7 +75,7 @@
   color: st;
   color: string;
   color: strin; }
-/* line 105, inputs/builtins.scss */
+/* line 106, inputs/builtins.scss */
 #number {
   color: 250%;
   color: 50%;
@@ -86,7 +87,7 @@
   width: 200%;
   bottom: 10px;
   padding: 3em 1in 96px 72pt; }
-/* line 119, inputs/builtins.scss */
+/* line 120, inputs/builtins.scss */
 #list {
   len: 3;
   len: 1;
@@ -108,7 +109,7 @@
   cool: great job one two three;
   zip: 1px solid, 2px dashed;
   zip: 1px solid red, 2px dashed green; }
-/* line 155, inputs/builtins.scss */
+/* line 156, inputs/builtins.scss */
 #introspection {
   t: number;
   t: string;
@@ -128,47 +129,47 @@
   c: true;
   c: false;
   c: true; }
-/* line 179, inputs/builtins.scss */
+/* line 180, inputs/builtins.scss */
 #if {
   color: yes;
   color: no;
   color: yes;
   color: yes; }
-/* line 186, inputs/builtins.scss */
+/* line 187, inputs/builtins.scss */
 .transparent {
   r: 0;
   g: 0;
   b: 0;
   a: 0; }
-/* line 193, inputs/builtins.scss */
+/* line 194, inputs/builtins.scss */
 .alpha {
   a: 1;
   a: 1;
   a: 1;
   a: 0.5;
   a: alpha(currentColor); }
-/* line 202, inputs/builtins.scss */
+/* line 203, inputs/builtins.scss */
 #exists {
   a: true;
   b: true;
   c: false; }
-/* line 209, inputs/builtins.scss */
+/* line 210, inputs/builtins.scss */
 div.call-tests {
   a: #0a64ff;
   b: #0058ef;
   c: b; }
-/* line 216, inputs/builtins.scss */
+/* line 217, inputs/builtins.scss */
 div.unquote-test {
   a: [type='text']; }
-/* line 220, inputs/builtins.scss */
+/* line 221, inputs/builtins.scss */
 .does-compile-1 {
   color: #666; }
-/* line 224, inputs/builtins.scss */
+/* line 225, inputs/builtins.scss */
 .does-compile-2 {
   color: #666; }
-/* line 230, inputs/builtins.scss */
+/* line 231, inputs/builtins.scss */
 .does-compile-3 {
   color: #666; }
-/* line 235, inputs/builtins.scss */
+/* line 236, inputs/builtins.scss */
 .does-compile-4 {
   color: #666; }

From f893748cd4482051bc503064c6a4396b10280957 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 26 Sep 2018 17:15:59 -0400
Subject: [PATCH 057/254] Add Base64VLQ encoder test (refs #600)

---
 tests/Base64VLQTest.php | 54 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 tests/Base64VLQTest.php

diff --git a/tests/Base64VLQTest.php b/tests/Base64VLQTest.php
new file mode 100644
index 00000000..21b373b8
--- /dev/null
+++ b/tests/Base64VLQTest.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * SCSSPHP
+ *
+ * @copyright 2018 Anthon Pang
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
+ */
+
+namespace Leafo\ScssPhp\Tests;
+
+use Leafo\ScssPhp\SourceMap\Base64VLQEncoder;
+
+/**
+ * Base64VLQ encoder test
+ *
+ * @author Anthon Pang <anthon.pang@gmail.com>
+ */
+class Base64VLQTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Test encode
+     *
+     * param string $expected
+     * param string $value
+     *
+     * @dataProvider getEncode
+     */
+    public function testEncode($expected, $value)
+    {
+        $encoder = new Base64VLQEncoder;
+
+        $this->assertEquals($expected, $encoder->encode($value));
+    }
+
+    /**
+     * Data provider for testEncode
+     *
+     * @return array
+     */
+    public static function getEncode()
+    {
+        return [
+            ['A', 0],
+            ['C', 1],
+            ['D', -1],
+            ['2H', 123],
+            ['qxmvrH', 123456789],
+            ['+/////D', 2147483647], // 2^31-1
+        ];
+    }
+}

From 0fcbdf599f9f8289d033f327532b6a2230b1d77f Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Sun, 30 Sep 2018 20:57:13 -0400
Subject: [PATCH 058/254] Fixes #600 - change Base64 VLQ encoder/decoder
 implementtion

---
 scss.inc.php                         |   3 +-
 src/SourceMap/Base64.php             | 184 +++++++++++++++++++++++++++
 src/SourceMap/Base64VLQ.php          | 137 ++++++++++++++++++++
 src/SourceMap/SourceMapGenerator.php |   4 +-
 tests/Base64VLQTest.php              |   4 +-
 5 files changed, 327 insertions(+), 5 deletions(-)
 create mode 100644 src/SourceMap/Base64.php
 create mode 100644 src/SourceMap/Base64VLQ.php

diff --git a/scss.inc.php b/scss.inc.php
index 13c84bf5..d75ecb55 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -24,7 +24,8 @@
     include_once __DIR__ . '/src/Node.php';
     include_once __DIR__ . '/src/Node/Number.php';
     include_once __DIR__ . '/src/Parser.php';
-    include_once __DIR__ . '/src/SourceMap/Base64VLQEncoder.php';
+    include_once __DIR__ . '/src/SourceMap/Base64.php';
+    include_once __DIR__ . '/src/SourceMap/Base64VLQ.php';
     include_once __DIR__ . '/src/SourceMap/SourceMapGenerator.php';
     include_once __DIR__ . '/src/Type.php';
     include_once __DIR__ . '/src/Util.php';
diff --git a/src/SourceMap/Base64.php b/src/SourceMap/Base64.php
new file mode 100644
index 00000000..9d17e6f0
--- /dev/null
+++ b/src/SourceMap/Base64.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2015 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
+ */
+
+namespace Leafo\ScssPhp\SourceMap;
+
+/**
+ * Base 64 Encode/Decode
+ *
+ * @author Anthon Pang <anthon.pang@gmail.com>
+ */
+class Base64
+{
+    /**
+     * @var array
+     */
+    private static $encodingMap = array (
+        0 => 'A',
+        1 => 'B',
+        2 => 'C',
+        3 => 'D',
+        4 => 'E',
+        5 => 'F',
+        6 => 'G',
+        7 => 'H',
+        8 => 'I',
+        9 => 'J',
+        10 => 'K',
+        11 => 'L',
+        12 => 'M',
+        13 => 'N',
+        14 => 'O',
+        15 => 'P',
+        16 => 'Q',
+        17 => 'R',
+        18 => 'S',
+        19 => 'T',
+        20 => 'U',
+        21 => 'V',
+        22 => 'W',
+        23 => 'X',
+        24 => 'Y',
+        25 => 'Z',
+        26 => 'a',
+        27 => 'b',
+        28 => 'c',
+        29 => 'd',
+        30 => 'e',
+        31 => 'f',
+        32 => 'g',
+        33 => 'h',
+        34 => 'i',
+        35 => 'j',
+        36 => 'k',
+        37 => 'l',
+        38 => 'm',
+        39 => 'n',
+        40 => 'o',
+        41 => 'p',
+        42 => 'q',
+        43 => 'r',
+        44 => 's',
+        45 => 't',
+        46 => 'u',
+        47 => 'v',
+        48 => 'w',
+        49 => 'x',
+        50 => 'y',
+        51 => 'z',
+        52 => '0',
+        53 => '1',
+        54 => '2',
+        55 => '3',
+        56 => '4',
+        57 => '5',
+        58 => '6',
+        59 => '7',
+        60 => '8',
+        61 => '9',
+        62 => '+',
+        63 => '/',
+    );
+
+    /**
+     * @var array
+     */
+    private static $decodingMap = array(
+        'A' => 0,
+        'B' => 1,
+        'C' => 2,
+        'D' => 3,
+        'E' => 4,
+        'F' => 5,
+        'G' => 6,
+        'H' => 7,
+        'I' => 8,
+        'J' => 9,
+        'K' => 10,
+        'L' => 11,
+        'M' => 12,
+        'N' => 13,
+        'O' => 14,
+        'P' => 15,
+        'Q' => 16,
+        'R' => 17,
+        'S' => 18,
+        'T' => 19,
+        'U' => 20,
+        'V' => 21,
+        'W' => 22,
+        'X' => 23,
+        'Y' => 24,
+        'Z' => 25,
+        'a' => 26,
+        'b' => 27,
+        'c' => 28,
+        'd' => 29,
+        'e' => 30,
+        'f' => 31,
+        'g' => 32,
+        'h' => 33,
+        'i' => 34,
+        'j' => 35,
+        'k' => 36,
+        'l' => 37,
+        'm' => 38,
+        'n' => 39,
+        'o' => 40,
+        'p' => 41,
+        'q' => 42,
+        'r' => 43,
+        's' => 44,
+        't' => 45,
+        'u' => 46,
+        'v' => 47,
+        'w' => 48,
+        'x' => 49,
+        'y' => 50,
+        'z' => 51,
+        0 => 52,
+        1 => 53,
+        2 => 54,
+        3 => 55,
+        4 => 56,
+        5 => 57,
+        6 => 58,
+        7 => 59,
+        8 => 60,
+        9 => 61,
+        '+' => 62,
+        '/' => 63,
+    );
+
+    /**
+     * Convert to base64
+     *
+     * @param integer $value
+     *
+     * @return string
+     */
+    public static function encode($value)
+    {
+        return self::$encodingMap[$value];
+    }
+
+    /**
+     * Convert from base64
+     *
+     * @param string $value
+     *
+     * @return integer
+     */
+    public static function decode($value)
+    {
+        return self::$decodingMap[$value];
+    }
+}
diff --git a/src/SourceMap/Base64VLQ.php b/src/SourceMap/Base64VLQ.php
new file mode 100644
index 00000000..6de3b5ee
--- /dev/null
+++ b/src/SourceMap/Base64VLQ.php
@@ -0,0 +1,137 @@
+<?php
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2015 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
+ */
+
+namespace Leafo\ScssPhp\SourceMap;
+
+use Leafo\ScssPhp\SourceMap\Base64;
+
+/**
+ * Base 64 VLQ
+ *
+ * Based on the Base 64 VLQ implementation in Closure Compiler:
+ * https://github.com/google/closure-compiler/blob/master/src/com/google/debugging/sourcemap/Base64VLQ.java
+ *
+ * Copyright 2011 The Closure Compiler Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author John Lenz <johnlenz@google.com>
+ * @author Anthon Pang <anthon.pang@gmail.com>
+ */
+class Base64VLQ
+{
+    // A Base64 VLQ digit can represent 5 bits, so it is base-32.
+    const VLQ_BASE_SHIFT = 5;
+
+    // A mask of bits for a VLQ digit (11111), 31 decimal.
+    const VLQ_BASE_MASK = 31;
+
+    // The continuation bit is the 6th bit.
+    const VLQ_CONTINUATION_BIT = 32;
+
+    /**
+     * Returns the VLQ encoded value.
+     *
+     * @param integer $value
+     *
+     * @return string
+     */
+    public static function encode($value)
+    {
+        $encoded = '';
+        $vlq = self::toVLQSigned($value);
+
+        do {
+            $digit = $vlq & self::VLQ_BASE_MASK;
+            $vlq >>= self::VLQ_BASE_SHIFT;
+
+            if ($vlq > 0) {
+                $digit |= self::VLQ_CONTINUATION_BIT;
+            }
+
+            $encoded .= Base64::encode($digit);
+        } while ($vlq > 0);
+
+        return $encoded;
+    }
+
+    /**
+     * Decodes VLQValue.
+     *
+     * @param string $str
+     * @param integer $index
+     *
+     * @return integer
+     */
+    public static function decode($str, &$index)
+    {
+        $result = 0;
+        $shift = 0;
+
+        do {
+            $c = $str[$index++];
+            $digit = Base64::decode($c);
+            $continuation = ($digit & self::VLQ_CONTINUATION_BIT) != 0;
+            $digit &= self::VLQ_BASE_MASK;
+            $result = $result + ($digit << $shift);
+            $shift = $shift + self::VLQ_BASE_SHIFT;
+        } while ($continuation);
+
+        return self::fromVLQSigned($result);
+    }
+
+    /**
+     * Converts from a two-complement value to a value where the sign bit is
+     * is placed in the least significant bit.  For example, as decimals:
+     *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
+     *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
+     *
+     * @param integer $value
+     *
+     * @return integer
+     */
+    private static function toVLQSigned($value)
+    {
+        if ($value < 0) {
+            return ((-$value) << 1) + 1;
+        }
+
+        return ($value << 1) + 0;
+    }
+
+    /**
+     * Converts to a two-complement value from a value where the sign bit is
+     * is placed in the least significant bit.  For example, as decimals:
+     *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
+     *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
+     *
+     * @param integer $value
+     *
+     * @return integer
+     */
+    private static function fromVLQSigned($value)
+    {
+        $negate = ($value & 1) === 1;
+        $value = $value >> 1;
+
+        return $negate ? -$value : $value;
+    }
+}
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 70b47cdc..6e969cae 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -61,7 +61,7 @@ class SourceMapGenerator
     /**
      * The base64 VLQ encoder
      *
-     * @var \Leafo\ScssPhp\SourceMap\Base64VLQEncoder
+     * @var \Leafo\ScssPhp\SourceMap\Base64VLQ
      */
     protected $encoder;
 
@@ -95,7 +95,7 @@ class SourceMapGenerator
     public function __construct(array $options = [])
     {
         $this->options = array_merge($this->defaultOptions, $options);
-        $this->encoder = new Base64VLQEncoder();
+        $this->encoder = new Base64VLQ();
     }
 
     /**
diff --git a/tests/Base64VLQTest.php b/tests/Base64VLQTest.php
index 21b373b8..a3b638de 100644
--- a/tests/Base64VLQTest.php
+++ b/tests/Base64VLQTest.php
@@ -11,7 +11,7 @@
 
 namespace Leafo\ScssPhp\Tests;
 
-use Leafo\ScssPhp\SourceMap\Base64VLQEncoder;
+use Leafo\ScssPhp\SourceMap\Base64VLQ;
 
 /**
  * Base64VLQ encoder test
@@ -30,7 +30,7 @@ class Base64VLQTest extends \PHPUnit_Framework_TestCase
      */
     public function testEncode($expected, $value)
     {
-        $encoder = new Base64VLQEncoder;
+        $encoder = new Base64VLQ;
 
         $this->assertEquals($expected, $encoder->encode($value));
     }

From c1ca4095952a431d4847862e048715bc6fa331fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Nguyen?= <k.nguyen@thecodingmachine.com>
Date: Thu, 11 Oct 2018 13:27:55 +0200
Subject: [PATCH 059/254] fix doc for addImportPath, should also accept
 callable as input

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 637f1c1c..ed80d8d3 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3308,7 +3308,7 @@ public function getParsedFiles()
      *
      * @api
      *
-     * @param string $path
+     * @param string|callable $path
      */
     public function addImportPath($path)
     {

From b931793663ac56d57d5f87f9f6f3f50cf6b73aa0 Mon Sep 17 00:00:00 2001
From: Geoff Willings <geoff@azexis.com>
Date: Tue, 23 Oct 2018 23:12:14 +0100
Subject: [PATCH 060/254] Bug fix error thrown from strpos if needle (basePath)
 is empty and ignore PhpStorm .idea IDE directory

---
 .gitignore                           | 1 +
 src/SourceMap/SourceMapGenerator.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index be6e5ecf..999984a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.idea
 .sass-cache
 scss_cache
 composer.lock
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 6e969cae..39bfac1c 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -303,7 +303,7 @@ protected function normalizeFilename($filename)
         $basePath = $this->options['sourceMapBasepath'];
 
         // "Trim" the 'sourceMapBasepath' from the output filename.
-        if (strpos($filename, $basePath) === 0) {
+        if (strlen($basePath) && strpos($filename, $basePath) === 0) {
             $filename = substr($filename, strlen($basePath));
         }
 

From a0e5590e65e33ad6c10e4c98e4aa7c8563779ee8 Mon Sep 17 00:00:00 2001
From: Geoff Willings <geoff@azexis.com>
Date: Wed, 24 Oct 2018 00:41:31 +0100
Subject: [PATCH 061/254] Fix bug where rooted SCSS URIs aren't normalised
 properly with baseUri provided

---
 src/Compiler.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..ee4efc96 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3481,9 +3481,12 @@ public function findImport($url)
             if (is_string($dir)) {
                 // check urls for normal import paths
                 foreach ($urls as $full) {
-                    $full = $dir
-                        . (! empty($dir) && substr($dir, -1) !== '/' ? '/' : '')
-                        . $full;
+                    $separator = (
+                        !empty($dir) &&
+                        substr($dir, -1) !== '/' &&
+                        substr($full, 0, 1) !== '/'
+                    ) ? '/' : '';
+                    $full = $dir . $separator . $full;
 
                     if ($this->fileExists($file = $full . '.scss') ||
                         ($hasExtension && $this->fileExists($file = $full))

From 51041822ae0e8b646e7d86de6c6f81100345f939 Mon Sep 17 00:00:00 2001
From: Geoff Willings <geoff@azexis.com>
Date: Wed, 24 Oct 2018 00:42:04 +0100
Subject: [PATCH 062/254] Json preference to not escape slashes (opinionated)

---
 src/SourceMap/SourceMapGenerator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 39bfac1c..7bb005c4 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -202,7 +202,7 @@ public function generateJson()
             unset($sourceMap['sourceRoot']);
         }
 
-        return json_encode($sourceMap);
+        return json_encode($sourceMap, JSON_UNESCAPED_SLASHES);
     }
 
     /**

From 94261339c3b11fdec1d230c57a54084c34a8c824 Mon Sep 17 00:00:00 2001
From: Vince <git@darkain.com>
Date: Wed, 13 Mar 2019 14:54:47 -0700
Subject: [PATCH 063/254] Fix for "continue" causing a warning in PHP 7.3

"continue statements targeting switch control flow structures will now generate a warning. In PHP such continue statements are equivalent to break, while they behave as continue 2 in other languages."
http://php.net/manual/en/migration73.incompatible.php

"In PHP the switch statement is considered a looping structure for the purposes of continue. continue behaves like break (when no arguments are passed). If a switch is inside a loop, continue 2 will continue with the next iteration of the outer loop."
http://php.net/manual/en/control-structures.continue.php

Signed-off-by: Vince <git@darkain.com>
---
 tests/ScssTest.php | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/tests/ScssTest.php b/tests/ScssTest.php
index 96f0d76e..9c412fe3 100644
--- a/tests/ScssTest.php
+++ b/tests/ScssTest.php
@@ -75,7 +75,7 @@ public function provideTests()
                     if (preg_match('/^\s*def test_([a-z_]+)/', $line, $matches)) {
                         $state = 1; // enter function
                         $name = $matches[1];
-                        continue;
+                        continue 2;
                     }
 
                     break;
@@ -83,7 +83,7 @@ public function provideTests()
                 case 1:
                     // inside function
                     if ($line === '' || $line[0] === '#') {
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/= <<([A-Z_]+)\s*$/', $line, $matches)
@@ -95,14 +95,14 @@ public function provideTests()
                             ;
                         }
 
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_equal\(<<CSS, render\(<<SASS\)\)\s*$/', $line, $matches)
                         || preg_match('/^\s*assert_equal <<CSS, render\(<<SASS\)\s*$/', $line, $matches)
                     ) {
                         $state = 6; // sass parameter list
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_equal\(<<CSS, render\(<<SCSS\)\)\s*$/', $line, $matches)
@@ -114,12 +114,12 @@ public function provideTests()
                     ) {
                         $state = 2; // get css
                         $style = isset($matches[1]) ? $matches[1] : null;
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_warning .* do$/', $line)) {
                         $state = 4; // skip block
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_raise_message.*render\(<<SCSS\)}\s*$/', $line)
@@ -135,7 +135,7 @@ public function provideTests()
                         || preg_match('/^\s*render <<SCSS\s*$/', $line)
                     ) {
                         $state = 6; // begin parameter list
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_equal\(<<CSS,/', $line)) {
@@ -143,13 +143,13 @@ public function provideTests()
                             ;
                         }
 
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_equal[ (].*,$/', $line)
                     ) {
                         $i++; // throw-away the next line too
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_equal[ (]/', $line)
@@ -158,7 +158,7 @@ public function provideTests()
                         || preg_match('/^\s*render[ (]"/', $line)
                         || $line === 'rescue Sass::SyntaxError => e'
                     ) {
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*end\s*$/', $line)) {
@@ -168,7 +168,7 @@ public function provideTests()
                         $scss = array();
                         $css = array();
                         $style = null;
-                        continue;
+                        continue 2;
                     }
 
                     $skipped[] = $line;
@@ -179,9 +179,9 @@ public function provideTests()
                     // get css
                     if (preg_match('/^CSS\s*$/', $line)) {
                         $state = 3; // get scss
-                        continue;
+                        continue 2;
                     }
-   
+
                     $css[] = $lines[$i];
 
                     break;
@@ -190,9 +190,9 @@ public function provideTests()
                     // get scss
                     if (preg_match('/^SCSS\s*$/', $line)) {
                         $state = 1; // end of parameter list
-                        continue;
+                        continue 2;
                     }
-   
+
                     $scss[] = $lines[$i];
 
                     break;
@@ -201,12 +201,12 @@ public function provideTests()
                     // inside block
                     if (preg_match('/^\s*end\s*$/', $line)) {
                         $state = 1; // end block
-                        continue;
+                        continue 2;
                     }
 
                     if (preg_match('/^\s*assert_equal <<CSS, render\(<<SCSS\)\s*$/', $line)) {
                         $state = 5; // begin parameter list
-                        continue;
+                        continue 2;
                     }
 
                     break;
@@ -215,18 +215,18 @@ public function provideTests()
                     // consume parameters
                     if (preg_match('/^SCSS\s*$/', $line)) {
                         $state = 4; // end of parameter list
-                        continue;
+                        continue 2;
                     }
-   
+
                     break;
 
                 case 6:
                     // consume parameters
                     if (preg_match('/^S[AC]SS\s*$/', $line)) {
                         $state = 1; // end of parameter list
-                        continue;
+                        continue 2;
                     }
-   
+
                     break;
             }
         }

From 230ecef5c0152eab50e2716ab118baca1eb5367b Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 17 Mar 2019 23:23:12 +0200
Subject: [PATCH 064/254] Avoid infinitely duplicating parts when extending
 selector

---
 src/Compiler.php                              |  7 ++++++-
 tests/inputs/extending_compound_selector.scss | 19 +++++++++++++++++++
 tests/outputs/extending_compound_selector.css |  4 ++++
 .../extending_compound_selector.css           | 11 +++++++++++
 4 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 tests/inputs/extending_compound_selector.scss
 create mode 100644 tests/outputs/extending_compound_selector.css
 create mode 100644 tests/outputs_numbered/extending_compound_selector.css

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..c73f5b02 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -463,7 +463,12 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                     $tempReplacement = $k > 0 ? array_slice($new, $k) : $new;
 
                     for ($l = count($tempReplacement) - 1; $l >= 0; $l--) {
-                        $slice = $tempReplacement[$l];
+                        $slice = [];
+                        foreach ($tempReplacement[$l] as $chunk) {
+                            if (!in_array($chunk, $slice)) {
+                                $slice[] = $chunk;
+                            }
+                        }
                         array_unshift($replacement, $slice);
 
                         if (! $this->isImmediateRelationshipCombinator(end($slice))) {
diff --git a/tests/inputs/extending_compound_selector.scss b/tests/inputs/extending_compound_selector.scss
new file mode 100644
index 00000000..669591fd
--- /dev/null
+++ b/tests/inputs/extending_compound_selector.scss
@@ -0,0 +1,19 @@
+.foo {
+  &:after {
+    color: red;
+  }
+  &:hover:after {
+    color: blue;
+  }
+}
+
+.bar {
+  @extend .foo;
+  &:before {
+    @extend .bar:after;
+  }
+}
+
+.baz.bar:before {
+  @extend .bar:before;
+}
diff --git a/tests/outputs/extending_compound_selector.css b/tests/outputs/extending_compound_selector.css
new file mode 100644
index 00000000..7e8cb599
--- /dev/null
+++ b/tests/outputs/extending_compound_selector.css
@@ -0,0 +1,4 @@
+.foo:after, .bar:after, .bar:before, .baz.bar:before {
+  color: red; }
+  .foo:hover:after, .bar:hover:after, .bar:before:hover, .baz.bar:before:hover {
+    color: blue; }
diff --git a/tests/outputs_numbered/extending_compound_selector.css b/tests/outputs_numbered/extending_compound_selector.css
new file mode 100644
index 00000000..50685dcf
--- /dev/null
+++ b/tests/outputs_numbered/extending_compound_selector.css
@@ -0,0 +1,11 @@
+/* line 1, inputs/extending_compound_selector.scss */
+/* line 2, inputs/extending_compound_selector.scss */
+  .foo:after, .bar:after, .bar:before, .baz.bar:before {
+    color: red; }
+/* line 5, inputs/extending_compound_selector.scss */
+.foo:hover:after, .bar:hover:after, .bar:before:hover, .baz.bar:before:hover {
+  color: blue; }
+/* line 10, inputs/extending_compound_selector.scss */
+/* line 12, inputs/extending_compound_selector.scss */
+
+/* line 17, inputs/extending_compound_selector.scss */

From 405ebd336c86b397841eb3d17af1aa9200ca2b41 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Sun, 17 Mar 2019 23:56:10 +0200
Subject: [PATCH 065/254] Change private properties to protected in compiler

---
 src/Compiler.php | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..f9934aa2 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -145,18 +145,18 @@ class Compiler
     protected $charsetSeen;
     protected $sourceNames;
 
-    private $indentLevel;
-    private $commentsSeen;
-    private $extends;
-    private $extendsMap;
-    private $parsedFiles;
-    private $parser;
-    private $sourceIndex;
-    private $sourceLine;
-    private $sourceColumn;
-    private $stderr;
-    private $shouldEvaluate;
-    private $ignoreErrors;
+    protected $indentLevel;
+    protected $commentsSeen;
+    protected $extends;
+    protected $extendsMap;
+    protected $parsedFiles;
+    protected $parser;
+    protected $sourceIndex;
+    protected $sourceLine;
+    protected $sourceColumn;
+    protected $stderr;
+    protected $shouldEvaluate;
+    protected $ignoreErrors;
 
     /**
      * Constructor
@@ -817,7 +817,7 @@ protected function compileAtRoot(Block $block)
      *
      * @return array
      */
-    private function spliceTree($envs, Block $block, $without)
+    protected function spliceTree($envs, Block $block, $without)
     {
         $newBlock = null;
 
@@ -894,7 +894,7 @@ private function spliceTree($envs, Block $block, $without)
      *
      * @return integer
      */
-    private function compileWith($with)
+    protected function compileWith($with)
     {
         static $mapping = [
             'rule'     => self::WITH_RULE,
@@ -945,7 +945,7 @@ private function compileWith($with)
      *
      * @return \Leafo\ScssPhp\Compiler\Environment
      */
-    private function filterWithout($envs, $without)
+    protected function filterWithout($envs, $without)
     {
         $filtered = [];
 
@@ -968,7 +968,7 @@ private function filterWithout($envs, $without)
      *
      * @return boolean
      */
-    private function isWithout($without, Block $block)
+    protected function isWithout($without, Block $block)
     {
         if ((($without & static::WITH_RULE) && isset($block->selectors)) ||
             (($without & static::WITH_MEDIA) &&
@@ -2215,7 +2215,7 @@ protected function reduce($value, $inExp = false)
      *
      * @return array|null
      */
-    private function fncall($name, $argValues)
+    protected function fncall($name, $argValues)
     {
         // SCSS @function
         if ($this->callScssFunction($name, $argValues, $returnValue)) {
@@ -3016,7 +3016,7 @@ protected function multiplyMedia(Environment $env = null, $childQueries = null)
      *
      * @return array
      */
-    private function compactEnv(Environment $env)
+    protected function compactEnv(Environment $env)
     {
         for ($envs = []; $env; $env = $env->parent) {
             $envs[] = $env;
@@ -3032,7 +3032,7 @@ private function compactEnv(Environment $env)
      *
      * @return \Leafo\ScssPhp\Compiler\Environment
      */
-    private function extractEnv($envs)
+    protected function extractEnv($envs)
     {
         for ($env = null; $e = array_pop($envs);) {
             $e->parent = $env;
@@ -3864,7 +3864,7 @@ protected function applyArguments($argDef, $argValues)
      *
      * @return array|\Leafo\ScssPhp\Node\Number
      */
-    private function coerceValue($value)
+    protected function coerceValue($value)
     {
         if (is_array($value) || $value instanceof \ArrayAccess) {
             return $value;
@@ -4203,7 +4203,7 @@ public function toHSL($red, $green, $blue)
      *
      * @return float
      */
-    private function hueToRGB($m1, $m2, $h)
+    protected function hueToRGB($m1, $m2, $h)
     {
         if ($h < 0) {
             $h += 1;

From 20d88db8a832429c2a4cac035c32a63b968cb6f4 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 13:30:27 -0700
Subject: [PATCH 066/254] add matchChar()

---
 src/Parser.php | 168 ++++++++++++++++++++++++++++---------------------
 1 file changed, 98 insertions(+), 70 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 748d38ae..5114cdab 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -286,7 +286,7 @@ protected function parseChunk()
             if ($this->literal('@at-root') &&
                 ($this->selectors($selector) || true) &&
                 ($this->map($with) || true) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 $atRoot = $this->pushSpecialBlock(Type::T_AT_ROOT, $s);
                 $atRoot->selector = $selector;
@@ -297,7 +297,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@media') && $this->mediaQueryList($mediaQueryList) && $this->literal('{')) {
+            if ($this->literal('@media') && $this->mediaQueryList($mediaQueryList) && $this->matchChar('{')) {
                 $media = $this->pushSpecialBlock(Type::T_MEDIA, $s);
                 $media->queryList = $mediaQueryList[2];
 
@@ -309,7 +309,7 @@ protected function parseChunk()
             if ($this->literal('@mixin') &&
                 $this->keyword($mixinName) &&
                 ($this->argumentDef($args) || true) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 $mixin = $this->pushSpecialBlock(Type::T_MIXIN, $s);
                 $mixin->name = $mixinName;
@@ -322,11 +322,11 @@ protected function parseChunk()
 
             if ($this->literal('@include') &&
                 $this->keyword($mixinName) &&
-                ($this->literal('(') &&
+                ($this->matchChar('(') &&
                     ($this->argValues($argValues) || true) &&
-                    $this->literal(')') || true) &&
+                    $this->matchChar(')') || true) &&
                 ($this->end() ||
-                    $this->literal('{') && $hasBlock = true)
+                    $this->matchChar('{') && $hasBlock = true)
             ) {
                 $child = [Type::T_INCLUDE, $mixinName, isset($argValues) ? $argValues : null, null];
 
@@ -391,7 +391,7 @@ protected function parseChunk()
             if ($this->literal('@function') &&
                 $this->keyword($fnName) &&
                 $this->argumentDef($args) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 $func = $this->pushSpecialBlock(Type::T_FUNCTION, $s);
                 $func->name = $fnName;
@@ -431,7 +431,7 @@ protected function parseChunk()
                 $this->genericList($varNames, 'variable', ',', false) &&
                 $this->literal('in') &&
                 $this->valueList($list) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 $each = $this->pushSpecialBlock(Type::T_EACH, $s);
 
@@ -448,7 +448,7 @@ protected function parseChunk()
 
             if ($this->literal('@while') &&
                 $this->expression($cond) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 $while = $this->pushSpecialBlock(Type::T_WHILE, $s);
                 $while->cond = $cond;
@@ -465,7 +465,7 @@ protected function parseChunk()
                 ($this->literal('through') ||
                     ($forUntil = true && $this->literal('to'))) &&
                 $this->expression($end) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 $for = $this->pushSpecialBlock(Type::T_FOR, $s);
                 $for->var = $varName[1];
@@ -478,7 +478,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@if') && $this->valueList($cond) && $this->literal('{')) {
+            if ($this->literal('@if') && $this->valueList($cond) && $this->matchChar('{')) {
                 $if = $this->pushSpecialBlock(Type::T_IF, $s);
                 $if->cond = $cond;
                 $if->cases = [];
@@ -535,9 +535,9 @@ protected function parseChunk()
                 list(, $if) = $last;
 
                 if ($this->literal('@else')) {
-                    if ($this->literal('{')) {
+                    if ($this->matchChar('{')) {
                         $else = $this->pushSpecialBlock(Type::T_ELSE, $s);
-                    } elseif ($this->literal('if') && $this->valueList($cond) && $this->literal('{')) {
+                    } elseif ($this->literal('if') && $this->valueList($cond) && $this->matchChar('{')) {
                         $else = $this->pushSpecialBlock(Type::T_ELSEIF, $s);
                         $else->cond = $cond;
                     }
@@ -576,10 +576,10 @@ protected function parseChunk()
             $this->seek($s);
 
             // doesn't match built in directive, do generic one
-            if ($this->literal('@', false) &&
+            if ($this->matchChar('@', false) &&
                 $this->keyword($dirName) &&
                 ($this->variable($dirValue) || $this->openString('{', $dirValue) || true) &&
-                $this->literal('{')
+                $this->matchChar('{')
             ) {
                 if ($dirName === 'media') {
                     $directive = $this->pushSpecialBlock(Type::T_MEDIA, $s);
@@ -617,7 +617,7 @@ protected function parseChunk()
 
         // variable assigns
         if ($this->variable($name) &&
-            $this->literal(':') &&
+            $this->matchChar(':') &&
             $this->valueList($value) &&
             $this->end()
         ) {
@@ -636,7 +636,7 @@ protected function parseChunk()
         }
 
         // opening css block
-        if ($this->selectors($selectors) && $this->literal('{')) {
+        if ($this->selectors($selectors) && $this->matchChar('{')) {
             $this->pushBlock($selectors, $s);
 
             return true;
@@ -645,7 +645,7 @@ protected function parseChunk()
         $this->seek($s);
 
         // property assign, or nested assign
-        if ($this->propertyName($name) && $this->literal(':')) {
+        if ($this->propertyName($name) && $this->matchChar(':')) {
             $foundSomething = false;
 
             if ($this->valueList($value)) {
@@ -653,7 +653,7 @@ protected function parseChunk()
                 $foundSomething = true;
             }
 
-            if ($this->literal('{')) {
+            if ($this->matchChar('{')) {
                 $propBlock = $this->pushSpecialBlock(Type::T_NESTED_PROPERTY, $s);
                 $propBlock->prefix = $name;
                 $foundSomething = true;
@@ -669,7 +669,7 @@ protected function parseChunk()
         $this->seek($s);
 
         // closing a block
-        if ($this->literal('}')) {
+        if ($this->matchChar('}')) {
             $block = $this->popBlock();
 
             if (isset($block->type) && $block->type === Type::T_INCLUDE) {
@@ -686,7 +686,7 @@ protected function parseChunk()
         }
 
         // extra stuff
-        if ($this->literal(';') ||
+        if ($this->matchChar(';') ||
             $this->literal('<!--')
         ) {
             return true;
@@ -885,6 +885,33 @@ protected function match($regex, &$out, $eatWhitespace = null)
         return false;
     }
 
+
+    /**
+     * Match a single string
+     *
+     * @param string  $char
+     * @param boolean $eatWhitespace
+     *
+     * @return boolean
+     */
+    protected function matchChar($char, $eatWhitespace = null)
+    {
+
+        if (! isset($eatWhitespace)) {
+            $eatWhitespace = $this->eatWhiteDefault;
+        }
+
+        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] === $char) {
+            $this->count++;
+            if ($eatWhitespace) {
+                $this->whitespace();
+            }
+            return true;
+        }
+        return false;
+    }
+
+
     /**
      * Match literal string
      *
@@ -914,6 +941,7 @@ protected function literal($what, $eatWhitespace = null)
         return false;
     }
 
+
     /**
      * Match some whitespace
      *
@@ -1065,10 +1093,10 @@ protected function mediaExpression(&$out)
         $s = $this->seek();
         $value = null;
 
-        if ($this->literal('(') &&
+        if ($this->matchChar('(') &&
             $this->expression($feature) &&
-            ($this->literal(':') && $this->expression($value) || true) &&
-            $this->literal(')')
+            ($this->matchChar(':') && $this->expression($value) || true) &&
+            $this->matchChar(')')
         ) {
             $out = [Type::T_MEDIA_EXPRESSION, $feature];
 
@@ -1115,7 +1143,7 @@ protected function argValue(&$out)
 
         $keyword = null;
 
-        if (! $this->variable($keyword) || ! $this->literal(':')) {
+        if (! $this->variable($keyword) || ! $this->matchChar(':')) {
             $this->seek($s);
             $keyword = null;
         }
@@ -1211,14 +1239,14 @@ protected function expression(&$out)
     {
         $s = $this->seek();
 
-        if ($this->literal('(')) {
-            if ($this->literal(')')) {
+        if ($this->matchChar('(')) {
+            if ($this->matchChar(')')) {
                 $out = [Type::T_LIST, '', []];
 
                 return true;
             }
 
-            if ($this->valueList($out) && $this->literal(')') && $out[0] === Type::T_LIST) {
+            if ($this->valueList($out) && $this->matchChar(')') && $out[0] === Type::T_LIST) {
                 return true;
             }
 
@@ -1333,7 +1361,7 @@ protected function value(&$out)
 
         $this->seek($s);
 
-        if ($this->literal('+') && $this->value($inner)) {
+        if ($this->matchChar('+') && $this->value($inner)) {
             $out = [Type::T_UNARY, '+', $inner, $this->inParens];
 
             return true;
@@ -1342,7 +1370,7 @@ protected function value(&$out)
         $this->seek($s);
 
         // negation
-        if ($this->literal('-', false) &&
+        if ($this->matchChar('-', false) &&
             ($this->variable($inner) ||
             $this->unit($inner) ||
             $this->parenValue($inner))
@@ -1392,8 +1420,8 @@ protected function parenValue(&$out)
 
         $inParens = $this->inParens;
 
-        if ($this->literal('(')) {
-            if ($this->literal(')')) {
+        if ($this->matchChar('(')) {
+            if ($this->matchChar(')')) {
                 $out = [Type::T_LIST, '', []];
 
                 return true;
@@ -1401,7 +1429,7 @@ protected function parenValue(&$out)
 
             $this->inParens = true;
 
-            if ($this->expression($exp) && $this->literal(')')) {
+            if ($this->expression($exp) && $this->matchChar(')')) {
                 $out = $exp;
                 $this->inParens = $inParens;
 
@@ -1428,11 +1456,11 @@ protected function progid(&$out)
 
         if ($this->literal('progid:', false) &&
             $this->openString('(', $fn) &&
-            $this->literal('(')
+            $this->matchChar('(')
         ) {
             $this->openString(')', $args, '(');
 
-            if ($this->literal(')')) {
+            if ($this->matchChar(')')) {
                 $out = [Type::T_STRING, '', [
                     'progid:', $fn, '(', $args, ')'
                 ]];
@@ -1458,7 +1486,7 @@ protected function func(&$func)
         $s = $this->seek();
 
         if ($this->keyword($name, false) &&
-            $this->literal('(')
+            $this->matchChar('(')
         ) {
             if ($name === 'alpha' && $this->argumentList($args)) {
                 $func = [Type::T_FUNCTION, $name, [Type::T_STRING, '', $args]];
@@ -1469,7 +1497,7 @@ protected function func(&$func)
             if ($name !== 'expression' && ! preg_match('/^(-[a-z]+-)?calc$/', $name)) {
                 $ss = $this->seek();
 
-                if ($this->argValues($args) && $this->literal(')')) {
+                if ($this->argValues($args) && $this->matchChar(')')) {
                     $func = [Type::T_FUNCTION_CALL, $name, $args];
 
                     return true;
@@ -1479,7 +1507,7 @@ protected function func(&$func)
             }
 
             if (($this->openString(')', $str, '(') || true) &&
-                $this->literal(')')
+                $this->matchChar(')')
             ) {
                 $args = [];
 
@@ -1508,12 +1536,12 @@ protected function func(&$func)
     protected function argumentList(&$out)
     {
         $s = $this->seek();
-        $this->literal('(');
+        $this->matchChar('(');
 
         $args = [];
 
         while ($this->keyword($var)) {
-            if ($this->literal('=') && $this->expression($exp)) {
+            if ($this->matchChar('=') && $this->expression($exp)) {
                 $args[] = [Type::T_STRING, '', [$var . '=']];
                 $arg = $exp;
             } else {
@@ -1522,14 +1550,14 @@ protected function argumentList(&$out)
 
             $args[] = $arg;
 
-            if (! $this->literal(',')) {
+            if (! $this->matchChar(',')) {
                 break;
             }
 
             $args[] = [Type::T_STRING, '', [', ']];
         }
 
-        if (! $this->literal(')') || ! count($args)) {
+        if (! $this->matchChar(')') || ! count($args)) {
             $this->seek($s);
 
             return false;
@@ -1550,7 +1578,7 @@ protected function argumentList(&$out)
     protected function argumentDef(&$out)
     {
         $s = $this->seek();
-        $this->literal('(');
+        $this->matchChar('(');
 
         $args = [];
 
@@ -1559,7 +1587,7 @@ protected function argumentDef(&$out)
 
             $ss = $this->seek();
 
-            if ($this->literal(':') && $this->genericList($defaultVal, 'expression')) {
+            if ($this->matchChar(':') && $this->genericList($defaultVal, 'expression')) {
                 $arg[1] = $defaultVal;
             } else {
                 $this->seek($ss);
@@ -1570,7 +1598,7 @@ protected function argumentDef(&$out)
             if ($this->literal('...')) {
                 $sss = $this->seek();
 
-                if (! $this->literal(')')) {
+                if (! $this->matchChar(')')) {
                     $this->throwParseError('... has to be after the final argument');
                 }
 
@@ -1582,12 +1610,12 @@ protected function argumentDef(&$out)
 
             $args[] = $arg;
 
-            if (! $this->literal(',')) {
+            if (! $this->matchChar(',')) {
                 break;
             }
         }
 
-        if (! $this->literal(')')) {
+        if (! $this->matchChar(')')) {
             $this->seek($s);
 
             return false;
@@ -1609,25 +1637,25 @@ protected function map(&$out)
     {
         $s = $this->seek();
 
-        if (! $this->literal('(')) {
+        if (! $this->matchChar('(')) {
             return false;
         }
 
         $keys = [];
         $values = [];
 
-        while ($this->genericList($key, 'expression') && $this->literal(':') &&
+        while ($this->genericList($key, 'expression') && $this->matchChar(':') &&
             $this->genericList($value, 'expression')
         ) {
             $keys[] = $key;
             $values[] = $value;
 
-            if (! $this->literal(',')) {
+            if (! $this->matchChar(',')) {
                 break;
             }
         }
 
-        if (! count($keys) || ! $this->literal(')')) {
+        if (! count($keys) || ! $this->matchChar(')')) {
             $this->seek($s);
 
             return false;
@@ -1704,9 +1732,9 @@ protected function string(&$out)
     {
         $s = $this->seek();
 
-        if ($this->literal('"', false)) {
+        if ($this->matchChar('"', false)) {
             $delim = '"';
-        } elseif ($this->literal("'", false)) {
+        } elseif ($this->matchChar("'", false)) {
             $delim = "'";
         } else {
             return false;
@@ -1733,9 +1761,9 @@ protected function string(&$out)
                     $content[] = '#{'; // ignore it
                 }
             } elseif ($m[2] === '\\') {
-                if ($this->literal('"', false)) {
+                if ($this->matchChar('"', false)) {
                     $content[] = $m[2] . '"';
-                } elseif ($this->literal("'", false)) {
+                } elseif ($this->matchChar("'", false)) {
                     $content[] = $m[2] . "'";
                 } elseif ($this->literal("\\", false)) {
                     $content[] = $m[2] . "\\";
@@ -1900,7 +1928,7 @@ protected function interpolation(&$out, $lookWhite = true)
 
         $s = $this->seek();
 
-        if ($this->literal('#{') && $this->valueList($value) && $this->literal('}', false)) {
+        if ($this->literal('#{') && $this->valueList($value) && $this->matchChar('}', false)) {
             if ($lookWhite) {
                 $left = preg_match('/\s/', $this->buffer[$s - 1]) ? ' ' : '';
                 $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';
@@ -2000,11 +2028,11 @@ protected function selectors(&$out)
         while ($this->selector($sel)) {
             $selectors[] = $sel;
 
-            if (! $this->literal(',')) {
+            if (! $this->matchChar(',')) {
                 break;
             }
 
-            while ($this->literal(',')) {
+            while ($this->matchChar(',')) {
                 ; // ignore extra
             }
         }
@@ -2077,7 +2105,7 @@ protected function selectorSingle(&$out)
 
         $parts = [];
 
-        if ($this->literal('*', false)) {
+        if ($this->matchChar('*', false)) {
             $parts[] = '*';
         }
 
@@ -2091,17 +2119,17 @@ protected function selectorSingle(&$out)
             $s = $this->seek();
 
             // self
-            if ($this->literal('&', false)) {
+            if ($this->matchChar('&', false)) {
                 $parts[] = Compiler::$selfSelector;
                 continue;
             }
 
-            if ($this->literal('.', false)) {
+            if ($this->matchChar('.', false)) {
                 $parts[] = '.';
                 continue;
             }
 
-            if ($this->literal('|', false)) {
+            if ($this->matchChar('|', false)) {
                 $parts[] = '|';
                 continue;
             }
@@ -2127,13 +2155,13 @@ protected function selectorSingle(&$out)
                 continue;
             }
 
-            if ($this->literal('%', false) && $this->placeholder($placeholder)) {
+            if ($this->matchChar('%', false) && $this->placeholder($placeholder)) {
                 $parts[] = '%';
                 $parts[] = $placeholder;
                 continue;
             }
 
-            if ($this->literal('#', false)) {
+            if ($this->matchChar('#', false)) {
                 $parts[] = '#';
                 continue;
             }
@@ -2148,9 +2176,9 @@ protected function selectorSingle(&$out)
 
                 $ss = $this->seek();
 
-                if ($this->literal('(') &&
+                if ($this->matchChar('(') &&
                     ($this->openString(')', $str, '(') || true) &&
-                    $this->literal(')')
+                    $this->matchChar(')')
                 ) {
                     $parts[] = '(';
 
@@ -2169,9 +2197,9 @@ protected function selectorSingle(&$out)
             $this->seek($s);
 
             // attribute selector
-            if ($this->literal('[') &&
+            if ($this->matchChar('[') &&
                ($this->openString(']', $str, '[') || true) &&
-               $this->literal(']')
+               $this->matchChar(']')
             ) {
                 $parts[] = '[';
 
@@ -2211,7 +2239,7 @@ protected function variable(&$out)
     {
         $s = $this->seek();
 
-        if ($this->literal('$', false) && $this->keyword($name)) {
+        if ($this->matchChar('$', false) && $this->keyword($name)) {
             $out = [Type::T_VARIABLE, $name];
 
             return true;
@@ -2295,7 +2323,7 @@ protected function url(&$out)
      */
     protected function end()
     {
-        if ($this->literal(';')) {
+        if ($this->matchChar(';')) {
             return true;
         }
 

From f3d48b158aac12ffd0b47f89887ba76ba7f12062 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 13:49:08 -0700
Subject: [PATCH 067/254] get next character once in selectorSingle()

---
 src/Parser.php | 56 +++++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 5114cdab..f98f17c7 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2116,24 +2116,30 @@ protected function selectorSingle(&$out)
                 break;
             }
 
-            $s = $this->seek();
-
-            // self
-            if ($this->matchChar('&', false)) {
-                $parts[] = Compiler::$selfSelector;
-                continue;
+            if (! isset($this->buffer[$this->count])) {
+                break;
             }
 
-            if ($this->matchChar('.', false)) {
-                $parts[] = '.';
-                continue;
-            }
+            $s = $this->seek();
+            $char = $this->buffer[$this->count];
 
-            if ($this->matchChar('|', false)) {
-                $parts[] = '|';
-                continue;
+            //self
+            switch ($char) {
+                case '&':
+                    $parts[] = Compiler::$selfSelector;
+                    $this->count++;
+                    continue 2;
+                case '.':
+                    $parts[] = '.';
+                    $this->count++;
+                    continue 2;
+                case '|':
+                    $parts[] = '|';
+                    $this->count++;
+                    continue 2;
             }
 
+
             if ($this->match('\\\\\S', $m)) {
                 $parts[] = $m[0];
                 continue;
@@ -2155,19 +2161,23 @@ protected function selectorSingle(&$out)
                 continue;
             }
 
-            if ($this->matchChar('%', false) && $this->placeholder($placeholder)) {
-                $parts[] = '%';
-                $parts[] = $placeholder;
-                continue;
+            if ($char === '%') {
+                $this->count++;
+                if ($this->placeholder($placeholder)) {
+                    $parts[] = '%';
+                    $parts[] = $placeholder;
+                    continue;
+                }
             }
 
-            if ($this->matchChar('#', false)) {
+            if ($char === '#') {
                 $parts[] = '#';
+                $this->count++;
                 continue;
             }
 
             // a pseudo selector
-            if ($this->match('::?', $m) && $this->mixedKeyword($nameParts)) {
+            if ($char === ':' && $this->match('::?', $m) && $this->mixedKeyword($nameParts)) {
                 $parts[] = $m[0];
 
                 foreach ($nameParts as $sub) {
@@ -2177,8 +2187,8 @@ protected function selectorSingle(&$out)
                 $ss = $this->seek();
 
                 if ($this->matchChar('(') &&
-                    ($this->openString(')', $str, '(') || true) &&
-                    $this->matchChar(')')
+                  ($this->openString(')', $str, '(') || true) &&
+                  $this->matchChar(')')
                 ) {
                     $parts[] = '(';
 
@@ -2198,8 +2208,8 @@ protected function selectorSingle(&$out)
 
             // attribute selector
             if ($this->matchChar('[') &&
-               ($this->openString(']', $str, '[') || true) &&
-               $this->matchChar(']')
+              ($this->openString(']', $str, '[') || true) &&
+              $this->matchChar(']')
             ) {
                 $parts[] = '[';
 

From 8b5709bc3412bb4d2c77113bb90a1943d3bb4a55 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 13:56:55 -0700
Subject: [PATCH 068/254] seek() method with single purpose

---
 src/Parser.php | 60 +++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index f98f17c7..b0fbc1ed 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -271,7 +271,7 @@ public function parseSelector($buffer, &$out)
      * the buffer position will be left at an invalid state. In order to
      * avoid this, Compiler::seek() is used to remember and set buffer positions.
      *
-     * Before parsing a chain, use $s = $this->seek() to remember the current
+     * Before parsing a chain, use $s = $this->count to remember the current
      * position into $s. Then if a chain fails, use $this->seek($s) to
      * go back where we started.
      *
@@ -279,7 +279,7 @@ public function parseSelector($buffer, &$out)
      */
     protected function parseChunk()
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         // the directives
         if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] === '@') {
@@ -803,15 +803,9 @@ protected function peek($regex, &$out, $from = null)
      *
      * @return integer
      */
-    protected function seek($where = null)
+    protected function seek($where)
     {
-        if ($where === null) {
-            return $this->count;
-        }
-
         $this->count = $where;
-
-        return true;
     }
 
     /**
@@ -1090,7 +1084,7 @@ protected function mediaQuery(&$out)
      */
     protected function mediaExpression(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
         $value = null;
 
         if ($this->matchChar('(') &&
@@ -1139,7 +1133,7 @@ protected function argValues(&$out)
      */
     protected function argValue(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         $keyword = null;
 
@@ -1150,7 +1144,7 @@ protected function argValue(&$out)
 
         if ($this->genericList($value, 'expression')) {
             $out = [$keyword, $value, false];
-            $s = $this->seek();
+            $s = $this->count;
 
             if ($this->literal('...')) {
                 $out[2] = true;
@@ -1200,7 +1194,7 @@ protected function spaceList(&$out)
      */
     protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
     {
-        $s = $this->seek();
+        $s = $this->count;
         $items = [];
 
         while ($this->$parseItem($value)) {
@@ -1237,7 +1231,7 @@ protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
      */
     protected function expression(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->matchChar('(')) {
             if ($this->matchChar(')')) {
@@ -1280,7 +1274,7 @@ protected function expHelper($lhs, $minP)
     {
         $operators = static::$operatorPattern;
 
-        $ss = $this->seek();
+        $ss = $this->count;
         $whiteBefore = isset($this->buffer[$this->count - 1]) &&
             ctype_space($this->buffer[$this->count - 1]);
 
@@ -1309,7 +1303,7 @@ protected function expHelper($lhs, $minP)
             }
 
             $lhs = [Type::T_EXPRESSION, $op, $lhs, $rhs, $this->inParens, $whiteBefore, $whiteAfter];
-            $ss = $this->seek();
+            $ss = $this->count;
             $whiteBefore = isset($this->buffer[$this->count - 1]) &&
                 ctype_space($this->buffer[$this->count - 1]);
         }
@@ -1328,7 +1322,7 @@ protected function expHelper($lhs, $minP)
      */
     protected function value(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->literal('url(') && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
             $len = strspn($this->buffer, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=', $this->count);
@@ -1416,7 +1410,7 @@ protected function value(&$out)
      */
     protected function parenValue(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         $inParens = $this->inParens;
 
@@ -1452,7 +1446,7 @@ protected function parenValue(&$out)
      */
     protected function progid(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->literal('progid:', false) &&
             $this->openString('(', $fn) &&
@@ -1483,7 +1477,7 @@ protected function progid(&$out)
      */
     protected function func(&$func)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->keyword($name, false) &&
             $this->matchChar('(')
@@ -1495,7 +1489,7 @@ protected function func(&$func)
             }
 
             if ($name !== 'expression' && ! preg_match('/^(-[a-z]+-)?calc$/', $name)) {
-                $ss = $this->seek();
+                $ss = $this->count;
 
                 if ($this->argValues($args) && $this->matchChar(')')) {
                     $func = [Type::T_FUNCTION_CALL, $name, $args];
@@ -1535,7 +1529,7 @@ protected function func(&$func)
      */
     protected function argumentList(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
         $this->matchChar('(');
 
         $args = [];
@@ -1577,7 +1571,7 @@ protected function argumentList(&$out)
      */
     protected function argumentDef(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
         $this->matchChar('(');
 
         $args = [];
@@ -1585,7 +1579,7 @@ protected function argumentDef(&$out)
         while ($this->variable($var)) {
             $arg = [$var[1], null, false];
 
-            $ss = $this->seek();
+            $ss = $this->count;
 
             if ($this->matchChar(':') && $this->genericList($defaultVal, 'expression')) {
                 $arg[1] = $defaultVal;
@@ -1593,10 +1587,10 @@ protected function argumentDef(&$out)
                 $this->seek($ss);
             }
 
-            $ss = $this->seek();
+            $ss = $this->count;
 
             if ($this->literal('...')) {
-                $sss = $this->seek();
+                $sss = $this->count;
 
                 if (! $this->matchChar(')')) {
                     $this->throwParseError('... has to be after the final argument');
@@ -1635,7 +1629,7 @@ protected function argumentDef(&$out)
      */
     protected function map(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if (! $this->matchChar('(')) {
             return false;
@@ -1730,7 +1724,7 @@ protected function unit(&$unit)
      */
     protected function string(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->matchChar('"', false)) {
             $delim = '"';
@@ -1926,7 +1920,7 @@ protected function interpolation(&$out, $lookWhite = true)
         $oldWhite = $this->eatWhiteDefault;
         $this->eatWhiteDefault = true;
 
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->literal('#{') && $this->valueList($value) && $this->matchChar('}', false)) {
             if ($lookWhite) {
@@ -2022,7 +2016,7 @@ protected function propertyName(&$out)
      */
     protected function selectors(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
         $selectors = [];
 
         while ($this->selector($sel)) {
@@ -2120,7 +2114,7 @@ protected function selectorSingle(&$out)
                 break;
             }
 
-            $s = $this->seek();
+            $s = $this->count;
             $char = $this->buffer[$this->count];
 
             //self
@@ -2184,7 +2178,7 @@ protected function selectorSingle(&$out)
                     $parts[] = $sub;
                 }
 
-                $ss = $this->seek();
+                $ss = $this->count;
 
                 if ($this->matchChar('(') &&
                   ($this->openString(')', $str, '(') || true) &&
@@ -2247,7 +2241,7 @@ protected function selectorSingle(&$out)
      */
     protected function variable(&$out)
     {
-        $s = $this->seek();
+        $s = $this->count;
 
         if ($this->matchChar('$', false) && $this->keyword($name)) {
             $out = [Type::T_VARIABLE, $name];

From e7bb1151c561a6043fe603845d7e630a52b86eb6 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 14:20:07 -0700
Subject: [PATCH 069/254] add  parameter to Literal()

---
 src/Parser.php | 89 +++++++++++++++++++++++++-------------------------
 1 file changed, 44 insertions(+), 45 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index b0fbc1ed..10c6554f 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -283,7 +283,7 @@ protected function parseChunk()
 
         // the directives
         if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] === '@') {
-            if ($this->literal('@at-root') &&
+            if ($this->literal('@at-root', 8) &&
                 ($this->selectors($selector) || true) &&
                 ($this->map($with) || true) &&
                 $this->matchChar('{')
@@ -297,7 +297,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@media') && $this->mediaQueryList($mediaQueryList) && $this->matchChar('{')) {
+            if ($this->literal('@media', 6) && $this->mediaQueryList($mediaQueryList) && $this->matchChar('{')) {
                 $media = $this->pushSpecialBlock(Type::T_MEDIA, $s);
                 $media->queryList = $mediaQueryList[2];
 
@@ -306,7 +306,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@mixin') &&
+            if ($this->literal('@mixin', 6) &&
                 $this->keyword($mixinName) &&
                 ($this->argumentDef($args) || true) &&
                 $this->matchChar('{')
@@ -320,7 +320,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@include') &&
+            if ($this->literal('@include', 8) &&
                 $this->keyword($mixinName) &&
                 ($this->matchChar('(') &&
                     ($this->argValues($argValues) || true) &&
@@ -342,7 +342,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@scssphp-import-once') &&
+            if ($this->literal('@scssphp-import-once', 20) &&
                 $this->valueList($importPath) &&
                 $this->end()
             ) {
@@ -353,7 +353,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@import') &&
+            if ($this->literal('@import', 7) &&
                 $this->valueList($importPath) &&
                 $this->end()
             ) {
@@ -364,7 +364,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@import') &&
+            if ($this->literal('@import', 7) &&
                 $this->url($importPath) &&
                 $this->end()
             ) {
@@ -375,7 +375,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@extend') &&
+            if ($this->literal('@extend', 7) &&
                 $this->selectors($selectors) &&
                 $this->end()
             ) {
@@ -388,7 +388,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@function') &&
+            if ($this->literal('@function', 9) &&
                 $this->keyword($fnName) &&
                 $this->argumentDef($args) &&
                 $this->matchChar('{')
@@ -402,7 +402,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@break') && $this->end()) {
+            if ($this->literal('@break', 6) && $this->end()) {
                 $this->append([Type::T_BREAK], $s);
 
                 return true;
@@ -410,7 +410,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@continue') && $this->end()) {
+            if ($this->literal('@continue', 9) && $this->end()) {
                 $this->append([Type::T_CONTINUE], $s);
 
                 return true;
@@ -419,7 +419,7 @@ protected function parseChunk()
             $this->seek($s);
 
 
-            if ($this->literal('@return') && ($this->valueList($retVal) || true) && $this->end()) {
+            if ($this->literal('@return', 7) && ($this->valueList($retVal) || true) && $this->end()) {
                 $this->append([Type::T_RETURN, isset($retVal) ? $retVal : [Type::T_NULL]], $s);
 
                 return true;
@@ -427,9 +427,9 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@each') &&
+            if ($this->literal('@each', 5) &&
                 $this->genericList($varNames, 'variable', ',', false) &&
-                $this->literal('in') &&
+                $this->literal('in', 2) &&
                 $this->valueList($list) &&
                 $this->matchChar('{')
             ) {
@@ -446,7 +446,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@while') &&
+            if ($this->literal('@while', 6) &&
                 $this->expression($cond) &&
                 $this->matchChar('{')
             ) {
@@ -458,12 +458,12 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@for') &&
+            if ($this->literal('@for', 4) &&
                 $this->variable($varName) &&
-                $this->literal('from') &&
+                $this->literal('from', 4) &&
                 $this->expression($start) &&
-                ($this->literal('through') ||
-                    ($forUntil = true && $this->literal('to'))) &&
+                ($this->literal('through', 7) ||
+                    ($forUntil = true && $this->literal('to', 2))) &&
                 $this->expression($end) &&
                 $this->matchChar('{')
             ) {
@@ -478,7 +478,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@if') && $this->valueList($cond) && $this->matchChar('{')) {
+            if ($this->literal('@if', 3) && $this->valueList($cond) && $this->matchChar('{')) {
                 $if = $this->pushSpecialBlock(Type::T_IF, $s);
                 $if->cond = $cond;
                 $if->cases = [];
@@ -488,7 +488,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@debug') &&
+            if ($this->literal('@debug', 6) &&
                 $this->valueList($value) &&
                 $this->end()
             ) {
@@ -499,7 +499,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@warn') &&
+            if ($this->literal('@warn', 5) &&
                 $this->valueList($value) &&
                 $this->end()
             ) {
@@ -510,7 +510,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@error') &&
+            if ($this->literal('@error', 6) &&
                 $this->valueList($value) &&
                 $this->end()
             ) {
@@ -521,7 +521,7 @@ protected function parseChunk()
 
             $this->seek($s);
 
-            if ($this->literal('@content') && $this->end()) {
+            if ($this->literal('@content', 8) && $this->end()) {
                 $this->append([Type::T_MIXIN_CONTENT], $s);
 
                 return true;
@@ -534,10 +534,10 @@ protected function parseChunk()
             if (isset($last) && $last[0] === Type::T_IF) {
                 list(, $if) = $last;
 
-                if ($this->literal('@else')) {
+                if ($this->literal('@else', 5)) {
                     if ($this->matchChar('{')) {
                         $else = $this->pushSpecialBlock(Type::T_ELSE, $s);
-                    } elseif ($this->literal('if') && $this->valueList($cond) && $this->matchChar('{')) {
+                    } elseif ($this->literal('if', 2) && $this->valueList($cond) && $this->matchChar('{')) {
                         $else = $this->pushSpecialBlock(Type::T_ELSEIF, $s);
                         $else->cond = $cond;
                     }
@@ -554,7 +554,7 @@ protected function parseChunk()
             }
 
             // only retain the first @charset directive encountered
-            if ($this->literal('@charset') &&
+            if ($this->literal('@charset', 8) &&
                 $this->valueList($charset) &&
                 $this->end()
             ) {
@@ -603,7 +603,7 @@ protected function parseChunk()
         // property shortcut
         // captures most properties before having to parse a selector
         if ($this->keyword($name, false) &&
-            $this->literal(': ') &&
+            $this->literal(': ', 2) &&
             $this->valueList($value) &&
             $this->end()
         ) {
@@ -631,7 +631,7 @@ protected function parseChunk()
         $this->seek($s);
 
         // misc
-        if ($this->literal('-->')) {
+        if ($this->literal('-->', 3)) {
             return true;
         }
 
@@ -687,7 +687,7 @@ protected function parseChunk()
 
         // extra stuff
         if ($this->matchChar(';') ||
-            $this->literal('<!--')
+            $this->literal('<!--', 4)
         ) {
             return true;
         }
@@ -910,18 +910,17 @@ protected function matchChar($char, $eatWhitespace = null)
      * Match literal string
      *
      * @param string  $what
+     * @param integer $len
      * @param boolean $eatWhitespace
      *
      * @return boolean
      */
-    protected function literal($what, $eatWhitespace = null)
+    protected function literal($what, $len, $eatWhitespace = null)
     {
         if (! isset($eatWhitespace)) {
             $eatWhitespace = $this->eatWhiteDefault;
         }
 
-        $len = strlen($what);
-
         if (strcasecmp(substr($this->buffer, $this->count, $len), $what) === 0) {
             $this->count += $len;
 
@@ -1035,7 +1034,7 @@ protected function mediaQuery(&$out)
         $expressions = null;
         $parts = [];
 
-        if (($this->literal('only') && ($only = true) || $this->literal('not') && ($not = true) || true) &&
+        if (($this->literal('only', 4) && ($only = true) || $this->literal('not', 3) && ($not = true) || true) &&
             $this->mixedKeyword($mediaType)
         ) {
             $prop = [Type::T_MEDIA_TYPE];
@@ -1062,7 +1061,7 @@ protected function mediaQuery(&$out)
             $parts[] = $prop;
         }
 
-        if (empty($parts) || $this->literal('and')) {
+        if (empty($parts) || $this->literal('and', 3)) {
             $this->genericList($expressions, 'mediaExpression', 'and', false);
 
             if (is_array($expressions)) {
@@ -1146,7 +1145,7 @@ protected function argValue(&$out)
             $out = [$keyword, $value, false];
             $s = $this->count;
 
-            if ($this->literal('...')) {
+            if ($this->literal('...', 3)) {
                 $out[2] = true;
             } else {
                 $this->seek($s);
@@ -1201,7 +1200,7 @@ protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
             $items[] = $value;
 
             if ($delim) {
-                if (! $this->literal($delim)) {
+                if (! $this->literal($delim, strlen($delim))) {
                     break;
                 }
             }
@@ -1324,7 +1323,7 @@ protected function value(&$out)
     {
         $s = $this->count;
 
-        if ($this->literal('url(') && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
+        if ($this->literal('url(', 4) && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
             $len = strspn($this->buffer, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=', $this->count);
 
             $this->count += $len;
@@ -1339,7 +1338,7 @@ protected function value(&$out)
 
         $this->seek($s);
 
-        if ($this->literal('not', false) && $this->whitespace() && $this->value($inner)) {
+        if ($this->literal('not', 3, false) && $this->whitespace() && $this->value($inner)) {
             $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
 
             return true;
@@ -1347,7 +1346,7 @@ protected function value(&$out)
 
         $this->seek($s);
 
-        if ($this->literal('not', false) && $this->parenValue($inner)) {
+        if ($this->literal('not', 3, false) && $this->parenValue($inner)) {
             $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
 
             return true;
@@ -1448,7 +1447,7 @@ protected function progid(&$out)
     {
         $s = $this->count;
 
-        if ($this->literal('progid:', false) &&
+        if ($this->literal('progid:', 7, false) &&
             $this->openString('(', $fn) &&
             $this->matchChar('(')
         ) {
@@ -1589,7 +1588,7 @@ protected function argumentDef(&$out)
 
             $ss = $this->count;
 
-            if ($this->literal('...')) {
+            if ($this->literal('...', 3)) {
                 $sss = $this->count;
 
                 if (! $this->matchChar(')')) {
@@ -1759,7 +1758,7 @@ protected function string(&$out)
                     $content[] = $m[2] . '"';
                 } elseif ($this->matchChar("'", false)) {
                     $content[] = $m[2] . "'";
-                } elseif ($this->literal("\\", false)) {
+                } elseif ($this->literal("\\", 1, false)) {
                     $content[] = $m[2] . "\\";
                 } else {
                     $content[] = $m[2];
@@ -1772,7 +1771,7 @@ protected function string(&$out)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if ($this->literal($delim)) {
+        if ($this->literal($delim, strlen($delim))) {
             if ($hasInterpolation) {
                 $delim = '"';
 
@@ -1922,7 +1921,7 @@ protected function interpolation(&$out, $lookWhite = true)
 
         $s = $this->count;
 
-        if ($this->literal('#{') && $this->valueList($value) && $this->matchChar('}', false)) {
+        if ($this->literal('#{', 2) && $this->valueList($value) && $this->matchChar('}', false)) {
             if ($lookWhite) {
                 $left = preg_match('/\s/', $this->buffer[$s - 1]) ? ' ' : '';
                 $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';

From cbe92dae6e4a143771b586e36e49a2eec09ced64 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 14:29:57 -0700
Subject: [PATCH 070/254] determine whitespace eating after match

---
 src/Parser.php | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 10c6554f..085c32a1 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -891,18 +891,20 @@ protected function match($regex, &$out, $eatWhitespace = null)
     protected function matchChar($char, $eatWhitespace = null)
     {
 
+        if (! isset($this->buffer[$this->count]) || $this->buffer[$this->count] !== $char) {
+            return false;
+        }
+
+        $this->count++;
+
         if (! isset($eatWhitespace)) {
             $eatWhitespace = $this->eatWhiteDefault;
         }
 
-        if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] === $char) {
-            $this->count++;
-            if ($eatWhitespace) {
-                $this->whitespace();
-            }
-            return true;
+        if ($eatWhitespace) {
+            $this->whitespace();
         }
-        return false;
+        return true;
     }
 
 
@@ -917,21 +919,21 @@ protected function matchChar($char, $eatWhitespace = null)
      */
     protected function literal($what, $len, $eatWhitespace = null)
     {
-        if (! isset($eatWhitespace)) {
-            $eatWhitespace = $this->eatWhiteDefault;
-        }
 
-        if (strcasecmp(substr($this->buffer, $this->count, $len), $what) === 0) {
-            $this->count += $len;
+        if (strcasecmp(substr($this->buffer, $this->count, $len), $what) !== 0) {
+            return false;
+        }
 
-            if ($eatWhitespace) {
-                $this->whitespace();
-            }
+        $this->count += $len;
 
-            return true;
+        if (! isset($eatWhitespace)) {
+            $eatWhitespace = $this->eatWhiteDefault;
         }
 
-        return false;
+        if ($eatWhitespace) {
+            $this->whitespace();
+        }
+        return true;
     }
 
 

From 3eddff1e6e659156fd958ed1e0230b5ab33d4a78 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 14:54:06 -0700
Subject: [PATCH 071/254] check once for 'not' in value()

---
 src/Parser.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 085c32a1..f243174f 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1340,20 +1340,21 @@ protected function value(&$out)
 
         $this->seek($s);
 
-        if ($this->literal('not', 3, false) && $this->whitespace() && $this->value($inner)) {
-            $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
-
-            return true;
-        }
-
-        $this->seek($s);
+        if ($this->literal('not', 3, false)) {
+            if ($this->whitespace() && $this->value($inner)) {
+                $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+                return true;
+            }
 
-        if ($this->literal('not', 3, false) && $this->parenValue($inner)) {
-            $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+            $this->seek($s);
 
-            return true;
+            if ($this->parenValue($inner)) {
+                $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+                return true;
+            }
         }
 
+
         $this->seek($s);
 
         if ($this->matchChar('+') && $this->value($inner)) {

From e5f2cb823824cfdb3a93eac3b92c5e337e1a7990 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 15:02:12 -0700
Subject: [PATCH 072/254] get character once in value()

---
 src/Parser.php | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index f243174f..99c0b413 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1323,7 +1323,13 @@ protected function expHelper($lhs, $minP)
      */
     protected function value(&$out)
     {
+
+        if (! isset($this->buffer[$this->count])) {
+            return false;
+        }
+
         $s = $this->count;
+        $char = $this->buffer[$this->count];
 
         if ($this->literal('url(', 4) && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
             $len = strspn($this->buffer, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=', $this->count);
@@ -1340,7 +1346,8 @@ protected function value(&$out)
 
         $this->seek($s);
 
-        if ($this->literal('not', 3, false)) {
+        // not
+        if ($char === 'n' && $this->literal('not', 3, false)) {
             if ($this->whitespace() && $this->value($inner)) {
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
                 return true;
@@ -1352,31 +1359,31 @@ protected function value(&$out)
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
                 return true;
             }
-        }
 
+            $this->seek($s);
+        }
 
-        $this->seek($s);
-
-        if ($this->matchChar('+') && $this->value($inner)) {
-            $out = [Type::T_UNARY, '+', $inner, $this->inParens];
-
-            return true;
+        // addition
+        if ($char === '+') {
+            $this->count++;
+            if ($this->value($inner)) {
+                $out = [Type::T_UNARY, '+', $inner, $this->inParens];
+                return true;
+            }
+            $this->count--;
         }
 
-        $this->seek($s);
 
         // negation
-        if ($this->matchChar('-', false) &&
-            ($this->variable($inner) ||
-            $this->unit($inner) ||
-            $this->parenValue($inner))
-        ) {
-            $out = [Type::T_UNARY, '-', $inner, $this->inParens];
-
-            return true;
+        if ($char === '-') {
+            $this->count++;
+            if ($this->variable($inner) || $this->unit($inner) || $this->parenValue($inner)) {
+                $out = [Type::T_UNARY, '-', $inner, $this->inParens];
+                return true;
+            }
+            $this->count--;
         }
 
-        $this->seek($s);
 
         if ($this->parenValue($out) ||
             $this->interpolation($out) ||

From 6685dcdb5701be3cebbe53308869855922d7fb62 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 15:16:39 -0700
Subject: [PATCH 073/254] reduce usage of list()

---
 src/Compiler.php | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..849089c5 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1575,9 +1575,7 @@ protected function compileChild($child, OutputBlock $out)
 
         switch ($child[0]) {
             case Type::T_SCSSPHP_IMPORT_ONCE:
-                list(, $rawPath) = $child;
-
-                $rawPath = $this->reduce($rawPath);
+                $rawPath = $this->reduce($child[1]);
 
                 if (! $this->compileImport($rawPath, $out, true)) {
                     $out->lines[] = '@import ' . $this->compileValue($rawPath) . ';';
@@ -1585,9 +1583,7 @@ protected function compileChild($child, OutputBlock $out)
                 break;
 
             case Type::T_IMPORT:
-                list(, $rawPath) = $child;
-
-                $rawPath = $this->reduce($rawPath);
+                $rawPath = $this->reduce($child[1]);
 
                 if (! $this->compileImport($rawPath, $out)) {
                     $out->lines[] = '@import ' . $this->compileValue($rawPath) . ';';
@@ -1691,9 +1687,7 @@ protected function compileChild($child, OutputBlock $out)
                 break;
 
             case Type::T_EXTEND:
-                list(, $selectors) = $child;
-
-                foreach ($selectors as $sel) {
+                foreach ($child[1] as $sel) {
                     $results = $this->evalSelectors([$sel]);
 
                     foreach ($results as $result) {
@@ -2026,9 +2020,8 @@ protected function shouldEval($value)
      */
     protected function reduce($value, $inExp = false)
     {
-        list($type) = $value;
 
-        switch ($type) {
+        switch ($value[0]) {
             case Type::T_EXPRESSION:
                 list(, $op, $left, $right, $inParens) = $value;
 
@@ -2161,9 +2154,7 @@ protected function reduce($value, $inExp = false)
                 return [Type::T_STRING, '', [$op, $exp]];
 
             case Type::T_VARIABLE:
-                list(, $name) = $value;
-
-                return $this->reduce($this->get($name));
+                return $this->reduce($this->get($value[1]));
 
             case Type::T_LIST:
                 foreach ($value[2] as &$item) {
@@ -2198,9 +2189,7 @@ protected function reduce($value, $inExp = false)
                 return $value;
 
             case Type::T_FUNCTION_CALL:
-                list(, $name, $argValues) = $value;
-
-                return $this->fncall($name, $argValues);
+                return $this->fncall($value[1], $value[2]);
 
             default:
                 return $value;
@@ -2261,9 +2250,8 @@ protected function normalizeName($name)
     public function normalizeValue($value)
     {
         $value = $this->coerceForExpression($this->reduce($value));
-        list($type) = $value;
 
-        switch ($type) {
+        switch ($value[0]) {
             case Type::T_LIST:
                 $value = $this->extractInterpolation($value);
 
@@ -2278,7 +2266,7 @@ public function normalizeValue($value)
                 return $value;
 
             case Type::T_STRING:
-                return [$type, '"', [$this->compileStringContent($value)]];
+                return [$value[0], '"', [$this->compileStringContent($value)]];
 
             case Type::T_NUMBER:
                 return $value->normalize();
@@ -2683,9 +2671,7 @@ public function compileValue($value)
     {
         $value = $this->reduce($value);
 
-        list($type) = $value;
-
-        switch ($type) {
+        switch ($value[0]) {
             case Type::T_KEYWORD:
                 return $value[1];
 
@@ -2780,11 +2766,8 @@ public function compileValue($value)
                 return $left . $this->compileValue($interpolate) . $right;
 
             case Type::T_INTERPOLATE:
-                // raw parse node
-                list(, $exp) = $value;
-
                 // strip quotes if it's a string
-                $reduced = $this->reduce($exp);
+                $reduced = $this->reduce($value[1]);
 
                 switch ($reduced[0]) {
                     case Type::T_LIST:
@@ -2834,7 +2817,7 @@ public function compileValue($value)
                 return 'null';
 
             default:
-                $this->throwError("unknown value type: $type");
+                $this->throwError("unknown value type: $value[0]");
         }
     }
 

From 077f9dc502737b8780f7f9a0611ad454e20370df Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 15:22:26 -0700
Subject: [PATCH 074/254] determine whitespace eating after match

---
 src/Parser.php | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 99c0b413..e60898a3 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -860,23 +860,24 @@ protected function matchString(&$m, $delim)
      */
     protected function match($regex, &$out, $eatWhitespace = null)
     {
-        if (! isset($eatWhitespace)) {
-            $eatWhitespace = $this->eatWhiteDefault;
-        }
 
         $r = '/' . $regex . '/' . $this->patternModifiers;
 
-        if (preg_match($r, $this->buffer, $out, null, $this->count)) {
-            $this->count += strlen($out[0]);
+        if (! preg_match($r, $this->buffer, $out, null, $this->count)) {
+            return false;
+        }
 
-            if ($eatWhitespace) {
-                $this->whitespace();
-            }
+        $this->count += strlen($out[0]);
 
-            return true;
+        if (! isset($eatWhitespace)) {
+            $eatWhitespace = $this->eatWhiteDefault;
         }
 
-        return false;
+        if ($eatWhitespace) {
+            $this->whitespace();
+        }
+
+        return true;
     }
 
 

From 55958e140ef333de7e8dd9cac0c58cca4c906c17 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 15:34:48 -0700
Subject: [PATCH 075/254] check for backslash character before calling match()

---
 src/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index e60898a3..836a0bae 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2144,7 +2144,7 @@ protected function selectorSingle(&$out)
             }
 
 
-            if ($this->match('\\\\\S', $m)) {
+            if ($char === '\\' && $this->match('\\\\\S', $m)) {
                 $parts[] = $m[0];
                 continue;
             }

From af88e52f7daed3218123ff668ede8b2455085f02 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 15:51:44 -0700
Subject: [PATCH 076/254] reduce calls to match()

---
 src/Parser.php | 45 +++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 836a0bae..f8a726ab 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2181,31 +2181,40 @@ protected function selectorSingle(&$out)
             }
 
             // a pseudo selector
-            if ($char === ':' && $this->match('::?', $m) && $this->mixedKeyword($nameParts)) {
-                $parts[] = $m[0];
-
-                foreach ($nameParts as $sub) {
-                    $parts[] = $sub;
+            if ($char === ':') {
+                if ($this->buffer[$this->count + 1] === ':') {
+                    $this->count += 2;
+                    $part = '::';
+                } else {
+                    $this->count++;
+                    $part = ':';
                 }
+                if ($this->mixedKeyword($nameParts)) {
+                    $parts[] = $part;
 
-                $ss = $this->count;
+                    foreach ($nameParts as $sub) {
+                        $parts[] = $sub;
+                    }
 
-                if ($this->matchChar('(') &&
-                  ($this->openString(')', $str, '(') || true) &&
-                  $this->matchChar(')')
-                ) {
-                    $parts[] = '(';
+                    $ss = $this->count;
 
-                    if (! empty($str)) {
-                        $parts[] = $str;
+                    if ($this->matchChar('(') &&
+                      ($this->openString(')', $str, '(') || true) &&
+                      $this->matchChar(')')
+                    ) {
+                        $parts[] = '(';
+
+                        if (! empty($str)) {
+                            $parts[] = $str;
+                        }
+
+                        $parts[] = ')';
+                    } else {
+                        $this->seek($ss);
                     }
 
-                    $parts[] = ')';
-                } else {
-                    $this->seek($ss);
+                    continue;
                 }
-
-                continue;
             }
 
             $this->seek($s);

From ae9124207261a5daa4b0ac76f3fdc2647f43599c Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 16:00:33 -0700
Subject: [PATCH 077/254] reduce calls to match()

---
 src/Parser.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index f8a726ab..9da06398 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2114,12 +2114,6 @@ protected function selectorSingle(&$out)
         }
 
         for (;;) {
-            // see if we can stop early
-            if ($this->match('\s*[{,]', $m)) {
-                $this->count--;
-                break;
-            }
-
             if (! isset($this->buffer[$this->count])) {
                 break;
             }
@@ -2127,6 +2121,12 @@ protected function selectorSingle(&$out)
             $s = $this->count;
             $char = $this->buffer[$this->count];
 
+            // see if we can stop early
+            if ($char === '{' || $char === ',') {
+                break;
+            }
+
+
             //self
             switch ($char) {
                 case '&':

From c20248b0b81232d51033fc50154a834a8d182ba1 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 16:32:09 -0700
Subject: [PATCH 078/254] fewer calls to match()

---
 src/Parser.php | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 9da06398..0c49abd5 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2149,21 +2149,6 @@ protected function selectorSingle(&$out)
                 continue;
             }
 
-            // for keyframes
-            if ($this->unit($unit)) {
-                $parts[] = $unit;
-                continue;
-            }
-
-            if ($this->keyword($name)) {
-                $parts[] = $name;
-                continue;
-            }
-
-            if ($this->interpolation($inter)) {
-                $parts[] = $inter;
-                continue;
-            }
 
             if ($char === '%') {
                 $this->count++;
@@ -2175,11 +2160,17 @@ protected function selectorSingle(&$out)
             }
 
             if ($char === '#') {
+                if ($this->interpolation($inter)) {
+                    $parts[] = $inter;
+                    continue;
+                }
+
                 $parts[] = '#';
                 $this->count++;
                 continue;
             }
 
+
             // a pseudo selector
             if ($char === ':') {
                 if ($this->buffer[$this->count + 1] === ':') {
@@ -2217,8 +2208,21 @@ protected function selectorSingle(&$out)
                 }
             }
 
+
             $this->seek($s);
 
+
+            // for keyframes
+            if ($this->unit($unit)) {
+                $parts[] = $unit;
+                continue;
+            }
+
+            if ($this->keyword($name)) {
+                $parts[] = $name;
+                continue;
+            }
+
             // attribute selector
             if ($this->matchChar('[') &&
               ($this->openString(']', $str, '[') || true) &&

From 1d4bf9dd9c9a3c257d3a08eb12b93b2495faecfe Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 16:51:21 -0700
Subject: [PATCH 079/254] fewer calls to match()

---
 src/Parser.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 0c49abd5..d2396355 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2212,19 +2212,9 @@ protected function selectorSingle(&$out)
             $this->seek($s);
 
 
-            // for keyframes
-            if ($this->unit($unit)) {
-                $parts[] = $unit;
-                continue;
-            }
-
-            if ($this->keyword($name)) {
-                $parts[] = $name;
-                continue;
-            }
-
             // attribute selector
-            if ($this->matchChar('[') &&
+            if ($char === '[' &&
+              $this->matchChar('[') &&
               ($this->openString(']', $str, '[') || true) &&
               $this->matchChar(']')
             ) {
@@ -2241,6 +2231,19 @@ protected function selectorSingle(&$out)
 
             $this->seek($s);
 
+
+            // for keyframes
+            if ($this->unit($unit)) {
+                $parts[] = $unit;
+                continue;
+            }
+
+            if ($this->keyword($name)) {
+                $parts[] = $name;
+                continue;
+            }
+
+
             break;
         }
 

From 9a61d1a6defce68a21e51c222213ea749dd9aa65 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 16:57:23 -0700
Subject: [PATCH 080/254] stop early with semicolon and close bracket

---
 src/Parser.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index d2396355..693d15b0 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2122,7 +2122,7 @@ protected function selectorSingle(&$out)
             $char = $this->buffer[$this->count];
 
             // see if we can stop early
-            if ($char === '{' || $char === ',') {
+            if ($char === '{' || $char === ',' || $char === ';' || $char === '}') {
                 break;
             }
 
@@ -2244,6 +2244,8 @@ protected function selectorSingle(&$out)
             }
 
 
+
+
             break;
         }
 

From 6b4e491fa75bc383048e04e14ee37e96126a5df9 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 17:50:56 -0700
Subject: [PATCH 081/254] additional stop early check

---
 src/Parser.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index 693d15b0..39aac419 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2122,7 +2122,7 @@ protected function selectorSingle(&$out)
             $char = $this->buffer[$this->count];
 
             // see if we can stop early
-            if ($char === '{' || $char === ',' || $char === ';' || $char === '}') {
+            if ($char === '{' || $char === ',' || $char === ';' || $char === '}' || $char === '@') {
                 break;
             }
 
@@ -2157,6 +2157,7 @@ protected function selectorSingle(&$out)
                     $parts[] = $placeholder;
                     continue;
                 }
+                break;
             }
 
             if ($char === '#') {

From 1a10e42404fd9bec1e906d1c209f0a5568596b67 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 18:02:56 -0700
Subject: [PATCH 082/254] more efficient value() method

---
 src/Parser.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 39aac419..885ce4c5 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1372,6 +1372,7 @@ protected function value(&$out)
                 return true;
             }
             $this->count--;
+            return false;
         }
 
 
@@ -1385,12 +1386,23 @@ protected function value(&$out)
             $this->count--;
         }
 
+        // paren
+        if ($char === '(' && $this->parenValue($out)) {
+            return true;
+        }
+
+        if ($char === '#') {
+            if ($this->interpolation($out) || $this->color($out)) {
+                return true;
+            }
+        }
+
+        if ($char === '$' && $this->variable($out)) {
+            return true;
+        }
+
 
-        if ($this->parenValue($out) ||
-            $this->interpolation($out) ||
-            $this->variable($out) ||
-            $this->color($out) ||
-            $this->unit($out) ||
+        if ($this->unit($out) ||
             $this->string($out) ||
             $this->func($out) ||
             $this->progid($out)

From dd059fcf68db79c8bff96ea7902c468a48b8f2c7 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 18:06:20 -0700
Subject: [PATCH 083/254] dont use count when not needed

---
 src/Parser.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 885ce4c5..95c956c8 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -767,7 +767,7 @@ protected function popBlock()
         unset($block->parent);
 
         $comments = $block->comments;
-        if (count($comments)) {
+        if ($comments) {
             $this->env->comments = $comments;
             unset($block->comments);
         }
@@ -993,7 +993,7 @@ protected function append($statement, $pos = null)
 
         $comments = $this->env->comments;
 
-        if (count($comments)) {
+        if ($comments) {
             $this->env->children = array_merge($this->env->children, $comments);
             $this->env->comments = [];
         }
@@ -1209,7 +1209,7 @@ protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
             }
         }
 
-        if (count($items) === 0) {
+        if (!$items) {
             $this->seek($s);
 
             return false;
@@ -1573,7 +1573,7 @@ protected function argumentList(&$out)
             $args[] = [Type::T_STRING, '', [', ']];
         }
 
-        if (! $this->matchChar(')') || ! count($args)) {
+        if (! $this->matchChar(')') || !$args) {
             $this->seek($s);
 
             return false;
@@ -1671,7 +1671,7 @@ protected function map(&$out)
             }
         }
 
-        if (! count($keys) || ! $this->matchChar(')')) {
+        if (!$keys || ! $this->matchChar(')')) {
             $this->seek($s);
 
             return false;
@@ -1849,7 +1849,7 @@ protected function mixedKeyword(&$out)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (count($parts) === 0) {
+        if (!$parts) {
             return false;
         }
 
@@ -1915,7 +1915,7 @@ protected function openString($end, &$out, $nestingOpen = null)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (count($content) === 0) {
+        if (!$content) {
             return false;
         }
 
@@ -1993,7 +1993,7 @@ protected function propertyName(&$out)
                 continue;
             }
 
-            if (count($parts) === 0 && $this->match('[:.#]', $m, false)) {
+            if (!$parts && $this->match('[:.#]', $m, false)) {
                 // css hacks
                 $parts[] = $m[0];
                 continue;
@@ -2004,7 +2004,7 @@ protected function propertyName(&$out)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (count($parts) === 0) {
+        if (!$parts) {
             return false;
         }
 
@@ -2053,7 +2053,7 @@ protected function selectors(&$out)
             }
         }
 
-        if (count($selectors) === 0) {
+        if (!$selectors) {
             $this->seek($s);
 
             return false;
@@ -2095,7 +2095,7 @@ protected function selector(&$out)
             break;
         }
 
-        if (count($selector) === 0) {
+        if (!$selector) {
             return false;
         }
 
@@ -2264,7 +2264,7 @@ protected function selectorSingle(&$out)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (count($parts) === 0) {
+        if (!$parts) {
             return false;
         }
 

From c4ddf2ba48de199040335c6e97cbae9b3e22cd29 Mon Sep 17 00:00:00 2001
From: josh <oyejorge@gmail.com>
Date: Sun, 27 Dec 2015 18:18:50 -0700
Subject: [PATCH 084/254] more efficient value() method

---
 src/Parser.php | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 95c956c8..9420479a 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1401,16 +1401,26 @@ protected function value(&$out)
             return true;
         }
 
+        if ($char === 'p' && $this->progid($out)) {
+            return true;
+        }
 
-        if ($this->unit($out) ||
-            $this->string($out) ||
-            $this->func($out) ||
-            $this->progid($out)
-        ) {
+        if (($char === '"' || $char === "'") && $this->string($out)) {
+            return true;
+        }
+
+
+        if ($this->unit($out)) {
             return true;
         }
 
-        if ($this->keyword($keyword)) {
+        if ($this->keyword($keyword, false)) {
+            if ($this->func($keyword, $out)) {
+                return true;
+            }
+
+            $this->whitespace();
+
             if ($keyword === 'null') {
                 $out = [Type::T_NULL];
             } else {
@@ -1493,17 +1503,16 @@ protected function progid(&$out)
     /**
      * Parse function call
      *
+     * @param string $name
      * @param array $out
      *
      * @return boolean
      */
-    protected function func(&$func)
+    protected function func($name, &$func)
     {
         $s = $this->count;
 
-        if ($this->keyword($name, false) &&
-            $this->matchChar('(')
-        ) {
+        if ($this->matchChar('(')) {
             if ($name === 'alpha' && $this->argumentList($args)) {
                 $func = [Type::T_FUNCTION, $name, [Type::T_STRING, '', $args]];
 

From 18232abaa8eac83234aabf29a3c9b6ef0d8f8cf4 Mon Sep 17 00:00:00 2001
From: JanST123 <jstuhlmann@gmail.com>
Date: Wed, 17 Feb 2016 13:13:31 +0100
Subject: [PATCH 085/254] Fix handling for font shorthand syntax

---
 src/Compiler.php             | 50 +++++++++++++++++++++++++++---------
 src/Compiler/Environment.php |  5 ++++
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..546f476f 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1627,7 +1627,7 @@ protected function compileChild($child, OutputBlock $out)
                     $isGlobal = in_array('!global', $flags);
 
                     if ($isGlobal) {
-                        $this->set($name[1], $this->reduce($value), false, $this->rootEnv);
+                        $this->set($name[1], $this->reduce($value), false, $this->rootEnv, $value);
                         break;
                     }
 
@@ -1636,7 +1636,7 @@ protected function compileChild($child, OutputBlock $out)
                         || $result === static::$null);
 
                     if (! $isDefault || $shouldSet) {
-                        $this->set($name[1], $this->reduce($value));
+                        $this->set($name[1], $this->reduce($value), false, null, $value);
                     }
                     break;
                 }
@@ -1645,10 +1645,23 @@ protected function compileChild($child, OutputBlock $out)
 
                 // handle shorthand syntax: size / line-height
                 if ($compiledName === 'font') {
-                    if ($value[0] === Type::T_EXPRESSION && $value[1] === '/') {
-                        $value = $this->expToString($value);
-                    } elseif ($value[0] === Type::T_LIST) {
-                        foreach ($value[2] as &$item) {
+                    if ($value[0] === Type::T_VARIABLE) {
+                        // if the font value comes from variable, the content is already reduced (which means formulars where already calculated)
+                        // so we need the original unreduced value
+                        $value = $this->get($value[1], true, null, true);
+                    }
+
+                    $fontValue=&$value;
+                    if ($value[0] === Type::T_LIST && $value[1]==',') {
+                        // this is the case if more than one font is given: example: "font: 400 1em/1.3 arial,helvetica"
+                        // we need to handle the first list element
+                        $fontValue=&$value[2][0];
+                    }
+
+                    if ($fontValue[0] === Type::T_EXPRESSION && $fontValue[1] === '/') {
+                        $fontValue = $this->expToString($fontValue);
+                    } elseif ($fontValue[0] === Type::T_LIST) {
+                        foreach ($fontValue[2] as &$item) {
                             if ($item[0] === Type::T_EXPRESSION && $item[1] === '/') {
                                 $item = $this->expToString($item);
                             }
@@ -3087,8 +3100,9 @@ protected function getStoreEnv()
      * @param mixed                               $value
      * @param boolean                             $shadow
      * @param \Leafo\ScssPhp\Compiler\Environment $env
+     * @param mixed                               $valueUnreduced
      */
-    protected function set($name, $value, $shadow = false, Environment $env = null)
+    protected function set($name, $value, $shadow = false, Environment $env = null, $valueUnreduced = null)
     {
         $name = $this->normalizeName($name);
 
@@ -3097,9 +3111,9 @@ protected function set($name, $value, $shadow = false, Environment $env = null)
         }
 
         if ($shadow) {
-            $this->setRaw($name, $value, $env);
+            $this->setRaw($name, $value, $env, $valueUnreduced);
         } else {
-            $this->setExisting($name, $value, $env);
+            $this->setExisting($name, $value, $env, $valueUnreduced);
         }
     }
 
@@ -3109,8 +3123,9 @@ protected function set($name, $value, $shadow = false, Environment $env = null)
      * @param string                              $name
      * @param mixed                               $value
      * @param \Leafo\ScssPhp\Compiler\Environment $env
+     * @param mixed                               $valueUnreduced
      */
-    protected function setExisting($name, $value, Environment $env)
+    protected function setExisting($name, $value, Environment $env, $valueUnreduced = null)
     {
         $storeEnv = $env;
 
@@ -3135,6 +3150,9 @@ protected function setExisting($name, $value, Environment $env)
         }
 
         $env->store[$name] = $value;
+        if ($valueUnreduced) {
+            $env->storeUnreduced[$name] = $valueUnreduced;
+        }
     }
 
     /**
@@ -3143,10 +3161,14 @@ protected function setExisting($name, $value, Environment $env)
      * @param string                              $name
      * @param mixed                               $value
      * @param \Leafo\ScssPhp\Compiler\Environment $env
+     * @param mixed                               $valueUnreduced
      */
-    protected function setRaw($name, $value, Environment $env)
+    protected function setRaw($name, $value, Environment $env, $valueUnreduced = null)
     {
         $env->store[$name] = $value;
+        if ($valueUnreduced) {
+            $env->storeUnreduced[$name] = $valueUnreduced;
+        }
     }
 
     /**
@@ -3157,10 +3179,11 @@ protected function setRaw($name, $value, Environment $env)
      * @param string                              $name
      * @param boolean                             $shouldThrow
      * @param \Leafo\ScssPhp\Compiler\Environment $env
+     * @param boolean                             $unreduced
      *
      * @return mixed
      */
-    public function get($name, $shouldThrow = true, Environment $env = null)
+    public function get($name, $shouldThrow = true, Environment $env = null, $unreduced = false)
     {
         $normalizedName = $this->normalizeName($name);
         $specialContentKey = static::$namespaces['special'] . 'content';
@@ -3174,6 +3197,9 @@ public function get($name, $shouldThrow = true, Environment $env = null)
 
         for (;;) {
             if (array_key_exists($normalizedName, $env->store)) {
+                if ($unreduced && isset($env->storeUnreduced[$normalizedName])) {
+                    return $env->storeUnreduced[$normalizedName];
+                }
                 return $env->store[$normalizedName];
             }
 
diff --git a/src/Compiler/Environment.php b/src/Compiler/Environment.php
index fe309dd3..99231f36 100644
--- a/src/Compiler/Environment.php
+++ b/src/Compiler/Environment.php
@@ -33,6 +33,11 @@ class Environment
      */
     public $store;
 
+    /**
+     * @var array
+     */
+    public $storeUnreduced;
+
     /**
      * @var integer
      */

From bf492e8a5389abdc4fac6167af6c6f917112ca0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Udvari?= <gabor.udvari@gmail.com>
Date: Wed, 1 Aug 2018 22:37:59 +0200
Subject: [PATCH 086/254] Improve error messages

Add filename information to error messages, and print out the received
value for assert functions.
---
 src/Compiler.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..58889af4 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1910,25 +1910,28 @@ protected function compileChild($child, OutputBlock $out)
             case Type::T_DEBUG:
                 list(, $value) = $child;
 
+                $fname = $this->sourceNames[$this->sourceIndex];
                 $line = $this->sourceLine;
                 $value = $this->compileValue($this->reduce($value, true));
-                fwrite($this->stderr, "Line $line DEBUG: $value\n");
+                fwrite($this->stderr, "File $fname on line $line DEBUG: $value\n");
                 break;
 
             case Type::T_WARN:
                 list(, $value) = $child;
 
+                $fname = $this->sourceNames[$this->sourceIndex];
                 $line = $this->sourceLine;
                 $value = $this->compileValue($this->reduce($value, true));
-                fwrite($this->stderr, "Line $line WARN: $value\n");
+                fwrite($this->stderr, "File $fname on line $line WARN: $value\n");
                 break;
 
             case Type::T_ERROR:
                 list(, $value) = $child;
 
+                $fname = $this->sourceNames[$this->sourceIndex];
                 $line = $this->sourceLine;
                 $value = $this->compileValue($this->reduce($value, true));
-                $this->throwError("Line $line ERROR: $value\n");
+                $this->throwError("File $fname on line $line ERROR: $value\n");
                 break;
 
             case Type::T_CONTROL:
@@ -3550,7 +3553,8 @@ public function throwError($msg)
         }
 
         $line = $this->sourceLine;
-        $msg = "$msg: line: $line";
+        $loc = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] . " on line $line" : "line: $line";
+        $msg = "$msg: $loc";
 
         throw new CompilerException($msg);
     }
@@ -4066,7 +4070,7 @@ public function assertMap($value)
         $value = $this->coerceMap($value);
 
         if ($value[0] !== Type::T_MAP) {
-            $this->throwError('expecting map');
+            $this->throwError('expecting map, %s received', $value[0]);
         }
 
         return $value;
@@ -4086,7 +4090,7 @@ public function assertMap($value)
     public function assertList($value)
     {
         if ($value[0] !== Type::T_LIST) {
-            $this->throwError('expecting list');
+            $this->throwError('expecting list, %s received', $value[0]);
         }
 
         return $value;
@@ -4109,7 +4113,7 @@ public function assertColor($value)
             return $color;
         }
 
-        $this->throwError('expecting color');
+        $this->throwError('expecting color, %s received', $value[0]);
     }
 
     /**
@@ -4126,7 +4130,7 @@ public function assertColor($value)
     public function assertNumber($value)
     {
         if ($value[0] !== Type::T_NUMBER) {
-            $this->throwError('expecting number');
+            $this->throwError('expecting number, %s received', $value[0]);
         }
 
         return $value[1];

From 1b2b6d2fdbf2d07e23622634df28550f175a6c1d Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 23 Apr 2019 18:37:10 +0200
Subject: [PATCH 087/254] Add test case for interpolation support #{&} with and
 without @at-root

---
 tests/inputs/at_root.scss                | 6 ++++++
 tests/inputs/interpolation.scss          | 6 ++++++
 tests/outputs/at_root.css                | 3 +++
 tests/outputs/interpolation.css          | 3 +++
 tests/outputs_numbered/at_root.css       | 5 +++++
 tests/outputs_numbered/interpolation.css | 5 +++++
 6 files changed, 28 insertions(+)

diff --git a/tests/inputs/at_root.scss b/tests/inputs/at_root.scss
index 1f00c727..17d4334a 100644
--- a/tests/inputs/at_root.scss
+++ b/tests/inputs/at_root.scss
@@ -147,3 +147,9 @@ $table-padding: 10px !default;
     @include table;
   }
 }
+
+.badge {
+  @at-root a#{&} {
+    text-decoration: none;
+  }
+}
\ No newline at end of file
diff --git a/tests/inputs/interpolation.scss b/tests/inputs/interpolation.scss
index e3736ca5..f2a266bc 100644
--- a/tests/inputs/interpolation.scss
+++ b/tests/inputs/interpolation.scss
@@ -97,3 +97,9 @@ $foo: ('a', 'b');
 div {
     prop: #{$foo};
 }
+
+.badge {
+  a#{&} {
+    text-decoration: none;
+  }
+}
\ No newline at end of file
diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index 5383eaab..b0c71a42 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -74,3 +74,6 @@ body .second {
   padding: 0px; }
   tbody {
     padding: 10px; }
+
+a.badge {
+  text-decoration: none; }
diff --git a/tests/outputs/interpolation.css b/tests/outputs/interpolation.css
index d3084575..c4e4802d 100644
--- a/tests/outputs/interpolation.css
+++ b/tests/outputs/interpolation.css
@@ -61,3 +61,6 @@ foo, x, y {
 
 div {
   prop: a, b; }
+
+a.badge {
+  text-decoration: none; }
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index 2ac5a07e..cb052501 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -107,3 +107,8 @@ margin: 0; } }
 /* line 139, inputs/at_root.scss */
   tbody {
     padding: 10px; }
+/* line 151, inputs/at_root.scss */
+/* line 152, inputs/at_root.scss */
+
+a.badge {
+  text-decoration: none; }
diff --git a/tests/outputs_numbered/interpolation.css b/tests/outputs_numbered/interpolation.css
index f6d5f5fa..ae1d7087 100644
--- a/tests/outputs_numbered/interpolation.css
+++ b/tests/outputs_numbered/interpolation.css
@@ -71,3 +71,8 @@ foo, x, y {
 /* line 97, inputs/interpolation.scss */
 div {
   prop: a, b; }
+/* line 101, inputs/interpolation.scss */
+/* line 102, inputs/interpolation.scss */
+
+a.badge {
+  text-decoration: none; }

From 6cd2ced9ce1349041a3d24474aa08560e07f5b37 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 24 Apr 2019 12:04:06 +0200
Subject: [PATCH 088/254] Append the ability to parse #{&} and other variants

---
 src/Parser.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Parser.php b/src/Parser.php
index 748d38ae..5a7a0804 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1918,6 +1918,20 @@ protected function interpolation(&$out, $lookWhite = true)
             return true;
         }
 
+        $this->seek($s);
+
+        if ($this->literal('#{') && $this->selectorSingle($sel) && $this->literal('}', false)) {
+            $out = $sel[0];
+
+            $this->eatWhiteDefault = $oldWhite;
+
+            if ($this->eatWhiteDefault) {
+                $this->whitespace();
+            }
+
+            return true;
+        }
+
         $this->seek($s);
         $this->eatWhiteDefault = $oldWhite;
 

From 2ad217a317fc686bc0ed32c63fce2f38e74c3a51 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 23 Apr 2019 18:12:26 +0200
Subject: [PATCH 089/254] Appending properties to Block to manage self parent
 on at root

---
 src/Block.php  | 4 ++++
 src/Parser.php | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/Block.php b/src/Block.php
index a6ef8e03..2edbc8a7 100644
--- a/src/Block.php
+++ b/src/Block.php
@@ -62,4 +62,8 @@ class Block
      * @var array
      */
     public $children;
+    /**
+     * @var \Leafo\ScssPhp\Block
+     */
+    public $selfParent;
 }
diff --git a/src/Parser.php b/src/Parser.php
index 5a7a0804..318b6f3a 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -763,6 +763,11 @@ protected function popBlock()
             $this->throwParseError('unexpected }');
         }
 
+        if ($block->type == Type::T_AT_ROOT) {
+            // keeps the parent in case of self selector &
+            $block->selfParent = $block->parent;
+        }
+
         $this->env = $block->parent;
         unset($block->parent);
 

From 3d9e3c479bcbd9466a5f2228bd135396c175a0b8 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 24 Apr 2019 16:35:06 +0200
Subject: [PATCH 090/254] Use selfParent to compute self selector & in a
 at-root block

---
 src/Compiler.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ed80d8d3..0dbab028 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -790,6 +790,7 @@ protected function compileAtRoot(Block $block)
             $wrapped->comments     = [];
             $wrapped->parent       = $block;
             $wrapped->children     = $block->children;
+            $wrapped->selfParent   = $block->selfParent;
 
             $block->children = [[Type::T_BLOCK, $wrapped]];
         }
@@ -882,6 +883,7 @@ private function spliceTree($envs, Block $block, $without)
             $newBlock = $b;
         }
 
+        $newBlock->selfParent   = $block->selfParent;
         $type = isset($newBlock->type) ? $newBlock->type : Type::T_BLOCK;
 
         return [$type, $newBlock];
@@ -1083,7 +1085,7 @@ protected function compileBlock(Block $block)
         $this->scope->children[] = $out;
 
         if (count($block->children)) {
-            $out->selectors = $this->multiplySelectors($env);
+            $out->selectors = $this->multiplySelectors($env, $block->selfParent);
 
             $this->compileChildrenNoReturn($block->children, $out);
         }
@@ -2899,15 +2901,21 @@ protected function extractInterpolation($list)
      * Find the final set of selectors
      *
      * @param \Leafo\ScssPhp\Compiler\Environment $env
+     * @param Leafo\ScssPhp\Block $selfParent
      *
      * @return array
      */
-    protected function multiplySelectors(Environment $env)
+    protected function multiplySelectors(Environment $env, $selfParent = null)
     {
         $envs            = $this->compactEnv($env);
         $selectors       = [];
         $parentSelectors = [[]];
 
+        $selfParentSelectors = null;
+        if (!is_null($selfParent) and $selfParent->selectors) {
+            $selfParentSelectors = $this->evalSelectors($selfParent->selectors);
+        }
+
         while ($env = array_pop($envs)) {
             if (empty($env->selectors)) {
                 continue;
@@ -2917,7 +2925,7 @@ protected function multiplySelectors(Environment $env)
 
             foreach ($env->selectors as $selector) {
                 foreach ($parentSelectors as $parent) {
-                    $selectors[] = $this->joinSelectors($parent, $selector);
+                    $selectors[] = $this->joinSelectors($parent, $selector, $selfParentSelectors);
                 }
             }
 
@@ -2932,10 +2940,10 @@ protected function multiplySelectors(Environment $env)
      *
      * @param array $parent
      * @param array $child
-     *
+     * @param array $selfParentSelectors
      * @return array
      */
-    protected function joinSelectors($parent, $child)
+    protected function joinSelectors($parent, $child, $selfParentSelectors = null)
     {
         $setSelf = false;
         $out = [];
@@ -2946,15 +2954,17 @@ protected function joinSelectors($parent, $child)
             foreach ($part as $p) {
                 if ($p === static::$selfSelector) {
                     $setSelf = true;
-
-                    foreach ($parent as $i => $parentPart) {
+                    if (is_null($selfParentSelectors)) {
+                        $selfParentSelectors = $parent;
+                    }
+                    foreach ($selfParentSelectors as $i => $parentPart) {
                         if ($i > 0) {
                             $out[] = $newPart;
                             $newPart = [];
                         }
 
                         foreach ($parentPart as $pp) {
-                            $newPart[] = $pp;
+                            $newPart[] = (is_array($pp) ? implode($pp) : $pp);
                         }
                     }
                 } else {

From 6d950fec7222db6066e86d21a7796772f6418a9d Mon Sep 17 00:00:00 2001
From: BrainFooLong <roland.eigelsreiter@gmail.com>
Date: Tue, 9 Oct 2018 14:42:55 +0200
Subject: [PATCH 091/254] fixed some code smells

---
 src/Compiler.php | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 34b11728..896e72ad 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1310,7 +1310,7 @@ protected function hasSelectorPlaceholder($selector)
      * @param array                                $stms
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
      *
-     * @return array
+     * @return array|null
      */
     protected function compileChildren($stms, OutputBlock $out)
     {
@@ -1321,6 +1321,7 @@ protected function compileChildren($stms, OutputBlock $out)
                 return $ret;
             }
         }
+        return null;
     }
 
     /**
@@ -2016,7 +2017,7 @@ protected function shouldEval($value)
         switch ($value[0]) {
             case Type::T_EXPRESSION:
                 if ($value[1] === '/') {
-                    return $this->shouldEval($value[2], $value[3]);
+                    return $this->shouldEval($value[2]);
                 }
 
                 // fall-thru
@@ -2372,7 +2373,7 @@ protected function opModNumberNumber($left, $right)
      * @param array $left
      * @param array $right
      *
-     * @return array
+     * @return array|null
      */
     protected function opAdd($left, $right)
     {
@@ -2395,6 +2396,7 @@ protected function opAdd($left, $right)
 
             return $strRight;
         }
+        return null;
     }
 
     /**
@@ -2404,12 +2406,12 @@ protected function opAdd($left, $right)
      * @param array   $right
      * @param boolean $shouldEval
      *
-     * @return array
+     * @return array|null
      */
     protected function opAnd($left, $right, $shouldEval)
     {
         if (! $shouldEval) {
-            return;
+            return null;
         }
 
         if ($left !== static::$false and $left !== static::$null) {
@@ -2426,12 +2428,12 @@ protected function opAnd($left, $right, $shouldEval)
      * @param array   $right
      * @param boolean $shouldEval
      *
-     * @return array
+     * @return array|null
      */
     protected function opOr($left, $right, $shouldEval)
     {
         if (! $shouldEval) {
-            return;
+            return null;
         }
 
         if ($left !== static::$false and $left !== static::$null) {
@@ -3177,7 +3179,7 @@ protected function setRaw($name, $value, Environment $env, $valueUnreduced = nul
      * @param \Leafo\ScssPhp\Compiler\Environment $env
      * @param boolean                             $unreduced
      *
-     * @return mixed
+     * @return mixed|null
      */
     public function get($name, $shouldThrow = true, Environment $env = null, $unreduced = false)
     {
@@ -3222,6 +3224,7 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
         }
 
         // found nothing
+        return null;
     }
 
     /**
@@ -3550,6 +3553,7 @@ public function setEncoding($encoding)
     public function setIgnoreErrors($ignoreErrors)
     {
         $this->ignoreErrors = $ignoreErrors;
+        return $this;
     }
 
     /**
@@ -4948,7 +4952,7 @@ protected function libSetNth($args)
         if (! isset($list[2][$n])) {
             $this->throwError('Invalid argument for "n"');
 
-            return;
+            return null;
         }
 
         $list[2][$n] = $args[2];
@@ -5186,7 +5190,7 @@ protected function libComparable($args)
         ) {
             $this->throwError('Invalid argument(s) for "comparable"');
 
-            return;
+            return null;
         }
 
         $number1 = $number1->normalize();
@@ -5366,7 +5370,7 @@ protected function libRandom($args)
             if ($n < 1) {
                 $this->throwError("limit must be greater than or equal to 1");
 
-                return;
+                return null;
             }
 
             return new Node\Number(mt_rand(1, $n), '');

From 9c3b196f5c62994a3a9e5fe9950f7b09e807ed19 Mon Sep 17 00:00:00 2001
From: BrainFooLong <roland.eigelsreiter@gmail.com>
Date: Tue, 9 Oct 2018 14:43:54 +0200
Subject: [PATCH 092/254] converted traditional array to short syntax

---
 example/Server.php                   |  2 +-
 src/SourceMap/Base64.php             |  8 ++++----
 src/SourceMap/Base64VLQEncoder.php   |  8 ++++----
 src/SourceMap/SourceMapGenerator.php | 28 ++++++++++++++--------------
 src/Util.php                         |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/example/Server.php b/example/Server.php
index 6ea97018..54060b1a 100644
--- a/example/Server.php
+++ b/example/Server.php
@@ -468,7 +468,7 @@ public function cachedCompile($in, $force = false)
 
         if ($root !== null) {
             // If we have a root value which means we should rebuild.
-            $out = array();
+            $out = [];
             $out['root'] = $root;
             $out['compiled'] = $this->compileFile($root);
             $out['files'] = $this->scss->getParsedFiles();
diff --git a/src/SourceMap/Base64.php b/src/SourceMap/Base64.php
index 9d17e6f0..54015bb9 100644
--- a/src/SourceMap/Base64.php
+++ b/src/SourceMap/Base64.php
@@ -21,7 +21,7 @@ class Base64
     /**
      * @var array
      */
-    private static $encodingMap = array (
+    private static $encodingMap = [
         0 => 'A',
         1 => 'B',
         2 => 'C',
@@ -86,12 +86,12 @@ class Base64
         61 => '9',
         62 => '+',
         63 => '/',
-    );
+    ];
 
     /**
      * @var array
      */
-    private static $decodingMap = array(
+    private static $decodingMap = [
         'A' => 0,
         'B' => 1,
         'C' => 2,
@@ -156,7 +156,7 @@ class Base64
         9 => 61,
         '+' => 62,
         '/' => 63,
-    );
+    ];
 
     /**
      * Convert to base64
diff --git a/src/SourceMap/Base64VLQEncoder.php b/src/SourceMap/Base64VLQEncoder.php
index 1189ce0e..caf56c77 100644
--- a/src/SourceMap/Base64VLQEncoder.php
+++ b/src/SourceMap/Base64VLQEncoder.php
@@ -47,7 +47,7 @@ class Base64VLQEncoder
      *
      * @var array
      */
-    private $charToIntMap = array(
+    private $charToIntMap = [
         'A' => 0,  'B' => 1,  'C' => 2,  'D' => 3,  'E' => 4,  'F' => 5,  'G' => 6,  'H' => 7,
         'I' => 8,  'J' => 9,  'K' => 10, 'L' => 11, 'M' => 12, 'N' => 13, 'O' => 14, 'P' => 15,
         'Q' => 16, 'R' => 17, 'S' => 18, 'T' => 19, 'U' => 20, 'V' => 21, 'W' => 22, 'X' => 23,
@@ -56,14 +56,14 @@ class Base64VLQEncoder
         'o' => 40, 'p' => 41, 'q' => 42, 'r' => 43, 's' => 44, 't' => 45, 'u' => 46, 'v' => 47,
         'w' => 48, 'x' => 49, 'y' => 50, 'z' => 51,   0 => 52,   1 => 53,   2 => 54,   3 => 55,
           4 => 56,   5 => 57,   6 => 58,   7 => 59,   8 => 60,   9 => 61, '+' => 62, '/' => 63,
-    );
+    ];
 
     /**
      * Integer to char map
      *
      * @var array
      */
-    private $intToCharMap = array(
+    private $intToCharMap = [
          0 => 'A',  1 => 'B',  2 => 'C',  3 => 'D',  4 => 'E',  5 => 'F',  6 => 'G',  7 => 'H',
          8 => 'I',  9 => 'J', 10 => 'K', 11 => 'L', 12 => 'M', 13 => 'N', 14 => 'O', 15 => 'P',
         16 => 'Q', 17 => 'R', 18 => 'S', 19 => 'T', 20 => 'U', 21 => 'V', 22 => 'W', 23 => 'X',
@@ -72,7 +72,7 @@ class Base64VLQEncoder
         40 => 'o', 41 => 'p', 42 => 'q', 43 => 'r', 44 => 's', 45 => 't', 46 => 'u', 47 => 'v',
         48 => 'w', 49 => 'x', 50 => 'y', 51 => 'z', 52 => '0', 53 => '1', 54 => '2', 55 => '3',
         56 => '4', 57 => '5', 58 => '6', 59 => '7', 60 => '8', 61 => '9', 62 => '+', 63 => '/',
-    );
+    ];
 
     /**
      * Constructor
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 39bfac1c..a8c55a3f 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -33,7 +33,7 @@ class SourceMapGenerator
      *
      * @var array
      */
-    protected $defaultOptions = array(
+    protected $defaultOptions = [
         // an optional source root, useful for relocating source files
         // on a server or removing repeated values in the 'sources' entry.
         // This value is prepended to the individual entries in the 'source' field.
@@ -56,7 +56,7 @@ class SourceMapGenerator
 
         // base path for filename normalization
         'sourceMapBasepath' => ''
-    );
+    ];
 
     /**
      * The base64 VLQ encoder
@@ -70,22 +70,22 @@ class SourceMapGenerator
      *
      * @var array
      */
-    protected $mappings = array();
+    protected $mappings = [];
 
     /**
      * Array of contents map
      *
      * @var array
      */
-    protected $contentsMap = array();
+    protected $contentsMap = [];
 
     /**
      * File to content map
      *
      * @var array
      */
-    protected $sources = array();
-    protected $source_keys = array();
+    protected $sources = [];
+    protected $source_keys = [];
 
     /**
      * @var array
@@ -109,13 +109,13 @@ public function __construct(array $options = [])
      */
     public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile)
     {
-        $this->mappings[] = array(
+        $this->mappings[] = [
             'generated_line' => $generatedLine,
             'generated_column' => $generatedColumn,
             'original_line' => $originalLine,
             'original_column' => $originalColumn,
             'source_file' => $sourceFile
-        );
+        ];
 
         $this->sources[$sourceFile] = $sourceFile;
     }
@@ -156,7 +156,7 @@ public function saveMap($content)
      */
     public function generateJson()
     {
-        $sourceMap = array();
+        $sourceMap = [];
         $mappings  = $this->generateMappings();
 
         // File version (always the first entry in the object) and must be a positive integer.
@@ -178,14 +178,14 @@ public function generateJson()
         }
 
         // A list of original sources used by the 'mappings' entry.
-        $sourceMap['sources'] = array();
+        $sourceMap['sources'] = [];
 
         foreach ($this->sources as $source_uri => $source_filename) {
             $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
         }
 
         // A list of symbol names used by the 'mappings' entry.
-        $sourceMap['names'] = array();
+        $sourceMap['names'] = [];
 
         // A string with the encoded mapping data.
         $sourceMap['mappings'] = $mappings;
@@ -216,7 +216,7 @@ protected function getSourcesContent()
             return null;
         }
 
-        $content = array();
+        $content = [];
 
         foreach ($this->sources as $sourceFile) {
             $content[] = file_get_contents($sourceFile);
@@ -239,7 +239,7 @@ public function generateMappings()
         $this->source_keys = array_flip(array_keys($this->sources));
 
         // group mappings by generated line number.
-        $groupedMap = $groupedMapEncoded = array();
+        $groupedMap = $groupedMapEncoded = [];
 
         foreach ($this->mappings as $m) {
             $groupedMap[$m['generated_line']][] = $m;
@@ -253,7 +253,7 @@ public function generateMappings()
                 $groupedMapEncoded[] = ';';
             }
 
-            $lineMapEncoded = array();
+            $lineMapEncoded = [];
             $lastGeneratedColumn = 0;
 
             foreach ($line_map as $m) {
diff --git a/src/Util.php b/src/Util.php
index 7526e020..a1e50658 100644
--- a/src/Util.php
+++ b/src/Util.php
@@ -63,7 +63,7 @@ public static function checkRange($name, Range $range, $value, $unit = '')
      */
     public static function encodeURIComponent($string)
     {
-        $revert = array('%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')');
+        $revert = ['%21' => '!', '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')'];
 
         return strtr(rawurlencode($string), $revert);
     }

From 37831da6214c32dee5df598cf4e3adf4ae2279d0 Mon Sep 17 00:00:00 2001
From: BrainFooLong <roland.eigelsreiter@gmail.com>
Date: Tue, 9 Oct 2018 14:45:12 +0200
Subject: [PATCH 093/254] fixed php error with missing variable

---
 src/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index d07e1ff3..c14143b6 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1203,7 +1203,7 @@ protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
     {
         $s = $this->count;
         $items = [];
-
+        $value = null;
         while ($this->$parseItem($value)) {
             $items[] = $value;
 

From eaa63b04cd26dc13cbd05c8eaede142d9674016d Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 24 Apr 2019 12:44:47 -0400
Subject: [PATCH 094/254] Refs #608 - should eval fix

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 896e72ad..11644bf6 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2017,7 +2017,7 @@ protected function shouldEval($value)
         switch ($value[0]) {
             case Type::T_EXPRESSION:
                 if ($value[1] === '/') {
-                    return $this->shouldEval($value[2]);
+                    return $this->shouldEval($value[2]) || $this->shouldEval($value[3]);
                 }
 
                 // fall-thru

From 7c6dc5cb93e58fefa81485cd3166d799d252bd6f Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 24 Apr 2019 12:57:03 -0400
Subject: [PATCH 095/254] Port peephole optimizations from #640

---
 src/Parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index c14143b6..e67b7c8b 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1342,7 +1342,7 @@ protected function value(&$out)
 
             $this->count += $len;
 
-            if ($this->literal(')')) {
+            if ($this->matchChar(')')) {
                 $content = substr($this->buffer, $s, $this->count - $s);
                 $out = [Type::T_KEYWORD, $content];
 
@@ -1978,7 +1978,7 @@ protected function interpolation(&$out, $lookWhite = true)
 
         $this->seek($s);
 
-        if ($this->literal('#{') && $this->selectorSingle($sel) && $this->literal('}', false)) {
+        if ($this->literal('#{', 2) && $this->selectorSingle($sel) && $this->matchChar('}', false)) {
             $out = $sel[0];
 
             $this->eatWhiteDefault = $oldWhite;

From a384906af3d078e98b089d7d36f6ceab8703f7ff Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 24 Apr 2019 14:10:10 -0400
Subject: [PATCH 096/254] Fixes #632 - partial support for #rrggbbaa

---
 src/Parser.php                      | 50 +++++++++++++++++++++--------
 tests/inputs/scss_css.scss          |  4 ++-
 tests/outputs/scss_css.css          |  4 +++
 tests/outputs_numbered/scss_css.css |  4 +++
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index e67b7c8b..1eda928f 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1706,22 +1706,46 @@ protected function map(&$out)
     protected function color(&$out)
     {
         $color = [Type::T_COLOR];
+        $s     = $this->count;
+
+        if ($this->match('(#([0-9a-f]+))', $m)) {
+            $nofValues = strlen($m[2]);
+            $hasAlpha  = $nofValues === 4 || $nofValues === 8;
+            $channels  = $hasAlpha ? [4, 3, 2, 1] : [3, 2, 1];
+
+            switch ($nofValues) {
+                case 3:
+                case 4:
+                    $num = hexdec($m[2]);
+
+                    foreach ($channels as $i) {
+                        $t = $num & 0xf;
+                        $color[$i] = $t << 4 | $t;
+                        $num >>= 4;
+                    }
+                    break;
 
-        if ($this->match('(#([0-9a-f]{6})|#([0-9a-f]{3}))', $m)) {
-            if (isset($m[3])) {
-                $num = hexdec($m[3]);
+                case 6:
+                case 8:
+                    $num = hexdec($m[2]);
 
-                foreach ([3, 2, 1] as $i) {
-                    $t = $num & 0xf;
-                    $color[$i] = $t << 4 | $t;
-                    $num >>= 4;
-                }
-            } else {
-                $num = hexdec($m[2]);
+                    foreach ($channels as $i) {
+                        $color[$i] = $num & 0xff;
+                        $num >>= 8;
+                    }
+                    break;
+
+                default:
+                    $this->seek($s);
 
-                foreach ([3, 2, 1] as $i) {
-                    $color[$i] = $num & 0xff;
-                    $num >>= 8;
+                    return false;
+            }
+
+            if ($hasAlpha) {
+                if ($color[4] === 255) {
+                    $color[4] = 1; // fully opaque
+                } else {
+                    $color[4] = round($color[4] / 255, 3);
                 }
             }
 
diff --git a/tests/inputs/scss_css.scss b/tests/inputs/scss_css.scss
index 7daa89a3..8dee304f 100644
--- a/tests/inputs/scss_css.scss
+++ b/tests/inputs/scss_css.scss
@@ -982,4 +982,6 @@ foo {
   a: foo();
   b: bar baz-bang() bip; }
 
-
+.alpha {
+  color: #1f2526bf;
+  background-color: #1f2526ff; }
diff --git a/tests/outputs/scss_css.css b/tests/outputs/scss_css.css
index b26a1c5b..22fcf63f 100644
--- a/tests/outputs/scss_css.css
+++ b/tests/outputs/scss_css.css
@@ -767,3 +767,7 @@ foo {
 foo {
   a: foo();
   b: bar baz-bang() bip; }
+
+.alpha {
+  color: rgba(31, 37, 38, 0.749);
+  background-color: #1f2526; }
diff --git a/tests/outputs_numbered/scss_css.css b/tests/outputs_numbered/scss_css.css
index 6da0ddac..4d89beb6 100644
--- a/tests/outputs_numbered/scss_css.css
+++ b/tests/outputs_numbered/scss_css.css
@@ -786,3 +786,7 @@ foo {
 foo {
   a: foo();
   b: bar baz-bang() bip; }
+/* line 985, inputs/scss_css.scss */
+.alpha {
+  color: rgba(31, 37, 38, 0.749);
+  background-color: #1f2526; }

From e69298cf2b61b3af53ea05ed0bb2ab33846575ac Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 24 Apr 2019 14:38:19 -0400
Subject: [PATCH 097/254] Bump version for next dev sprint

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index ec0fee6f..5b15e612 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.8';
+    const VERSION = 'v0.7.9';
 }

From e179136275fc38f5dbb48b6ddc6bf0618efd74f5 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 25 Apr 2019 04:12:46 -0400
Subject: [PATCH 098/254] Fixes #631 - fix number parsing

---
 src/Parser.php                      | 19 +++++++++++++++++--
 tests/inputs/scss_css.scss          |  6 ++++++
 tests/outputs/scss_css.css          |  3 +++
 tests/outputs_numbered/scss_css.css |  3 +++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 1eda928f..c162b163 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1766,11 +1766,26 @@ protected function color(&$out)
      */
     protected function unit(&$unit)
     {
-        if ($this->match('([0-9]*(\.)?[0-9]+)([%a-zA-Z]+)?', $m)) {
-            $unit = new Node\Number($m[1], empty($m[3]) ? '' : $m[3]);
+        $s = $this->count;
+
+        if ($this->match('([0-9]*(\.)?[0-9]+)([%a-zA-Z]+)?', $m, false)) {
+            if ( ! ctype_digit($this->buffer[$this->count])) {
+                $this->whitespace();
+
+                $unit = new Node\Number($m[1], empty($m[3]) ? '' : $m[3]);
+
+                return true;
+            }
+
+            $this->seek($s);
+        }
+/*
+        if ($this->match('([0-9][0-9a-fA-F]+)', $m)) {
+            $unit = new Node\Number($m[1], '');
 
             return true;
         }
+*/
 
         return false;
     }
diff --git a/tests/inputs/scss_css.scss b/tests/inputs/scss_css.scss
index 8dee304f..cfa39074 100644
--- a/tests/inputs/scss_css.scss
+++ b/tests/inputs/scss_css.scss
@@ -985,3 +985,9 @@ foo {
 .alpha {
   color: #1f2526bf;
   background-color: #1f2526ff; }
+
+$id: 4c29f540779d8549daf934275faea11;
+$selector: '.shortcode-' + $id;
+#{$selector} {
+  color: red;
+}
diff --git a/tests/outputs/scss_css.css b/tests/outputs/scss_css.css
index 22fcf63f..061fcad7 100644
--- a/tests/outputs/scss_css.css
+++ b/tests/outputs/scss_css.css
@@ -771,3 +771,6 @@ foo {
 .alpha {
   color: rgba(31, 37, 38, 0.749);
   background-color: #1f2526; }
+
+.shortcode-4c29f540779d8549daf934275faea11 {
+  color: red; }
diff --git a/tests/outputs_numbered/scss_css.css b/tests/outputs_numbered/scss_css.css
index 4d89beb6..f2336adc 100644
--- a/tests/outputs_numbered/scss_css.css
+++ b/tests/outputs_numbered/scss_css.css
@@ -790,3 +790,6 @@ foo {
 .alpha {
   color: rgba(31, 37, 38, 0.749);
   background-color: #1f2526; }
+/* line 991, inputs/scss_css.scss */
+.shortcode-4c29f540779d8549daf934275faea11 {
+  color: red; }

From 49d3e2d09b9374dd82173109500b8f6e26ab6d71 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 23 Apr 2019 14:42:55 +0200
Subject: [PATCH 099/254] travis test file improvement : append PHP 7.2, allow
 nightly to fail, install composer in install

---
 .travis.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e0e9a57f..710b72f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,18 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
   - nightly
 
+install: composer install
+
 script:
-  - composer install
   - vendor/bin/phpunit tests
 
 branches:
   only:
     - master
+
+matrix:
+  allow_failures:
+    - php: nightly

From 4e7e4647c7532d080c6c5c9eefa5bd4726aa071f Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 25 Apr 2019 04:23:22 -0400
Subject: [PATCH 100/254] Fixes #618 - Invalid offset for first element and
 elements with column = 0 (@fabsn182)

---
 src/Formatter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Formatter.php b/src/Formatter.php
index b4f90aa9..1403859d 100644
--- a/src/Formatter.php
+++ b/src/Formatter.php
@@ -256,7 +256,8 @@ protected function write($str)
                 $this->currentLine,
                 $this->currentColumn,
                 $this->currentBlock->sourceLine,
-                $this->currentBlock->sourceColumn - 1, //columns from parser are off by one
+                //columns from parser are off by one
+                $this->currentBlock->sourceColumn > 0 ? $this->currentBlock->sourceColumn - 1 : 0,
                 $this->currentBlock->sourceName
             );
 

From 6ec8fe07a1b26bafd89546df489badb6e313a59d Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 25 Apr 2019 12:09:20 +0200
Subject: [PATCH 101/254] Fix buffer overflow from
 https://github.com/leafo/scssphp/issues/631 Fix

---
 src/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index c162b163..36a9051b 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1769,7 +1769,7 @@ protected function unit(&$unit)
         $s = $this->count;
 
         if ($this->match('([0-9]*(\.)?[0-9]+)([%a-zA-Z]+)?', $m, false)) {
-            if ( ! ctype_digit($this->buffer[$this->count])) {
+            if (strlen($this->buffer) == $this->count || ! ctype_digit($this->buffer[$this->count])) {
                 $this->whitespace();
 
                 $unit = new Node\Number($m[1], empty($m[3]) ? '' : $m[3]);

From 7a2a507991e451d24313b10fbd4c62c627c36c84 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 25 Apr 2019 07:25:16 -0400
Subject: [PATCH 102/254] Remove some dead code

---
 src/Parser.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 36a9051b..ba0a1802 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1769,7 +1769,7 @@ protected function unit(&$unit)
         $s = $this->count;
 
         if ($this->match('([0-9]*(\.)?[0-9]+)([%a-zA-Z]+)?', $m, false)) {
-            if (strlen($this->buffer) == $this->count || ! ctype_digit($this->buffer[$this->count])) {
+            if (strlen($this->buffer) === $this->count || ! ctype_digit($this->buffer[$this->count])) {
                 $this->whitespace();
 
                 $unit = new Node\Number($m[1], empty($m[3]) ? '' : $m[3]);
@@ -1779,13 +1779,6 @@ protected function unit(&$unit)
 
             $this->seek($s);
         }
-/*
-        if ($this->match('([0-9][0-9a-fA-F]+)', $m)) {
-            $unit = new Node\Number($m[1], '');
-
-            return true;
-        }
-*/
 
         return false;
     }

From 3f9f2056cea7b9771b7ed68ebbcf0908accfdb1b Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 25 Apr 2019 15:56:00 +0200
Subject: [PATCH 103/254] Adding test for BS4 and Foundation 6 frameworks This
 is an update of https://github.com/leafo/scssphp/pull/462 which is outdated

---
 composer.json           |  4 ++-
 tests/FrameworkTest.php | 75 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+), 1 deletion(-)
 create mode 100644 tests/FrameworkTest.php

diff --git a/composer.json b/composer.json
index 95118a32..7591662e 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,9 @@
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.5",
-        "phpunit/phpunit": "~4.6"
+        "phpunit/phpunit": "~4.6",
+        "twbs/bootstrap": "~4.3",
+        "zurb/foundation": "~6.5"
     },
     "bin": ["bin/pscss"],
     "archive": {
diff --git a/tests/FrameworkTest.php b/tests/FrameworkTest.php
new file mode 100644
index 00000000..59d86621
--- /dev/null
+++ b/tests/FrameworkTest.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2015 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
+ */
+
+namespace Leafo\ScssPhp\Tests;
+
+use Leafo\ScssPhp\Compiler;
+
+class FrameworkTest extends \PHPUnit_Framework_TestCase
+{
+    protected static $frameworks = [
+        [
+            "frameworkVerion" => "twbs/bootstrap4.3",
+            "inputdirectory" => "../vendor/twbs/bootstrap/scss/",
+            "inputfiles" => "bootstrap.scss",
+        ],
+        [
+            "frameworkVerion" => "zurb/foundation6.5",
+            "inputdirectory" => "../vendor/zurb/foundation/assets/",
+            "inputfiles" => "foundation.scss",
+        ]
+    ];
+
+    private $saveDir;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->scss = new Compiler();
+        $this->saveDir = getcwd();
+
+        chdir(__DIR__);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function tearDown()
+    {
+        chdir($this->saveDir);
+    }
+
+    /**
+     * @dataProvider frameworkProvider
+     */
+    public function testFramework($frameworkVerion, $inputdirectory, $inputfiles)
+    {
+        $this->scss->addImportPath($inputdirectory);
+
+        $input = file_get_contents($inputdirectory.$inputfiles);
+        
+        //Test if no exeption are raised for the given framwork
+        $e = null;
+        try {
+            $this->scss->compile($input, $inputfiles);
+        } catch (Exception $e) {
+            // test fail
+        }
+
+        $this->assertNull($e);
+    }
+
+    public function frameworkProvider(){
+        return self::$frameworks;
+    }
+}

From 790c41232d740f64e58250945025f486101690e1 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 25 Apr 2019 16:57:51 +0200
Subject: [PATCH 104/254] seems sensible to remove this line as it fixes some
 bugs according to a lot of comments - including the undefined var in loop

---
 src/Compiler.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 87fb8b25..bf731401 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3209,7 +3209,6 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
             if (! $hasNamespace && isset($env->marker)) {
                 if (! $nextIsRoot && ! empty($env->store[$specialContentKey])) {
                     $env = $env->store[$specialContentKey]->scope;
-                    $nextIsRoot = true;
                     continue;
                 }
 

From fc270a706ff107c86c0c24ed90e89b481ddc5fcb Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 25 Apr 2019 18:20:28 +0200
Subject: [PATCH 105/254] Improve sourceLine/Index propagation when compiling
 @mixin or @media or whatever directive that implies the compiler to construct
 temporary tree part

---
 src/Compiler.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index bf731401..907c5cc7 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1577,9 +1577,25 @@ protected function compileImport($rawPath, $out, $once = false)
      */
     protected function compileChild($child, OutputBlock $out)
     {
-        $this->sourceIndex  = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null;
-        $this->sourceLine   = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1;
-        $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1;
+        if (isset($child[Parser::SOURCE_LINE]))
+        {
+            $this->sourceIndex  = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null;
+            $this->sourceLine   = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1;
+            $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1;
+        }
+        elseif(is_array($child) and isset($child[1]->sourceLine))
+        {
+            $this->sourceIndex = $child[1]->sourceIndex;
+            $this->sourceLine = $child[1]->sourceLine;
+            $this->sourceColumn = $child[1]->sourceColumn;
+        }
+        elseif (! empty($out->sourceLine) and ! empty($out->sourceName)) {
+            $this->sourceLine = $out->sourceLine;
+            $this->sourceIndex = array_search($out->sourceName, $this->sourceNames);
+            if ($this->sourceIndex === false) {
+                $this->sourceIndex = null;
+            }
+        }
 
         switch ($child[0]) {
             case Type::T_SCSSPHP_IMPORT_ONCE:

From 87c5588758878363488eaa7927692bb2265c1ce9 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 26 Apr 2019 14:25:48 +0200
Subject: [PATCH 106/254] Improve error trace message in case of Exception :
 get the calling stack of mixins and function which led to the faulty final
 line

---
 src/Compiler.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 907c5cc7..2022a5a5 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -158,6 +158,8 @@ class Compiler
     protected $shouldEvaluate;
     protected $ignoreErrors;
 
+    protected $callStack = [];
+
     /**
      * Constructor
      */
@@ -1309,6 +1311,19 @@ protected function hasSelectorPlaceholder($selector)
         return false;
     }
 
+    protected function pushCallStack($name = '') {
+        $this->callStack[] = [
+          'n' => $name,
+          Parser::SOURCE_INDEX => $this->sourceIndex,
+          Parser::SOURCE_LINE => $this->sourceLine,
+          Parser::SOURCE_COLUMN => $this->sourceColumn
+        ];
+    }
+
+    protected function popCallStack() {
+        array_pop($this->callStack);
+    }
+
     /**
      * Compile children and return result
      *
@@ -1912,7 +1927,9 @@ protected function compileChild($child, OutputBlock $out)
 
                 $this->env->marker = 'mixin';
 
+                $this->pushCallStack($this->env->marker . " " . $name);
                 $this->compileChildrenNoReturn($mixin->children, $out);
+                $this->popCallStack();
 
                 $this->storeEnv = $storeEnv;
 
@@ -3601,6 +3618,15 @@ public function throwError($msg)
         $line = $this->sourceLine;
         $loc = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] . " on line $line" : "line: $line";
         $msg = "$msg: $loc";
+        if ($this->callStack) {
+            $msg .= "\nCall Stack:\n";
+            $ncall = 0;
+            foreach (array_reverse($this->callStack) as $call) {
+                $msg .= "#" . $ncall++ . " " . $call['n'] . " ";
+                $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]]) ? $this->sourceNames[$call[Parser::SOURCE_INDEX]] : '(unknown file)');
+                $msg .= " on line " . $call[Parser::SOURCE_LINE] . "\n";
+            }
+        }
 
         throw new CompilerException($msg);
     }
@@ -3669,9 +3695,12 @@ protected function callScssFunction($name, $argValues, &$returnValue)
         $tmp->children = [];
 
         $this->env->marker = 'function';
+        $this->pushCallStack($this->env->marker . " " . $name);
 
         $ret = $this->compileChildren($func->children, $tmp);
 
+        $this->popCallStack();
+
         $this->storeEnv = $storeEnv;
 
         $this->popEnv();

From b8a7bf2f6f7c3595e4a0df2d94b3f8605b288d4f Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 26 Apr 2019 14:27:53 +0200
Subject: [PATCH 107/254] PSR2 corrections

---
 src/Compiler.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 2022a5a5..48d02439 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1311,7 +1311,8 @@ protected function hasSelectorPlaceholder($selector)
         return false;
     }
 
-    protected function pushCallStack($name = '') {
+    protected function pushCallStack($name = '')
+    {
         $this->callStack[] = [
           'n' => $name,
           Parser::SOURCE_INDEX => $this->sourceIndex,
@@ -1320,7 +1321,8 @@ protected function pushCallStack($name = '') {
         ];
     }
 
-    protected function popCallStack() {
+    protected function popCallStack()
+    {
         array_pop($this->callStack);
     }
 
@@ -1592,19 +1594,15 @@ protected function compileImport($rawPath, $out, $once = false)
      */
     protected function compileChild($child, OutputBlock $out)
     {
-        if (isset($child[Parser::SOURCE_LINE]))
-        {
-            $this->sourceIndex  = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null;
-            $this->sourceLine   = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1;
+        if (isset($child[Parser::SOURCE_LINE])) {
+            $this->sourceIndex = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null;
+            $this->sourceLine = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1;
             $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1;
-        }
-        elseif(is_array($child) and isset($child[1]->sourceLine))
-        {
+        } elseif (is_array($child) and isset($child[1]->sourceLine)) {
             $this->sourceIndex = $child[1]->sourceIndex;
             $this->sourceLine = $child[1]->sourceLine;
             $this->sourceColumn = $child[1]->sourceColumn;
-        }
-        elseif (! empty($out->sourceLine) and ! empty($out->sourceName)) {
+        } elseif (! empty($out->sourceLine) and ! empty($out->sourceName)) {
             $this->sourceLine = $out->sourceLine;
             $this->sourceIndex = array_search($out->sourceName, $this->sourceNames);
             if ($this->sourceIndex === false) {

From 29db735ec79e82f109ab2506897d8662d4bd0eff Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 26 Apr 2019 14:44:34 +0200
Subject: [PATCH 108/254] simple test case that reproduce the Zurb/foundation
 compilation fail

---
 tests/inputs/nested_mixins.scss | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tests/inputs/nested_mixins.scss b/tests/inputs/nested_mixins.scss
index f72ce365..dd13a655 100644
--- a/tests/inputs/nested_mixins.scss
+++ b/tests/inputs/nested_mixins.scss
@@ -26,3 +26,30 @@ div {
         }
     }
 }
+
+@mixin at-rooting($position: left, $content: 'element') {
+
+    @at-root .#{$content} {
+        float: $position;
+    }
+}
+
+@mixin breakpoint-with-var($value) {
+    $screen: 'screen';
+    @media print, #{$screen} and #{$value} {
+        @content;
+    }
+}
+
+@mixin caller-nested {
+
+    $width: '(min-width:640px)';
+
+    @include breakpoint-with-var($width) {
+        .position-left {
+          @include at-rooting(left, 'element');
+        }
+    }
+}
+
+@include caller-nested;
\ No newline at end of file

From b14e38dd48098b4448c411755a3f62eba1ed75fc Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 26 Apr 2019 16:50:23 +0200
Subject: [PATCH 109/254] even more simplier test

---
 tests/inputs/nested_mixins.scss | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/inputs/nested_mixins.scss b/tests/inputs/nested_mixins.scss
index dd13a655..b03445c9 100644
--- a/tests/inputs/nested_mixins.scss
+++ b/tests/inputs/nested_mixins.scss
@@ -27,12 +27,6 @@ div {
     }
 }
 
-@mixin at-rooting($position: left, $content: 'element') {
-
-    @at-root .#{$content} {
-        float: $position;
-    }
-}
 
 @mixin breakpoint-with-var($value) {
     $screen: 'screen';
@@ -47,7 +41,10 @@ div {
 
     @include breakpoint-with-var($width) {
         .position-left {
-          @include at-rooting(left, 'element');
+            @at-root .element {
+                float: $position;
+            }
+
         }
     }
 }

From a0ac4dfea1217192e3c9c9c825aad925c173201d Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 26 Apr 2019 16:58:51 +0200
Subject: [PATCH 110/254] Refactoring the isWithout() function to be sure that
 a known type is compared with the right WITH_ constant

---
 src/Compiler.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 48d02439..de5948a6 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -979,13 +979,15 @@ protected function filterWithout($envs, $without)
      */
     protected function isWithout($without, Block $block)
     {
-        if ((($without & static::WITH_RULE) && isset($block->selectors)) ||
-            (($without & static::WITH_MEDIA) &&
-                isset($block->type) && $block->type === Type::T_MEDIA) ||
-            (($without & static::WITH_SUPPORTS) &&
-                isset($block->type) && $block->type === Type::T_DIRECTIVE &&
-                isset($block->name) && $block->name === 'supports')
-        ) {
+        if (isset($block->type)) {
+            if ($block->type === Type::T_MEDIA) {
+                return ($without & static::WITH_MEDIA) ? true : false;
+            }
+            if ($block->type === Type::T_DIRECTIVE and isset($block->name) && $block->name === 'supports') {
+                return ($without & static::WITH_SUPPORTS) ? true : false;
+            }
+        }
+        if ((($without & static::WITH_RULE) && isset($block->selectors))) {
             return true;
         }
 

From 1e9bb2f8ec03ad43fdd6954b6bb280d326744823 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 27 Apr 2019 18:02:09 +0200
Subject: [PATCH 111/254] Reconception of @at-root compilation : filtering the
 scope depending of the with/without option is better then filtering the env
 and recompiling parents filtered block, as you don't have vars any more in
 the context to recompile this blocks

---
 src/Compiler.php | 125 ++++++++++++++++++++---------------------------
 1 file changed, 53 insertions(+), 72 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index de5948a6..3a329979 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -803,12 +803,11 @@ protected function compileAtRoot(Block $block)
         }
 
         $this->env = $this->filterWithout($envs, $without);
-        $newBlock  = $this->spliceTree($envs, $block, $without);
 
         $saveScope   = $this->scope;
-        $this->scope = $this->rootBlock;
-
-        $this->compileChild($newBlock, $this->scope);
+        $this->scope = $this->filterScopeWithout($saveScope, $without);
+        
+        $this->compileChildrenNoReturn($block->children, $this->scope);
 
         $this->scope = $saveScope;
         $this->env   = $this->extractEnv($envs);
@@ -817,85 +816,61 @@ protected function compileAtRoot(Block $block)
     }
 
     /**
-     * Splice parse tree
-     *
-     * @param array                $envs
-     * @param \Leafo\ScssPhp\Block $block
-     * @param integer              $without
-     *
-     * @return array
+     * Filter at-root scope depending of with/without option
+     * @param $scope
+     * @param $without
+     * @return mixed
      */
-    protected function spliceTree($envs, Block $block, $without)
-    {
-        $newBlock = null;
+    protected function filterScopeWithout($scope, $without) {
+        $filteredScopes = [];
 
-        foreach ($envs as $e) {
-            if (! isset($e->block)) {
-                continue;
-            }
-
-            if ($e->block === $block) {
-                continue;
-            }
-
-            if (isset($e->block->type) && $e->block->type === Type::T_AT_ROOT) {
-                continue;
-            }
+        // start from the root
+        while ($scope->parent && $scope->parent->type !== TYPE::T_ROOT) {
+            $scope = $scope->parent;
+        }
 
-            if ($e->block && $this->isWithout($without, $e->block)) {
-                continue;
+        for (; ;) {
+            if (! $scope) {
+                break;
             }
-
-            $b = new Block;
-            $b->sourceName   = $e->block->sourceName;
-            $b->sourceIndex  = $e->block->sourceIndex;
-            $b->sourceLine   = $e->block->sourceLine;
-            $b->sourceColumn = $e->block->sourceColumn;
-            $b->selectors    = [];
-            $b->comments     = $e->block->comments;
-            $b->parent       = null;
-
-            if ($newBlock) {
-                $type = isset($newBlock->type) ? $newBlock->type : Type::T_BLOCK;
-
-                $b->children = [[$type, $newBlock]];
-
-                $newBlock->parent = $b;
-            } elseif (count($block->children)) {
-                foreach ($block->children as $child) {
-                    if ($child[0] === Type::T_BLOCK) {
-                        $child[1]->parent = $b;
-                    }
+            if (! $this->isWithout($without, $scope)) {
+                $s = clone $scope;
+                $s->children = [];
+                $s->lines = [];
+                $s->parent = null;
+                if ($s->type !== Type::T_MEDIA && $s->type !== Type::T_DIRECTIVE) {
+                    $s->selectors = [];
                 }
-
-                $b->children = $block->children;
-            }
-
-            if (isset($e->block->type)) {
-                $b->type = $e->block->type;
+                $filteredScopes[] = $s;
             }
 
-            if (isset($e->block->name)) {
-                $b->name = $e->block->name;
+            if ($scope->children) {
+                $scope = end($scope->children);
             }
-
-            if (isset($e->block->queryList)) {
-                $b->queryList = $e->block->queryList;
+            else {
+                $scope = null;
             }
+        }
+        if (!count($filteredScopes)) {
+            return $this->rootBlock;
+        }
 
-            if (isset($e->block->value)) {
-                $b->value = $e->block->value;
-            }
+        $newScope = array_shift($filteredScopes);
+        $newScope->parent = $this->rootBlock;
+        $this->rootBlock->children[] = $newScope;
 
-            $newBlock = $b;
+        $p = &$newScope;
+        while (count($filteredScopes)) {
+            $s = array_shift($filteredScopes);
+            $s->parent = $p;
+            $p->children[] = &$s;
+            $p = $s;
         }
 
-        $newBlock->selfParent   = $block->selfParent;
-        $type = isset($newBlock->type) ? $newBlock->type : Type::T_BLOCK;
-
-        return [$type, $newBlock];
+        return $newScope;
     }
 
+
     /**
      * Compile @at-root's with: inclusion / without: exclusion into filter flags
      *
@@ -973,18 +948,24 @@ protected function filterWithout($envs, $without)
      * Filter WITH rules
      *
      * @param integer              $without
-     * @param \Leafo\ScssPhp\Block $block
+     * @param \Leafo\ScssPhp\Block|\Leafo\ScssPhp\Formatter\OutputBlock $block
      *
      * @return boolean
      */
-    protected function isWithout($without, Block $block)
+    protected function isWithout($without, $block)
     {
         if (isset($block->type)) {
             if ($block->type === Type::T_MEDIA) {
                 return ($without & static::WITH_MEDIA) ? true : false;
             }
-            if ($block->type === Type::T_DIRECTIVE and isset($block->name) && $block->name === 'supports') {
-                return ($without & static::WITH_SUPPORTS) ? true : false;
+
+            if ($block->type === Type::T_DIRECTIVE) {
+                if (isset($block->name) && $block->name === 'supports') {
+                    return ($without & static::WITH_SUPPORTS) ? true : false;
+                }
+                if (isset($block->selectors) && strpos(serialize($block->selectors),'@supports') !== false) {
+                    return ($without & static::WITH_SUPPORTS) ? true : false;
+                }
             }
         }
         if ((($without & static::WITH_RULE) && isset($block->selectors))) {

From 201d6afa73e7d794e40dcd561a27589914ddbaa3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 27 Apr 2019 20:37:28 +0200
Subject: [PATCH 112/254] When at-root is enclosing a single property, there is
 no selector enclosing when compiling it So you need to complete it after
 compiling by picking it back in the saved scope

---
 src/Compiler.php | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 3a329979..9cb407dc 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -806,9 +806,10 @@ protected function compileAtRoot(Block $block)
 
         $saveScope   = $this->scope;
         $this->scope = $this->filterScopeWithout($saveScope, $without);
-        
+
         $this->compileChildrenNoReturn($block->children, $this->scope);
 
+        $this->scope = $this->completeScope($this->scope, $saveScope);
         $this->scope = $saveScope;
         $this->env   = $this->extractEnv($envs);
 
@@ -870,6 +871,46 @@ protected function filterScopeWithout($scope, $without) {
         return $newScope;
     }
 
+    /**
+     * found missing selector from a at-root compilation in the previous scope
+     * (if at-root is just enclosing a property, the selector is in the parent tree)
+     * @param $scope
+     * @param $previousScope
+     * @return mixed
+     */
+    protected function completeScope($scope, $previousScope) {
+
+        if (! $scope->type && ! count($scope->selectors) && count($scope->lines)) {
+            $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth);
+        }
+        if ($scope->children) {
+            foreach ($scope->children as $k=>$c) {
+                $scope->children[$k] = $this->completeScope($c, $previousScope);
+            }
+        }
+
+        return $scope;
+    }
+
+    /**
+     * Find a selector by the depth node in the scope
+     * @param $scope
+     * @param $depth
+     * @return array
+     */
+    protected function findScopeSelectors($scope, $depth) {
+        if ($scope->depth === $depth && $scope->selectors) {
+            return $scope->selectors;
+        }
+        if ($scope->children) {
+            foreach (array_reverse($scope->children) as $c) {
+                if ($s = $this->findScopeSelectors($c, $depth)) {
+                    return $s;
+                }
+            }
+        }
+        return [];
+    }
 
     /**
      * Compile @at-root's with: inclusion / without: exclusion into filter flags

From 06b4da55f9b083f17f58e2951d957a469d027e8d Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 27 Apr 2019 22:20:07 +0200
Subject: [PATCH 113/254] PSR2

---
 src/Compiler.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 9cb407dc..1ac13c9f 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -822,7 +822,8 @@ protected function compileAtRoot(Block $block)
      * @param $without
      * @return mixed
      */
-    protected function filterScopeWithout($scope, $without) {
+    protected function filterScopeWithout($scope, $without)
+    {
         $filteredScopes = [];
 
         // start from the root
@@ -830,7 +831,7 @@ protected function filterScopeWithout($scope, $without) {
             $scope = $scope->parent;
         }
 
-        for (; ;) {
+        for (;;) {
             if (! $scope) {
                 break;
             }
@@ -847,8 +848,7 @@ protected function filterScopeWithout($scope, $without) {
 
             if ($scope->children) {
                 $scope = end($scope->children);
-            }
-            else {
+            } else {
                 $scope = null;
             }
         }
@@ -878,13 +878,13 @@ protected function filterScopeWithout($scope, $without) {
      * @param $previousScope
      * @return mixed
      */
-    protected function completeScope($scope, $previousScope) {
-
+    protected function completeScope($scope, $previousScope)
+    {
         if (! $scope->type && ! count($scope->selectors) && count($scope->lines)) {
             $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth);
         }
         if ($scope->children) {
-            foreach ($scope->children as $k=>$c) {
+            foreach ($scope->children as $k => $c) {
                 $scope->children[$k] = $this->completeScope($c, $previousScope);
             }
         }
@@ -898,7 +898,8 @@ protected function completeScope($scope, $previousScope) {
      * @param $depth
      * @return array
      */
-    protected function findScopeSelectors($scope, $depth) {
+    protected function findScopeSelectors($scope, $depth)
+    {
         if ($scope->depth === $depth && $scope->selectors) {
             return $scope->selectors;
         }
@@ -1004,7 +1005,7 @@ protected function isWithout($without, $block)
                 if (isset($block->name) && $block->name === 'supports') {
                     return ($without & static::WITH_SUPPORTS) ? true : false;
                 }
-                if (isset($block->selectors) && strpos(serialize($block->selectors),'@supports') !== false) {
+                if (isset($block->selectors) && strpos(serialize($block->selectors), '@supports') !== false) {
                     return ($without & static::WITH_SUPPORTS) ? true : false;
                 }
             }

From 4f1b9d876f34402d6bdc4797b60b518ac1db87a8 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 27 Apr 2019 18:07:36 +0200
Subject: [PATCH 114/254] finishing the test case for at-root failed
 compilation: adding some properties before and after and the expected outputs

---
 tests/inputs/nested_mixins.scss          |  4 +++-
 tests/outputs/nested_mixins.css          |  9 +++++++++
 tests/outputs_numbered/nested_mixins.css | 11 +++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/tests/inputs/nested_mixins.scss b/tests/inputs/nested_mixins.scss
index b03445c9..3bf5a23e 100644
--- a/tests/inputs/nested_mixins.scss
+++ b/tests/inputs/nested_mixins.scss
@@ -41,10 +41,12 @@ div {
 
     @include breakpoint-with-var($width) {
         .position-left {
+            color:red;
             @at-root .element {
+                $position: left;
                 float: $position;
             }
-
+            background:yellow;
         }
     }
 }
diff --git a/tests/outputs/nested_mixins.css b/tests/outputs/nested_mixins.css
index 432580b8..a2835432 100644
--- a/tests/outputs/nested_mixins.css
+++ b/tests/outputs/nested_mixins.css
@@ -7,3 +7,12 @@ div .container {
     width: 10px; }
   div .container .bar {
     width: 12px; }
+
+@media print, screen and (min-width:640px) {
+  .position-left {
+    color: red;
+    background: yellow; } }
+
+@media print, screen and (min-width:640px) {
+        .element {
+          float: left; } }
diff --git a/tests/outputs_numbered/nested_mixins.css b/tests/outputs_numbered/nested_mixins.css
index ae9c6029..74e86c18 100644
--- a/tests/outputs_numbered/nested_mixins.css
+++ b/tests/outputs_numbered/nested_mixins.css
@@ -12,3 +12,14 @@ div .container .foo {
 /* line 24, inputs/nested_mixins.scss */
 div .container .bar {
   width: 12px; }
+
+@media print, screen and (min-width:640px) {
+  /* line 43, inputs/nested_mixins.scss */
+    .position-left {
+      color: red;
+      background: yellow; } }
+
+@media print, screen and (min-width:640px) {
+/* line 45, inputs/nested_mixins.scss */
+.element {
+  float: left; } }

From f71e20b668991796d27ebdf1784cab7923bd40c0 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Sat, 27 Apr 2019 20:39:21 +0200
Subject: [PATCH 115/254] test output update : only white space diff due to the
 at-root compilation enhancement

---
 tests/outputs/at_root.css          | 101 +++++++++++++++++------------
 tests/outputs_numbered/at_root.css |  96 ++++++++++++++-------------
 2 files changed, 109 insertions(+), 88 deletions(-)

diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index b0c71a42..cf815fdc 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -1,16 +1,17 @@
 .parent-inline-selector {
   color: white; }
-  .child {
-    color: black; }
+    .child {
+      color: black; }
 
 .parent-block {
   color: white; }
-  .child1 {
-    color: green; }
+    .child1 {
+      color: green; }
     .child2 {
       color: blue; }
-  .parent-block .step-child {
-    color: black; }
+
+.parent-block .step-child {
+  color: black; }
 
 .first {
   color: red; }
@@ -18,11 +19,12 @@
 body .second {
   color: white;
   color: black; }
-  .nested1 {
-    color: blue;
-    color: orange; }
-    .nested2 {
-      color: yellow; }
+      .nested1 {
+        color: blue;
+        color: orange; }
+
+.nested2 {
+  color: yellow; }
 
 .third {
   color: green; }
@@ -30,50 +32,63 @@ body .second {
 @media print {
   .page {
     width: 8in; } }
-  .page {
-    color: red; }
+
+.page {
+  color: red; }
 
 @media (min-width: 300px) {
     .my-widget .inside-mq {
       inside-style: mq; } }
-  .my-widget .outside-mq {
-    outside-style: mq; }
-  .outside-class {
-    color: blue; }
-  @media (min-width: 300px) {
-          .with-only {
-            color: pink; } }
+
+      .my-widget .outside-mq {
+        outside-style: mq; }
+
+.outside-class {
+  color: blue; }
+
+@media (min-width: 300px) {
+        .with-only {
+          color: pink; } }
 
 @media screen and (max-width: 320px) {
   .foo {
     margin: 0; } }
-  @media screen and (max-width: 320px) {
-        .bar {
+
+@media screen and (max-width: 320px) {
+      .bar {
+        padding: 0; } }
+
+.baar {
+  padding: 0; }
+
+    .foo .barr {
+      padding: 0; }
+
+
+
+.foo .bar {
+  width: 0; }
+
+@supports ( display: flex ) {
+        .baz {
+          height: 0; } }
+
+@media screen and (max-width: 640px) {
+        .qux {
+          margin: 0; } }
+
+@media screen and (max-width: 640px) {
+        .foo .quux {
           padding: 0; } }
-  .baar {
-    padding: 0; }
-  .foo .barr {
-    padding: 0; }
-
-
-  .foo .bar {
-    width: 0; }
-  @supports ( display: flex ) {
-          .baz {
-            height: 0; } }
-  @media screen and (max-width: 640px) {
-          .qux {
-            margin: 0; } }
-  @media screen and (max-width: 640px) {
-          .foo .quux {
-            padding: 0; } }
-  .foo .quix {
-    padding: 0; }
+
+.foo .quix {
+  padding: 0; }
 
 .test .test2 {
   padding: 0px; }
-  tbody {
-    padding: 10px; }
+      tbody {
+        padding: 10px; }
 
 a.badge {
   text-decoration: none; }
+
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index cb052501..50d2eeaa 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -1,18 +1,20 @@
 /* line 1, inputs/at_root.scss */
 .parent-inline-selector {
   color: white; }
-  /* line 3, inputs/at_root.scss */
-    .child {
-      color: black; }
+/* line 3, inputs/at_root.scss */
+.child {
+  color: black; }
+
 /* line 6, inputs/at_root.scss */
 .parent-block {
   color: white; }
-  /* line 9, inputs/at_root.scss */
-    .child1 {
-      color: green; }
+/* line 9, inputs/at_root.scss */
+.child1 {
+  color: green; }
 /* line 10, inputs/at_root.scss */
 .child2 {
   color: blue; }
+
 /* line 12, inputs/at_root.scss */
 .parent-block .step-child {
   color: black; }
@@ -25,14 +27,14 @@
 body .second {
   color: white;
   color: black; }
-
 /* line 23, inputs/at_root.scss */
-  .nested1 {
-    color: blue;
-    color: orange; }
-    /* line 26, inputs/at_root.scss */
-      .nested2 {
-        color: yellow; }
+.nested1 {
+  color: blue;
+  color: orange; }
+
+/* line 26, inputs/at_root.scss */
+.nested2 {
+  color: yellow; }
 /* line 36, inputs/at_root.scss */
 .third {
   color: green; }
@@ -49,16 +51,18 @@ body .second {
     /* line 51, inputs/at_root.scss */
       .my-widget .inside-mq {
         inside-style: mq; } }
-  /* line 56, inputs/at_root.scss */
-    .my-widget .outside-mq {
-      outside-style: mq; }
-  /* line 63, inputs/at_root.scss */
-    .outside-class {
-      color: blue; }
-  @media (min-width: 300px) {
+
+/* line 56, inputs/at_root.scss */
+.my-widget .outside-mq {
+outside-style: mq; }
+/* line 63, inputs/at_root.scss */
+.outside-class {
+  color: blue; }
+
+@media (min-width: 300px) {
 /* line 71, inputs/at_root.scss */
 .with-only {
-color: pink; } }
+  color: pink; } }
 
 @media screen and (max-width: 320px) {
 /* line 81, inputs/at_root.scss */
@@ -69,46 +73,48 @@ color: pink; } }
 /* line 85, inputs/at_root.scss */
 .bar {
   padding: 0; } }
-
 /* line 90, inputs/at_root.scss */
-  .baar {
-    padding: 0; }
+.baar {
+  padding: 0; }
 
 /* line 95, inputs/at_root.scss */
-  .foo .barr {
-    padding: 0; }
+.foo .barr {
+padding: 0; }
 
 @media screen and (max-width: 640px) {
 /* line 104, inputs/at_root.scss */ }
-  /* line 107, inputs/at_root.scss */
-  .foo .bar {
-    width: 0; }
-  @supports ( display: flex ) {
+/* line 107, inputs/at_root.scss */
+.foo .bar {
+  width: 0; }
+
+@supports ( display: flex ) {
 /* line 112, inputs/at_root.scss */
 .baz {
-height: 0; } }
-  @media screen and (max-width: 640px) {
+  height: 0; } }
+
+@media screen and (max-width: 640px) {
 /* line 117, inputs/at_root.scss */
 .qux {
-margin: 0; } }
-  @media screen and (max-width: 640px) {
-          /* line 122, inputs/at_root.scss */
-            .foo .quux {
-              padding: 0; } }
-  /* line 127, inputs/at_root.scss */
-  .foo .quix {
-    padding: 0; }
+  margin: 0; } }
+
+@media screen and (max-width: 640px) {
+/* line 122, inputs/at_root.scss */
+.foo .quux {
+  padding: 0; } }
+/* line 127, inputs/at_root.scss */
+.foo .quix {
+  padding: 0; }
 /* line 144, inputs/at_root.scss */
 /* line 145, inputs/at_root.scss */
 
 .test .test2 {
   padding: 0px; }
-
 /* line 139, inputs/at_root.scss */
-  tbody {
-    padding: 10px; }
+tbody {
+  padding: 10px; }
+
 /* line 151, inputs/at_root.scss */
 /* line 152, inputs/at_root.scss */
-
 a.badge {
-  text-decoration: none; }
+text-decoration: none; }
+

From 458759d0b90cd1bce5221e6f312c7045e5e6af05 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 11:59:50 +0200
Subject: [PATCH 116/254] test case for
 https://github.com/leafo/scssphp/issues/620

---
 tests/inputs/values.scss          | 5 +++++
 tests/outputs/values.css          | 3 +++
 tests/outputs_numbered/values.css | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/tests/inputs/values.scss b/tests/inputs/values.scss
index 45123a5f..8279447d 100644
--- a/tests/inputs/values.scss
+++ b/tests/inputs/values.scss
@@ -41,3 +41,8 @@ multiline string.";
     d: +foo(12px);
 }
 
+#self {
+    $self1: #{&};
+    $self2: &;
+    content:'#{$self2}';
+}
diff --git a/tests/outputs/values.css b/tests/outputs/values.css
index acc36395..d6937374 100644
--- a/tests/outputs/values.css
+++ b/tests/outputs/values.css
@@ -32,3 +32,6 @@ multiline string.";
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
+
+#self {
+  content: "#self"; }
diff --git a/tests/outputs_numbered/values.css b/tests/outputs_numbered/values.css
index d78e3938..af231709 100644
--- a/tests/outputs_numbered/values.css
+++ b/tests/outputs_numbered/values.css
@@ -33,3 +33,6 @@ multiline string.";
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
+/* line 44, inputs/values.scss */
+#self {
+  content: "#self"; }

From 8ae752575d63b86d963c44e941d6b4b3804eaae5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 11:57:04 +0200
Subject: [PATCH 117/254] Parser fix for
 https://github.com/leafo/scssphp/issues/620 : allow to assign self to a var
 without interpolation - this also simplify the iparsing of  #{&}

---
 src/Parser.php | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index ba0a1802..44747643 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1402,6 +1402,11 @@ protected function value(&$out)
             }
         }
 
+        if ($this->matchChar('&', true)) {
+            $out = [Type::T_SELF];
+            return true;
+        }
+
         if ($char === '$' && $this->variable($out)) {
             return true;
         }
@@ -1991,28 +1996,18 @@ protected function interpolation(&$out, $lookWhite = true)
         $s = $this->count;
 
         if ($this->literal('#{', 2) && $this->valueList($value) && $this->matchChar('}', false)) {
-            if ($lookWhite) {
-                $left = preg_match('/\s/', $this->buffer[$s - 1]) ? ' ' : '';
-                $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';
+            if ($value === [Type::T_SELF]) {
+                $out = $value;
             } else {
-                $left = $right = false;
-            }
-
-            $out = [Type::T_INTERPOLATE, $value, $left, $right];
-            $this->eatWhiteDefault = $oldWhite;
+                if ($lookWhite) {
+                    $left = preg_match('/\s/', $this->buffer[$s - 1]) ? ' ' : '';
+                    $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';
+                } else {
+                    $left = $right = false;
+                }
 
-            if ($this->eatWhiteDefault) {
-                $this->whitespace();
+                $out = [Type::T_INTERPOLATE, $value, $left, $right];
             }
-
-            return true;
-        }
-
-        $this->seek($s);
-
-        if ($this->literal('#{', 2) && $this->selectorSingle($sel) && $this->matchChar('}', false)) {
-            $out = $sel[0];
-
             $this->eatWhiteDefault = $oldWhite;
 
             if ($this->eatWhiteDefault) {
@@ -2023,6 +2018,7 @@ protected function interpolation(&$out, $lookWhite = true)
         }
 
         $this->seek($s);
+
         $this->eatWhiteDefault = $oldWhite;
 
         return false;

From 1271d1bdb7d71e4d8732421d41ffc6280261bedc Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 11:31:56 +0200
Subject: [PATCH 118/254] Compiler fix for
 https://github.com/leafo/scssphp/issues/620 : allow to assign self '&' to a
 var

---
 src/Compiler.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 87fb8b25..fe89d826 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2215,6 +2215,11 @@ protected function reduce($value, $inExp = false)
             case Type::T_FUNCTION_CALL:
                 return $this->fncall($value[1], $value[2]);
 
+            case Type::T_SELF:
+                $selfSelector = $this->multiplySelectors($this->env);
+                $selfSelector = $this->collapseSelectors($selfSelector);
+                return [Type::T_STRING, '', [$selfSelector]];
+
             default:
                 return $value;
         }

From 3e8cc41c28f27061dda7eac70feab600b00321ae Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 13:04:02 +0200
Subject: [PATCH 119/254] Unit test case for @support
 https://github.com/leafo/scssphp/issues/493

---
 tests/inputs/directives.scss          | 19 +++++++++++++++++++
 tests/outputs/directives.css          | 13 +++++++++++++
 tests/outputs_numbered/directives.css | 15 +++++++++++++++
 3 files changed, 47 insertions(+)

diff --git a/tests/inputs/directives.scss b/tests/inputs/directives.scss
index c69c6c8f..46a5ab50 100644
--- a/tests/inputs/directives.scss
+++ b/tests/inputs/directives.scss
@@ -153,3 +153,22 @@ div {
 }
 
 }
+
+.sticky-top {
+  @supports (position: sticky) {
+    .top2 {
+      position: sticky;
+    }
+  }
+}
+.sticky-top {
+  @supports (position: sticky) {
+    position: sticky;
+  }
+}
+
+@supports (position: sticky) {
+  .sticky-top2 {
+    position: sticky;
+  }
+}
\ No newline at end of file
diff --git a/tests/outputs/directives.css b/tests/outputs/directives.css
index 3ae63034..6bbec3ee 100644
--- a/tests/outputs/directives.css
+++ b/tests/outputs/directives.css
@@ -22,6 +22,7 @@ div {
 
 @font-face {
   color: red;
+
   height: 20px; }
 
 @keyframes 'bounce' {
@@ -100,3 +101,15 @@ div {
       transform: scale(0.5); }
     to {
       transform: scale(1); } }
+
+@supports (position: sticky) {
+    .sticky-top .top2 {
+      position: sticky; } }
+
+@supports (position: sticky) {
+    .sticky-top {
+      position: sticky; } }
+
+@supports (position: sticky) {
+  .sticky-top2 {
+    position: sticky; } }
diff --git a/tests/outputs_numbered/directives.css b/tests/outputs_numbered/directives.css
index f61582ba..79b61cc1 100644
--- a/tests/outputs_numbered/directives.css
+++ b/tests/outputs_numbered/directives.css
@@ -26,6 +26,7 @@ height: 20px; } }
 
 @font-face {
   color: red;
+
   height: 20px; }
 
 @keyframes 'bounce' {
@@ -116,3 +117,17 @@ from {
 /* line 150, inputs/directives.scss */
 to {
   transform: scale(1); } }
+/* line 157, inputs/directives.scss */
+@supports (position: sticky) {
+/* line 159, inputs/directives.scss */
+.sticky-top .top2 {
+  position: sticky; } }
+/* line 164, inputs/directives.scss */
+@supports (position: sticky) {
+    .sticky-top {
+      position: sticky; } }
+
+@supports (position: sticky) {
+/* line 171, inputs/directives.scss */
+.sticky-top2 {
+  position: sticky; } }

From 01ec539b3bdbf91bc5b78ffb783e42fda4826b24 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 13:00:41 +0200
Subject: [PATCH 120/254] Fix https://github.com/leafo/scssphp/issues/493 :
 wrap assign lines in a block before compiling directives

---
 src/Compiler.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 87fb8b25..7c545fe7 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1031,6 +1031,24 @@ protected function compileNestedBlock(Block $block, $selectors)
         $this->scope = $this->makeOutputBlock($block->type, $selectors);
         $this->scope->parent->children[] = $this->scope;
 
+        // wrap assign children in a block
+        foreach ($block->children as $k => $child) {
+            if ($child[0] === Type::T_ASSIGN) {
+                $wrapped = new Block;
+                $wrapped->sourceName   = $block->sourceName;
+                $wrapped->sourceIndex  = $block->sourceIndex;
+                $wrapped->sourceLine   = $block->sourceLine;
+                $wrapped->sourceColumn = $block->sourceColumn;
+                $wrapped->selectors    = [];
+                $wrapped->comments     = [];
+                $wrapped->parent       = $block;
+                $wrapped->children     = [$child];
+                $wrapped->selfParent   = $block->selfParent;
+
+                $block->children[$k] = [Type::T_BLOCK, $wrapped];
+            }
+        }
+
         $this->compileChildrenNoReturn($block->children, $this->scope);
 
         $this->scope = $this->scope->parent;

From 210495ad08c2135b0b4a9f038bf01648dbe5cb07 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 13:04:48 +0200
Subject: [PATCH 121/254] Slight change in the outputs due to directive
 compilation enhancement: * some additionnal new lines * one real change on
 the compilation of the following block which result is better at it now keeps
 initial order (even if still producing not valid result however) ` @foo {  
 rule {     a: b; }

  a: b; }
`
---
 tests/outputs/scss_css.css          | 14 ++++++++++++--
 tests/outputs_numbered/scss_css.css | 13 +++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tests/outputs/scss_css.css b/tests/outputs/scss_css.css
index 061fcad7..21f6446c 100644
--- a/tests/outputs/scss_css.css
+++ b/tests/outputs/scss_css.css
@@ -63,9 +63,10 @@ sel {
   a: b; }
 
 @foo {
-  a: b;
   rule {
-    a: b; } }
+    a: b; }
+
+  a: b; }
 
 @foo {
   a: b; }
@@ -77,8 +78,11 @@ sel {
 
 foo {
   a: 12px calc(100%/3 - 2*1em - 2*1px);
+
   b: 12px -moz-calc(100%/3 - 2*1em - 2*1px);
+
   b: 12px -webkit-calc(100%/3 - 2*1em - 2*1px);
+
   b: 12px -foobar-calc(100%/3 - 2*1em - 2*1px); }
 
 foo {
@@ -154,7 +158,9 @@ foo {
 
 foo {
   a: -moz-element(#foo);
+
   b: -webkit-element(#foo);
+
   b: -foobar-element(#foo); }
 
 @foo ;
@@ -528,18 +534,22 @@ foo {
 
 @page {
   prop1: val;
+
   prop2: val; }
 
 @page flap {
   prop1: val;
+
   prop2: val; }
 
 @page :first {
   prop1: val;
+
   prop2: val; }
 
 @page flap:first {
   prop1: val;
+
   prop2: val; }
 
 .foo {
diff --git a/tests/outputs_numbered/scss_css.css b/tests/outputs_numbered/scss_css.css
index f2336adc..8bd95ca9 100644
--- a/tests/outputs_numbered/scss_css.css
+++ b/tests/outputs_numbered/scss_css.css
@@ -64,10 +64,10 @@ sel {
   a: b; }
 
 @foo {
-  a: b;
 /* line 65, inputs/scss_css.scss */
 rule {
-  a: b; } }
+  a: b; }
+a: b; }
 
 @foo {
   a: b; }
@@ -79,8 +79,11 @@ rule {
 
 foo {
   a: 12px calc(100%/3 - 2*1em - 2*1px);
+
   b: 12px -moz-calc(100%/3 - 2*1em - 2*1px);
+
   b: 12px -webkit-calc(100%/3 - 2*1em - 2*1px);
+
   b: 12px -foobar-calc(100%/3 - 2*1em - 2*1px); }
 /* line 84, inputs/scss_css.scss */
 foo {
@@ -163,7 +166,9 @@ foo {
 
 foo {
   a: -moz-element(#foo);
+
   b: -webkit-element(#foo);
+
   b: -foobar-element(#foo); }
 
 @foo ;
@@ -543,18 +548,22 @@ foo {
 
 @page {
   prop1: val;
+
   prop2: val; }
 
 @page flap {
   prop1: val;
+
   prop2: val; }
 
 @page :first {
   prop1: val;
+
   prop2: val; }
 
 @page flap:first {
   prop1: val;
+
   prop2: val; }
 /* line 688, inputs/scss_css.scss */
 .foo {

From 15522eb86253475469c65b9d0a16a8fef482f8a5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 09:42:33 +0200
Subject: [PATCH 122/254] Unit tests for #644 coming out from real life
 compiling of BS4

---
 tests/inputs/at_root.scss          | 20 +++++++++++++++++++-
 tests/outputs/at_root.css          | 11 +++++++++++
 tests/outputs_numbered/at_root.css | 16 ++++++++++++++++
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/tests/inputs/at_root.scss b/tests/inputs/at_root.scss
index 17d4334a..1f96e757 100644
--- a/tests/inputs/at_root.scss
+++ b/tests/inputs/at_root.scss
@@ -152,4 +152,22 @@ $table-padding: 10px !default;
   @at-root a#{&} {
     text-decoration: none;
   }
-}
\ No newline at end of file
+}
+
+@mixin badge-variant($bg) {
+  background-color: $bg;
+
+  @at-root a#{&} {
+    &:focus,
+    &.focus {
+      outline: 0;
+    }
+  }
+}
+
+.badge-primary {
+	@include badge-variant(blue);
+}
+.badge-secondary {
+	@include badge-variant(yellow);
+}
diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index cf815fdc..c01c12f1 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -92,3 +92,14 @@ body .second {
 a.badge {
   text-decoration: none; }
 
+
+.badge-primary {
+  background-color: blue; }
+    a.badge-primary:focus, a.badge-primary.focus {
+      outline: 0; }
+
+.badge-secondary {
+  background-color: yellow; }
+    a.badge-secondary:focus, a.badge-secondary.focus {
+      outline: 0; }
+
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index 50d2eeaa..5f5edb7f 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -118,3 +118,19 @@ tbody {
 a.badge {
 text-decoration: none; }
 
+/* line 168, inputs/at_root.scss */
+.badge-primary {
+  background-color: blue; }
+/* line 160, inputs/at_root.scss */
+/* line 161, inputs/at_root.scss */
+  a.badge-primary:focus, a.badge-primary.focus {
+    outline: 0; }
+
+/* line 171, inputs/at_root.scss */
+.badge-secondary {
+  background-color: yellow; }
+/* line 160, inputs/at_root.scss */
+/* line 161, inputs/at_root.scss */
+  a.badge-secondary:focus, a.badge-secondary.focus {
+    outline: 0; }
+

From 7fb411688af709eb1f6fa5b331ff94780c7f9c94 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 17:11:20 +0200
Subject: [PATCH 123/254] Some more tests that combine severals selectors,
 mixins self and at-root to check that everything is working together

---
 tests/inputs/at_root.scss          | 17 +++++++++++++++++
 tests/outputs/at_root.css          |  6 ++++++
 tests/outputs_numbered/at_root.css | 12 ++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/tests/inputs/at_root.scss b/tests/inputs/at_root.scss
index 1f96e757..95dd83da 100644
--- a/tests/inputs/at_root.scss
+++ b/tests/inputs/at_root.scss
@@ -171,3 +171,20 @@ $table-padding: 10px !default;
 .badge-secondary {
 	@include badge-variant(yellow);
 }
+
+// combine everything in one: several levels of selecors, mixin, at-root and self
+@mixin mixin-hover {
+  &:hover { @content; }
+  @at-root #{&}.foo {
+	color:red;
+  }
+}
+
+.table-hover, .table2#id {
+  tbody tr {
+    @include mixin-hover {
+      color: #ddd;
+      background-color: #eee;
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index c01c12f1..0c37a2a7 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -103,3 +103,9 @@ a.badge {
     a.badge-secondary:focus, a.badge-secondary.focus {
       outline: 0; }
 
+.table-hover tbody tr:hover, .table2#id tbody tr:hover {
+  color: #ddd;
+  background-color: #eee; }
+      .table-hover tbody tr.foo, .table2#id tbody tr.foo {
+        color: red; }
+
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index 5f5edb7f..00510077 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -134,3 +134,15 @@ text-decoration: none; }
   a.badge-secondary:focus, a.badge-secondary.focus {
     outline: 0; }
 
+/* line 183, inputs/at_root.scss */
+/* line 184, inputs/at_root.scss */
+
+/* line 177, inputs/at_root.scss */
+
+.table-hover tbody tr:hover, .table2#id tbody tr:hover {
+  color: #ddd;
+  background-color: #eee; }
+/* line 178, inputs/at_root.scss */
+.table-hover tbody tr.foo, .table2#id tbody tr.foo {
+  color: red; }
+

From 120c4ece4783f922de4e21694075891de62352b4 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 10:57:07 +0200
Subject: [PATCH 124/254] one more test about nested interpolations of self

---
 tests/inputs/interpolation.scss          | 16 ++++++++++++++++
 tests/outputs/interpolation.css          |  7 +++++++
 tests/outputs_numbered/interpolation.css |  9 +++++++++
 3 files changed, 32 insertions(+)

diff --git a/tests/inputs/interpolation.scss b/tests/inputs/interpolation.scss
index f2a266bc..b6d91d1c 100644
--- a/tests/inputs/interpolation.scss
+++ b/tests/inputs/interpolation.scss
@@ -102,4 +102,20 @@ div {
   a#{&} {
     text-decoration: none;
   }
+}
+
+@mixin button-variant($background) {
+  background: $background;
+
+  &:not(.disabled) {
+    border-color: red;
+
+    &:focus {
+	border-width: 3px;
+    }
+  }
+}
+
+.btn-primary {
+    @include button-variant(yellow);
 }
\ No newline at end of file
diff --git a/tests/outputs/interpolation.css b/tests/outputs/interpolation.css
index c4e4802d..b521158d 100644
--- a/tests/outputs/interpolation.css
+++ b/tests/outputs/interpolation.css
@@ -64,3 +64,10 @@ div {
 
 a.badge {
   text-decoration: none; }
+
+.btn-primary {
+  background: yellow; }
+  .btn-primary:not(.disabled) {
+    border-color: red; }
+    .btn-primary:not(.disabled):focus {
+      border-width: 3px; }
diff --git a/tests/outputs_numbered/interpolation.css b/tests/outputs_numbered/interpolation.css
index ae1d7087..261ef049 100644
--- a/tests/outputs_numbered/interpolation.css
+++ b/tests/outputs_numbered/interpolation.css
@@ -76,3 +76,12 @@ div {
 
 a.badge {
   text-decoration: none; }
+/* line 119, inputs/interpolation.scss */
+.btn-primary {
+  background: yellow; }
+/* line 110, inputs/interpolation.scss */
+.btn-primary:not(.disabled) {
+  border-color: red; }
+/* line 113, inputs/interpolation.scss */
+.btn-primary:not(.disabled):focus {
+  border-width: 3px; }

From 79d8b9366c08aeb6fa109e426c0b7d6506d28a79 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 11:21:22 +0200
Subject: [PATCH 125/254] https://github.com/leafo/scssphp/issues/644 : missing
 reset when wrapping at-root block with selector, causing multiplication of
 the selector when it was in a mixin call several times

---
 src/Compiler.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 048f221c..2c94a26a 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -800,6 +800,7 @@ protected function compileAtRoot(Block $block)
             $wrapped->selfParent   = $block->selfParent;
 
             $block->children = [[Type::T_BLOCK, $wrapped]];
+            $block->selector = null;
         }
 
         $this->env = $this->filterWithout($envs, $without);

From 35f842ac727e528ebad767111b81e957cd4f8c42 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 09:44:22 +0200
Subject: [PATCH 126/254] https://github.com/leafo/scssphp/issues/644 : * when
 compiling a mixin, you have to first extract the parent selector from the
 scope to provide it for the self '&' compilation * you have to propagate de
 selfParent when compiling at-root or generic block if any in the current
 block + flatten array in the joinSelectors() function when needed

---
 src/Compiler.php | 44 ++++++++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 2c94a26a..0a0024e9 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -808,7 +808,8 @@ protected function compileAtRoot(Block $block)
         $saveScope   = $this->scope;
         $this->scope = $this->filterScopeWithout($saveScope, $without);
 
-        $this->compileChildrenNoReturn($block->children, $this->scope);
+        // propagate selfParent to the children where they still can be useful
+        $this->compileChildrenNoReturn($block->children, $this->scope, $block->selfParent);
 
         $this->scope = $this->completeScope($this->scope, $saveScope);
         $this->scope = $saveScope;
@@ -1137,8 +1138,8 @@ protected function compileBlock(Block $block)
 
         if (count($block->children)) {
             $out->selectors = $this->multiplySelectors($env, $block->selfParent);
-
-            $this->compileChildrenNoReturn($block->children, $out);
+            // propagate selfParent to the children where they still can be useful
+            $this->compileChildrenNoReturn($block->children, $out, $block->selfParent);
         }
 
         $this->formatter->stripSemicolon($out->lines);
@@ -1395,12 +1396,17 @@ protected function compileChildren($stms, OutputBlock $out)
      *
      * @param array                                $stms
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
+     * @param \Leafo\ScssPhp\Block $selfParent
      *
      * @throws \Exception
      */
-    protected function compileChildrenNoReturn($stms, OutputBlock $out)
+    protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null)
     {
+
         foreach ($stms as $stm) {
+            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) == 'Leafo\ScssPhp\Block') {
+                $stm[1]->selfParent = $selfParent;
+            }
             $ret = $this->compileChild($stm, $out);
 
             if (isset($ret)) {
@@ -1957,6 +1963,25 @@ protected function compileChild($child, OutputBlock $out)
                 $storeEnv = $this->storeEnv;
                 $this->storeEnv = $this->env;
 
+                // Find the parent selectors in the env to be able to know what '&' refers to in the mixin
+                $selfParent = null;
+                $selfParentSelectors = null;
+                $e = $this->env;
+                for (;;) {
+                    if (isset($e->selectors) && $e->selectors) {
+                        $selfParentSelectors = $e->selectors;
+                        break;
+                    }
+                    if (! $e->parent) {
+                        break;
+                    }
+                    $e = $e->parent;
+                }
+                if ($selfParentSelectors) {
+                    $selfParent = new Block();
+                    $selfParent->selectors = $selfParentSelectors;
+                }
+
                 if (isset($content)) {
                     $content->scope = $callingScope;
 
@@ -1970,7 +1995,7 @@ protected function compileChild($child, OutputBlock $out)
                 $this->env->marker = 'mixin';
 
                 $this->pushCallStack($this->env->marker . " " . $name);
-                $this->compileChildrenNoReturn($mixin->children, $out);
+                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent);
                 $this->popCallStack();
 
                 $this->storeEnv = $storeEnv;
@@ -3050,7 +3075,14 @@ protected function joinSelectors($parent, $child, $selfParentSelectors = null)
                         }
 
                         foreach ($parentPart as $pp) {
-                            $newPart[] = (is_array($pp) ? implode($pp) : $pp);
+                            if (is_array($pp)) {
+                                $flatten = [];
+                                array_walk_recursive($pp, function ($a) use (&$flatten) {
+                                    $flatten[] = $a;
+                                });
+                                $pp = implode($flatten);
+                            }
+                            $newPart[] = $pp;
                         }
                     }
                 } else {

From 7bba2627d69fac4151207306383975563faff928 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 29 Apr 2019 17:16:48 +0200
Subject: [PATCH 127/254] https://github.com/leafo/scssphp/issues/644 : the
 previous one was breaking some mixin calls with not elemntary selectors

---
 src/Compiler.php | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 0a0024e9..53f69abe 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1965,18 +1965,7 @@ protected function compileChild($child, OutputBlock $out)
 
                 // Find the parent selectors in the env to be able to know what '&' refers to in the mixin
                 $selfParent = null;
-                $selfParentSelectors = null;
-                $e = $this->env;
-                for (;;) {
-                    if (isset($e->selectors) && $e->selectors) {
-                        $selfParentSelectors = $e->selectors;
-                        break;
-                    }
-                    if (! $e->parent) {
-                        break;
-                    }
-                    $e = $e->parent;
-                }
+                $selfParentSelectors = $this->multiplySelectors($this->env);
                 if ($selfParentSelectors) {
                     $selfParent = new Block();
                     $selfParent->selectors = $selfParentSelectors;
@@ -3036,13 +3025,27 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
 
             foreach ($env->selectors as $selector) {
                 foreach ($parentSelectors as $parent) {
-                    $selectors[] = $this->joinSelectors($parent, $selector, $selfParentSelectors);
+                    if ($selfParentSelectors) {
+                        $previous = null;
+                        foreach ($selfParentSelectors as $selfParent) {
+                            // if no '&' in the selector, each call will give same result, only add once
+                            $s = $this->joinSelectors($parent, $selector, $selfParent);
+                            if ($s !== $previous) {
+                                $selectors[serialize($s)] = $s;
+                            }
+                            $previous = $s;
+                        }
+                    } else {
+                        $s = $this->joinSelectors($parent, $selector);
+                        $selectors[serialize($s)] = $s;
+                    }
                 }
             }
 
             $parentSelectors = $selectors;
         }
 
+        $selectors = array_values($selectors);
         return $selectors;
     }
 

From 1cceeb8a2ae6170d23c27ff9196680e6b9c69767 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 11:22:17 +0200
Subject: [PATCH 128/254] https://github.com/leafo/scssphp/issues/644: when
 propagating selfparent to a child block, update its selectors with the
 current block one

---
 src/Compiler.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 53f69abe..15bab8e6 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1139,7 +1139,16 @@ protected function compileBlock(Block $block)
         if (count($block->children)) {
             $out->selectors = $this->multiplySelectors($env, $block->selfParent);
             // propagate selfParent to the children where they still can be useful
+            $selfParentSelectors = null;
+            if (isset($block->selfParent->selectors)) {
+                $selfParentSelectors = $block->selfParent->selectors;
+                $block->selfParent->selectors = $out->selectors;
+            }
             $this->compileChildrenNoReturn($block->children, $out, $block->selfParent);
+            // and revert for the following childs of the same block
+            if ($selfParentSelectors) {
+                $block->selfParent->selectors = $selfParentSelectors;
+            }
         }
 
         $this->formatter->stripSemicolon($out->lines);

From 274790f394fef71b2913abfa0a92b55dfcd055e8 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 12:47:11 +0200
Subject: [PATCH 129/254] one more test about more nested interpolations

---
 tests/inputs/interpolation.scss          | 14 ++++++++++++++
 tests/outputs/interpolation.css          |  3 +++
 tests/outputs_numbered/interpolation.css |  8 ++++++++
 3 files changed, 25 insertions(+)

diff --git a/tests/inputs/interpolation.scss b/tests/inputs/interpolation.scss
index b6d91d1c..0819a7c6 100644
--- a/tests/inputs/interpolation.scss
+++ b/tests/inputs/interpolation.scss
@@ -118,4 +118,18 @@ div {
 
 .btn-primary {
     @include button-variant(yellow);
+}
+
+@mixin pagination-mixin($border-radius) {
+  .page-item {
+    &:first-child {
+      .page-link {
+        border-radius: $border-radius;
+      }
+    }
+  }
+}
+
+.pagination {
+  @include pagination-mixin(5px);
 }
\ No newline at end of file
diff --git a/tests/outputs/interpolation.css b/tests/outputs/interpolation.css
index b521158d..be302600 100644
--- a/tests/outputs/interpolation.css
+++ b/tests/outputs/interpolation.css
@@ -71,3 +71,6 @@ a.badge {
     border-color: red; }
     .btn-primary:not(.disabled):focus {
       border-width: 3px; }
+
+.pagination .page-item:first-child .page-link {
+  border-radius: 5px; }
diff --git a/tests/outputs_numbered/interpolation.css b/tests/outputs_numbered/interpolation.css
index 261ef049..768df93a 100644
--- a/tests/outputs_numbered/interpolation.css
+++ b/tests/outputs_numbered/interpolation.css
@@ -85,3 +85,11 @@ a.badge {
 /* line 113, inputs/interpolation.scss */
 .btn-primary:not(.disabled):focus {
   border-width: 3px; }
+/* line 133, inputs/interpolation.scss */
+/* line 124, inputs/interpolation.scss */
+
+/* line 125, inputs/interpolation.scss */
+
+/* line 126, inputs/interpolation.scss */
+  .pagination .page-item:first-child .page-link {
+    border-radius: 5px; }

From 4a7b1d529337fbbd9cb604f4406bc6d0a2cc6835 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 12:53:59 +0200
Subject: [PATCH 130/254] https://github.com/leafo/scssphp/issues/644 : when
 compiling an @include fix the parent of children instead of the selfParent,
 so the selectors compilation is standard. Then in a included @at-root, use
 the parent with its selector if any instead of the selfParent with no
 selector

---
 src/Compiler.php | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 15bab8e6..dcfa02d6 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -803,13 +803,18 @@ protected function compileAtRoot(Block $block)
             $block->selector = null;
         }
 
+        $selfParent = $block->selfParent;
+        if (! $block->selfParent->selectors && isset($block->parent) && $block->parent && isset($block->parent->selectors) && $block->parent->selectors) {
+            $selfParent = $block->parent;
+        }
+
         $this->env = $this->filterWithout($envs, $without);
 
         $saveScope   = $this->scope;
         $this->scope = $this->filterScopeWithout($saveScope, $without);
 
         // propagate selfParent to the children where they still can be useful
-        $this->compileChildrenNoReturn($block->children, $this->scope, $block->selfParent);
+        $this->compileChildrenNoReturn($block->children, $this->scope, $selfParent);
 
         $this->scope = $this->completeScope($this->scope, $saveScope);
         $this->scope = $saveScope;
@@ -1973,11 +1978,16 @@ protected function compileChild($child, OutputBlock $out)
                 $this->storeEnv = $this->env;
 
                 // Find the parent selectors in the env to be able to know what '&' refers to in the mixin
-                $selfParent = null;
-                $selfParentSelectors = $this->multiplySelectors($this->env);
-                if ($selfParentSelectors) {
-                    $selfParent = new Block();
-                    $selfParent->selectors = $selfParentSelectors;
+                // and assign this fake parent to childs
+                $parentSelectors = $this->multiplySelectors($this->env);
+                if ($parentSelectors) {
+                    $parent = new Block();
+                    $parent->selectors = $parentSelectors;
+                    foreach ($mixin->children as $k=>$child) {
+                        if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) == 'Leafo\ScssPhp\Block') {
+                            $mixin->children[$k][1]->parent = $parent;
+                        }
+                    }
                 }
 
                 if (isset($content)) {
@@ -1993,7 +2003,7 @@ protected function compileChild($child, OutputBlock $out)
                 $this->env->marker = 'mixin';
 
                 $this->pushCallStack($this->env->marker . " " . $name);
-                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent);
+                $this->compileChildrenNoReturn($mixin->children, $out);
                 $this->popCallStack();
 
                 $this->storeEnv = $storeEnv;

From 56da53a99392c2c35f817bb657b807fa5871c9a4 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 13:41:40 +0200
Subject: [PATCH 131/254] https://github.com/leafo/scssphp/issues/644 :
 propagation of selfParent to T_INCLUDE blocks

---
 src/Compiler.php | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index dcfa02d6..b40cfce3 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1421,6 +1421,9 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
             if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) == 'Leafo\ScssPhp\Block') {
                 $stm[1]->selfParent = $selfParent;
             }
+            if ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
+                $stm['selfParent'] = $selfParent;
+            }
             $ret = $this->compileChild($stm, $out);
 
             if (isset($ret)) {
@@ -1979,13 +1982,19 @@ protected function compileChild($child, OutputBlock $out)
 
                 // Find the parent selectors in the env to be able to know what '&' refers to in the mixin
                 // and assign this fake parent to childs
-                $parentSelectors = $this->multiplySelectors($this->env);
-                if ($parentSelectors) {
-                    $parent = new Block();
-                    $parent->selectors = $parentSelectors;
-                    foreach ($mixin->children as $k=>$child) {
-                        if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) == 'Leafo\ScssPhp\Block') {
-                            $mixin->children[$k][1]->parent = $parent;
+                $selfParent = null;
+                if (isset($child['selfParent']) && isset($child['selfParent']->selectors)) {
+                    $selfParent = $child['selfParent'];
+                }
+                else {
+                    $parentSelectors = $this->multiplySelectors($this->env);
+                    if ($parentSelectors) {
+                        $parent = new Block();
+                        $parent->selectors = $parentSelectors;
+                        foreach ($mixin->children as $k => $child) {
+                            if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) == 'Leafo\ScssPhp\Block') {
+                                $mixin->children[$k][1]->parent = $parent;
+                            }
                         }
                     }
                 }
@@ -2003,7 +2012,7 @@ protected function compileChild($child, OutputBlock $out)
                 $this->env->marker = 'mixin';
 
                 $this->pushCallStack($this->env->marker . " " . $name);
-                $this->compileChildrenNoReturn($mixin->children, $out);
+                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent);
                 $this->popCallStack();
 
                 $this->storeEnv = $storeEnv;

From 7f97c50035315ea64b69b4c0c483a2e3b2ccf00e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 14:36:04 +0200
Subject: [PATCH 132/254] change in spaces/white lines only

---
 tests/outputs/at_root.css          | 95 +++++++++++++-----------------
 tests/outputs_numbered/at_root.css | 17 ++----
 2 files changed, 47 insertions(+), 65 deletions(-)

diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index 0c37a2a7..8ee06e35 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -1,17 +1,16 @@
 .parent-inline-selector {
   color: white; }
-    .child {
-      color: black; }
+  .child {
+    color: black; }
 
 .parent-block {
   color: white; }
-    .child1 {
-      color: green; }
-    .child2 {
-      color: blue; }
-
-.parent-block .step-child {
-  color: black; }
+  .child1 {
+    color: green; }
+  .child2 {
+    color: blue; }
+  .parent-block .step-child {
+    color: black; }
 
 .first {
   color: red; }
@@ -19,12 +18,11 @@
 body .second {
   color: white;
   color: black; }
-      .nested1 {
-        color: blue;
-        color: orange; }
-
-.nested2 {
-  color: yellow; }
+  .nested1 {
+    color: blue;
+    color: orange; }
+    .nested2 {
+      color: yellow; }
 
 .third {
   color: green; }
@@ -32,23 +30,19 @@ body .second {
 @media print {
   .page {
     width: 8in; } }
-
-.page {
-  color: red; }
+  .page {
+    color: red; }
 
 @media (min-width: 300px) {
     .my-widget .inside-mq {
       inside-style: mq; } }
-
-      .my-widget .outside-mq {
-        outside-style: mq; }
-
-.outside-class {
-  color: blue; }
-
-@media (min-width: 300px) {
-        .with-only {
-          color: pink; } }
+    .my-widget .outside-mq {
+      outside-style: mq; }
+    .outside-class {
+      color: blue; }
+  @media (min-width: 300px) {
+      .with-only {
+        color: pink; } }
 
 @media screen and (max-width: 320px) {
   .foo {
@@ -57,21 +51,17 @@ body .second {
 @media screen and (max-width: 320px) {
       .bar {
         padding: 0; } }
-
-.baar {
-  padding: 0; }
-
-    .foo .barr {
-      padding: 0; }
-
+  .baar {
+    padding: 0; }
+  .foo .barr {
+    padding: 0; }
 
 
-.foo .bar {
-  width: 0; }
-
-@supports ( display: flex ) {
-        .baz {
-          height: 0; } }
+  .foo .bar {
+    width: 0; }
+  @supports ( display: flex ) {
+      .baz {
+        height: 0; } }
 
 @media screen and (max-width: 640px) {
         .qux {
@@ -80,32 +70,29 @@ body .second {
 @media screen and (max-width: 640px) {
         .foo .quux {
           padding: 0; } }
-
-.foo .quix {
-  padding: 0; }
+  .foo .quix {
+    padding: 0; }
 
 .test .test2 {
   padding: 0px; }
-      tbody {
-        padding: 10px; }
+  tbody {
+    padding: 10px; }
 
 a.badge {
   text-decoration: none; }
 
-
 .badge-primary {
   background-color: blue; }
-    a.badge-primary:focus, a.badge-primary.focus {
-      outline: 0; }
+  a.badge-primary:focus, a.badge-primary.focus {
+    outline: 0; }
 
 .badge-secondary {
   background-color: yellow; }
-    a.badge-secondary:focus, a.badge-secondary.focus {
-      outline: 0; }
+  a.badge-secondary:focus, a.badge-secondary.focus {
+    outline: 0; }
 
 .table-hover tbody tr:hover, .table2#id tbody tr:hover {
   color: #ddd;
   background-color: #eee; }
-      .table-hover tbody tr.foo, .table2#id tbody tr.foo {
-        color: red; }
-
+  .table-hover tbody tr.foo, .table2#id tbody tr.foo {
+    color: red; }
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index 00510077..5487136a 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -4,7 +4,6 @@
 /* line 3, inputs/at_root.scss */
 .child {
   color: black; }
-
 /* line 6, inputs/at_root.scss */
 .parent-block {
   color: white; }
@@ -14,7 +13,6 @@
 /* line 10, inputs/at_root.scss */
 .child2 {
   color: blue; }
-
 /* line 12, inputs/at_root.scss */
 .parent-block .step-child {
   color: black; }
@@ -31,7 +29,6 @@ body .second {
 .nested1 {
   color: blue;
   color: orange; }
-
 /* line 26, inputs/at_root.scss */
 .nested2 {
   color: yellow; }
@@ -112,28 +109,27 @@ padding: 0; }
 /* line 139, inputs/at_root.scss */
 tbody {
   padding: 10px; }
-
 /* line 151, inputs/at_root.scss */
 /* line 152, inputs/at_root.scss */
-a.badge {
-text-decoration: none; }
 
+a.badge {
+  text-decoration: none; }
 /* line 168, inputs/at_root.scss */
 .badge-primary {
   background-color: blue; }
 /* line 160, inputs/at_root.scss */
 /* line 161, inputs/at_root.scss */
-  a.badge-primary:focus, a.badge-primary.focus {
-    outline: 0; }
 
+a.badge-primary:focus, a.badge-primary.focus {
+  outline: 0; }
 /* line 171, inputs/at_root.scss */
 .badge-secondary {
   background-color: yellow; }
 /* line 160, inputs/at_root.scss */
 /* line 161, inputs/at_root.scss */
-  a.badge-secondary:focus, a.badge-secondary.focus {
-    outline: 0; }
 
+a.badge-secondary:focus, a.badge-secondary.focus {
+  outline: 0; }
 /* line 183, inputs/at_root.scss */
 /* line 184, inputs/at_root.scss */
 
@@ -145,4 +141,3 @@ text-decoration: none; }
 /* line 178, inputs/at_root.scss */
 .table-hover tbody tr.foo, .table2#id tbody tr.foo {
   color: red; }
-

From 67c741b7c3c51578565660efcfdd0d4015e38c09 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 14:38:28 +0200
Subject: [PATCH 133/254] one more test about self propagation and previous
 media poisoning on @at-root

---
 tests/inputs/at_root.scss          | 28 +++++++++++++++++++++++++++-
 tests/outputs/at_root.css          |  8 ++++++++
 tests/outputs_numbered/at_root.css | 12 ++++++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/tests/inputs/at_root.scss b/tests/inputs/at_root.scss
index 95dd83da..2096fb1c 100644
--- a/tests/inputs/at_root.scss
+++ b/tests/inputs/at_root.scss
@@ -187,4 +187,30 @@ $table-padding: 10px !default;
       background-color: #eee;
     }
   }
-}
\ No newline at end of file
+}
+
+// self propagation to @include and previous media poisoning in @at-root
+@mixin transition($transition...) {
+    @media (prefers-reduced-motion: reduce) {
+      transition: none;
+    }
+}
+
+@mixin hover-focus {
+  &:hover,
+  &:focus {
+    @content;
+  }
+}
+
+.badge {
+  display: inline-block;
+  @include transition(none);
+
+  @at-root a#{&} {
+    @include hover-focus {
+      text-decoration: none;
+    }
+  }
+
+}
diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index 8ee06e35..25be47ff 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -96,3 +96,11 @@ a.badge {
   background-color: #eee; }
   .table-hover tbody tr.foo, .table2#id tbody tr.foo {
     color: red; }
+
+.badge {
+  display: inline-block; }
+  @media (prefers-reduced-motion: reduce) {
+  .badge {
+    transition: none; } }
+  a.badge:hover, a.badge:focus {
+    text-decoration: none; }
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index 5487136a..d9657c4b 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -141,3 +141,15 @@ a.badge-secondary:focus, a.badge-secondary.focus {
 /* line 178, inputs/at_root.scss */
 .table-hover tbody tr.foo, .table2#id tbody tr.foo {
   color: red; }
+/* line 206, inputs/at_root.scss */
+.badge {
+  display: inline-block; }
+
+@media (prefers-reduced-motion: reduce) {
+    .badge {
+      transition: none; } }
+/* line 210, inputs/at_root.scss */
+/* line 200, inputs/at_root.scss */
+
+a.badge:hover, a.badge:focus {
+  text-decoration: none; }

From 2145c41208a541b0747f082576f9c00fa1e71029 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 14:40:40 +0200
Subject: [PATCH 134/254] when the scope is already at the root, nothing to do
 in a @at-root block for the new scope

---
 src/Compiler.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index b40cfce3..7653a7aa 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -833,6 +833,10 @@ protected function filterScopeWithout($scope, $without)
     {
         $filteredScopes = [];
 
+        if ($scope->type === TYPE::T_ROOT) {
+            return $scope;
+        }
+
         // start from the root
         while ($scope->parent && $scope->parent->type !== TYPE::T_ROOT) {
             $scope = $scope->parent;

From 08210ae5fe5030b4fd77cfe4d14e029ef6344785 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 14:51:53 +0200
Subject: [PATCH 135/254] one more test to check that a mixin state is not
 spoiled by a previous @at-root call

---
 tests/inputs/at_root.scss          | 6 ++++++
 tests/outputs/at_root.css          | 3 +++
 tests/outputs_numbered/at_root.css | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/tests/inputs/at_root.scss b/tests/inputs/at_root.scss
index 2096fb1c..86d3f559 100644
--- a/tests/inputs/at_root.scss
+++ b/tests/inputs/at_root.scss
@@ -214,3 +214,9 @@ $table-padding: 10px !default;
   }
 
 }
+// check that the hover-focus has not been spoiled by previous @at-root call
+.btn {
+  @include hover-focus {
+    text-decoration: none;
+  }
+}
diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index 25be47ff..c80f3594 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -104,3 +104,6 @@ a.badge {
     transition: none; } }
   a.badge:hover, a.badge:focus {
     text-decoration: none; }
+
+.btn:hover, .btn:focus {
+  text-decoration: none; }
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index d9657c4b..c170305c 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -153,3 +153,8 @@ a.badge-secondary:focus, a.badge-secondary.focus {
 
 a.badge:hover, a.badge:focus {
   text-decoration: none; }
+/* line 218, inputs/at_root.scss */
+/* line 200, inputs/at_root.scss */
+
+.btn:hover, .btn:focus {
+  text-decoration: none; }

From d2d45acc5ab45673720fe451dad2fda2f8d29b1e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 14:52:41 +0200
Subject: [PATCH 136/254] restore child state after compilation when it's
 selfParent has been altered

---
 src/Compiler.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 7653a7aa..7d1ecd5a 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1424,11 +1424,16 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
         foreach ($stms as $stm) {
             if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) == 'Leafo\ScssPhp\Block') {
                 $stm[1]->selfParent = $selfParent;
+                $ret = $this->compileChild($stm, $out);
+                $stm[1]->selfParent = null;
             }
-            if ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
+            elseif ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
                 $stm['selfParent'] = $selfParent;
+                $ret = $this->compileChild($stm, $out);
+                unset($stm['selfParent']);
+            } else {
+                $ret = $this->compileChild($stm, $out);
             }
-            $ret = $this->compileChild($stm, $out);
 
             if (isset($ret)) {
                 $this->throwError('@return may only be used within a function');

From 2ede0e36af503a0281c20ba81ed22f9f9d16fa19 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 19:30:56 +0200
Subject: [PATCH 137/254] Fix https://github.com/leafo/scssphp/issues/599 :
 scope of local variables and updating the test about that point

---
 src/Compiler.php                     | 2 +-
 tests/outputs/variables.css          | 2 +-
 tests/outputs_numbered/variables.css | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 7d1ecd5a..5ad46f2e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1745,7 +1745,7 @@ protected function compileChild($child, OutputBlock $out)
                         || $result === static::$null);
 
                     if (! $isDefault || $shouldSet) {
-                        $this->set($name[1], $this->reduce($value), false, null, $value);
+                        $this->set($name[1], $this->reduce($value), true, null, $value);
                     }
                     break;
                 }
diff --git a/tests/outputs/variables.css b/tests/outputs/variables.css
index 7112efae..430efc14 100644
--- a/tests/outputs/variables.css
+++ b/tests/outputs/variables.css
@@ -12,7 +12,7 @@ pre {
   color: blue; }
 
 del {
-  color: red; }
+  color: blue; }
   del div pre {
     color: red; }
 
diff --git a/tests/outputs_numbered/variables.css b/tests/outputs_numbered/variables.css
index 77153c44..4d33c91c 100644
--- a/tests/outputs_numbered/variables.css
+++ b/tests/outputs_numbered/variables.css
@@ -13,7 +13,7 @@ pre {
   color: blue; }
 /* line 31, inputs/variables.scss */
 del {
-  color: red; }
+  color: blue; }
 /* line 34, inputs/variables.scss */
 /* line 36, inputs/variables.scss */
   del div pre {

From 8cd16b233309df0aba0c24b4b7697deff26d3f0c Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 1 May 2019 20:23:43 +0200
Subject: [PATCH 138/254] Fix error execution in PHP 7.2

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 5ad46f2e..ad4f192f 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -891,7 +891,7 @@ protected function filterScopeWithout($scope, $without)
      */
     protected function completeScope($scope, $previousScope)
     {
-        if (! $scope->type && ! count($scope->selectors) && count($scope->lines)) {
+        if (! $scope->type && (! $scope->selectors || ! count($scope->selectors)) && count($scope->lines)) {
             $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth);
         }
         if ($scope->children) {

From a5716f819a4c6438914794a26f958cb73ac44c66 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 2 May 2019 09:27:15 +0200
Subject: [PATCH 139/254] Version 0.8.0 as we pushed a lot of improvments and
 fixes and now includes BS4 & Foundation in test case

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 5b15e612..8a530296 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.7.9';
+    const VERSION = 'v0.8.0';
 }

From 71720fac3374e61cdf3cf4acc724ec2a47031aff Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 2 May 2019 14:01:22 -0400
Subject: [PATCH 140/254] Misc code cleanup

---
 src/Block.php           |  1 +
 src/Compiler.php        | 67 +++++++++++++++++++++++++++++++++--------
 src/Parser.php          | 31 ++++++++-----------
 tests/FrameworkTest.php |  6 ++--
 tests/ServerTest.php    |  4 +--
 5 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/src/Block.php b/src/Block.php
index 2edbc8a7..41abf01a 100644
--- a/src/Block.php
+++ b/src/Block.php
@@ -62,6 +62,7 @@ class Block
      * @var array
      */
     public $children;
+
     /**
      * @var \Leafo\ScssPhp\Block
      */
diff --git a/src/Compiler.php b/src/Compiler.php
index ad4f192f..a6014c0a 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -466,6 +466,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
 
                     for ($l = count($tempReplacement) - 1; $l >= 0; $l--) {
                         $slice = [];
+
                         foreach ($tempReplacement[$l] as $chunk) {
                             if (!in_array($chunk, $slice)) {
                                 $slice[] = $chunk;
@@ -610,7 +611,6 @@ protected function matchExtendsSingle($rawSingle, &$outOrigin)
         return $found;
     }
 
-
     /**
      * Extract a relationship from the fragment.
      *
@@ -620,6 +620,7 @@ protected function matchExtendsSingle($rawSingle, &$outOrigin)
      * the rest.
      *
      * @param array $fragment The selector fragment maybe ending with a direction relationship combinator.
+     *
      * @return array The selector without the relationship fragment if any, the relationship fragment.
      */
     protected function extractRelationshipFromFragment(array $fragment)
@@ -804,6 +805,7 @@ protected function compileAtRoot(Block $block)
         }
 
         $selfParent = $block->selfParent;
+
         if (! $block->selfParent->selectors && isset($block->parent) && $block->parent && isset($block->parent->selectors) && $block->parent->selectors) {
             $selfParent = $block->parent;
         }
@@ -825,8 +827,10 @@ protected function compileAtRoot(Block $block)
 
     /**
      * Filter at-root scope depending of with/without option
-     * @param $scope
-     * @param $without
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope
+     * @param mixed                                $without
+     *
      * @return mixed
      */
     protected function filterScopeWithout($scope, $without)
@@ -846,14 +850,17 @@ protected function filterScopeWithout($scope, $without)
             if (! $scope) {
                 break;
             }
+
             if (! $this->isWithout($without, $scope)) {
                 $s = clone $scope;
                 $s->children = [];
                 $s->lines = [];
                 $s->parent = null;
+
                 if ($s->type !== Type::T_MEDIA && $s->type !== Type::T_DIRECTIVE) {
                     $s->selectors = [];
                 }
+
                 $filteredScopes[] = $s;
             }
 
@@ -863,15 +870,18 @@ protected function filterScopeWithout($scope, $without)
                 $scope = null;
             }
         }
+
         if (!count($filteredScopes)) {
             return $this->rootBlock;
         }
 
         $newScope = array_shift($filteredScopes);
         $newScope->parent = $this->rootBlock;
+
         $this->rootBlock->children[] = $newScope;
 
         $p = &$newScope;
+
         while (count($filteredScopes)) {
             $s = array_shift($filteredScopes);
             $s->parent = $p;
@@ -885,8 +895,10 @@ protected function filterScopeWithout($scope, $without)
     /**
      * found missing selector from a at-root compilation in the previous scope
      * (if at-root is just enclosing a property, the selector is in the parent tree)
-     * @param $scope
-     * @param $previousScope
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $previousScope
+     *
      * @return mixed
      */
     protected function completeScope($scope, $previousScope)
@@ -894,6 +906,7 @@ protected function completeScope($scope, $previousScope)
         if (! $scope->type && (! $scope->selectors || ! count($scope->selectors)) && count($scope->lines)) {
             $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth);
         }
+
         if ($scope->children) {
             foreach ($scope->children as $k => $c) {
                 $scope->children[$k] = $this->completeScope($c, $previousScope);
@@ -905,8 +918,10 @@ protected function completeScope($scope, $previousScope)
 
     /**
      * Find a selector by the depth node in the scope
-     * @param $scope
-     * @param $depth
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $scope
+     * @param integer                              $depth
+     *
      * @return array
      */
     protected function findScopeSelectors($scope, $depth)
@@ -914,6 +929,7 @@ protected function findScopeSelectors($scope, $depth)
         if ($scope->depth === $depth && $scope->selectors) {
             return $scope->selectors;
         }
+
         if ($scope->children) {
             foreach (array_reverse($scope->children) as $c) {
                 if ($s = $this->findScopeSelectors($c, $depth)) {
@@ -921,6 +937,7 @@ protected function findScopeSelectors($scope, $depth)
                 }
             }
         }
+
         return [];
     }
 
@@ -1016,11 +1033,13 @@ protected function isWithout($without, $block)
                 if (isset($block->name) && $block->name === 'supports') {
                     return ($without & static::WITH_SUPPORTS) ? true : false;
                 }
+
                 if (isset($block->selectors) && strpos(serialize($block->selectors), '@supports') !== false) {
                     return ($without & static::WITH_SUPPORTS) ? true : false;
                 }
             }
         }
+
         if ((($without & static::WITH_RULE) && isset($block->selectors))) {
             return true;
         }
@@ -1147,13 +1166,17 @@ protected function compileBlock(Block $block)
 
         if (count($block->children)) {
             $out->selectors = $this->multiplySelectors($env, $block->selfParent);
+
             // propagate selfParent to the children where they still can be useful
             $selfParentSelectors = null;
+
             if (isset($block->selfParent->selectors)) {
                 $selfParentSelectors = $block->selfParent->selectors;
                 $block->selfParent->selectors = $out->selectors;
             }
+
             $this->compileChildrenNoReturn($block->children, $out, $block->selfParent);
+
             // and revert for the following childs of the same block
             if ($selfParentSelectors) {
                 $block->selfParent->selectors = $selfParentSelectors;
@@ -1174,6 +1197,7 @@ protected function compileComment($block)
     {
         $out = $this->makeOutputBlock(Type::T_COMMENT);
         $out->lines[] = $block[1];
+
         $this->scope->children[] = $out;
     }
 
@@ -1406,6 +1430,7 @@ protected function compileChildren($stms, OutputBlock $out)
                 return $ret;
             }
         }
+
         return null;
     }
 
@@ -1420,14 +1445,12 @@ protected function compileChildren($stms, OutputBlock $out)
      */
     protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null)
     {
-
         foreach ($stms as $stm) {
             if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) == 'Leafo\ScssPhp\Block') {
                 $stm[1]->selfParent = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 $stm[1]->selfParent = null;
-            }
-            elseif ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
+            } elseif ($selfParent && $stm[0] === TYPE::T_INCLUDE) {
                 $stm['selfParent'] = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 unset($stm['selfParent']);
@@ -1681,6 +1704,7 @@ protected function compileChild($child, OutputBlock $out)
         } elseif (! empty($out->sourceLine) and ! empty($out->sourceName)) {
             $this->sourceLine = $out->sourceLine;
             $this->sourceIndex = array_search($out->sourceName, $this->sourceNames);
+
             if ($this->sourceIndex === false) {
                 $this->sourceIndex = null;
             }
@@ -1761,6 +1785,7 @@ protected function compileChild($child, OutputBlock $out)
                     }
 
                     $fontValue=&$value;
+
                     if ($value[0] === Type::T_LIST && $value[1]==',') {
                         // this is the case if more than one font is given: example: "font: 400 1em/1.3 arial,helvetica"
                         // we need to handle the first list element
@@ -1992,14 +2017,16 @@ protected function compileChild($child, OutputBlock $out)
                 // Find the parent selectors in the env to be able to know what '&' refers to in the mixin
                 // and assign this fake parent to childs
                 $selfParent = null;
+
                 if (isset($child['selfParent']) && isset($child['selfParent']->selectors)) {
                     $selfParent = $child['selfParent'];
-                }
-                else {
+                } else {
                     $parentSelectors = $this->multiplySelectors($this->env);
+
                     if ($parentSelectors) {
                         $parent = new Block();
                         $parent->selectors = $parentSelectors;
+
                         foreach ($mixin->children as $k => $child) {
                             if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) == 'Leafo\ScssPhp\Block') {
                                 $mixin->children[$k][1]->parent = $parent;
@@ -2344,6 +2371,7 @@ protected function reduce($value, $inExp = false)
             case Type::T_SELF:
                 $selfSelector = $this->multiplySelectors($this->env);
                 $selfSelector = $this->collapseSelectors($selfSelector);
+
                 return [Type::T_STRING, '', [$selfSelector]];
 
             default:
@@ -2532,6 +2560,7 @@ protected function opAdd($left, $right)
 
             return $strRight;
         }
+
         return null;
     }
 
@@ -3049,6 +3078,7 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
         $parentSelectors = [[]];
 
         $selfParentSelectors = null;
+
         if (!is_null($selfParent) and $selfParent->selectors) {
             $selfParentSelectors = $this->evalSelectors($selfParent->selectors);
         }
@@ -3064,12 +3094,15 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
                 foreach ($parentSelectors as $parent) {
                     if ($selfParentSelectors) {
                         $previous = null;
+
                         foreach ($selfParentSelectors as $selfParent) {
                             // if no '&' in the selector, each call will give same result, only add once
                             $s = $this->joinSelectors($parent, $selector, $selfParent);
+
                             if ($s !== $previous) {
                                 $selectors[serialize($s)] = $s;
                             }
+
                             $previous = $s;
                         }
                     } else {
@@ -3083,6 +3116,7 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
         }
 
         $selectors = array_values($selectors);
+
         return $selectors;
     }
 
@@ -3092,6 +3126,7 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
      * @param array $parent
      * @param array $child
      * @param array $selfParentSelectors
+
      * @return array
      */
     protected function joinSelectors($parent, $child, $selfParentSelectors = null)
@@ -3105,9 +3140,11 @@ protected function joinSelectors($parent, $child, $selfParentSelectors = null)
             foreach ($part as $p) {
                 if ($p === static::$selfSelector) {
                     $setSelf = true;
+
                     if (is_null($selfParentSelectors)) {
                         $selfParentSelectors = $parent;
                     }
+
                     foreach ($selfParentSelectors as $i => $parentPart) {
                         if ($i > 0) {
                             $out[] = $newPart;
@@ -3305,6 +3342,7 @@ protected function setExisting($name, $value, Environment $env, $valueUnreduced
         }
 
         $env->store[$name] = $value;
+
         if ($valueUnreduced) {
             $env->storeUnreduced[$name] = $valueUnreduced;
         }
@@ -3321,6 +3359,7 @@ protected function setExisting($name, $value, Environment $env, $valueUnreduced
     protected function setRaw($name, $value, Environment $env, $valueUnreduced = null)
     {
         $env->store[$name] = $value;
+
         if ($valueUnreduced) {
             $env->storeUnreduced[$name] = $valueUnreduced;
         }
@@ -3355,6 +3394,7 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
                 if ($unreduced && isset($env->storeUnreduced[$normalizedName])) {
                     return $env->storeUnreduced[$normalizedName];
                 }
+
                 return $env->store[$normalizedName];
             }
 
@@ -3712,6 +3752,7 @@ public function setEncoding($encoding)
     public function setIgnoreErrors($ignoreErrors)
     {
         $this->ignoreErrors = $ignoreErrors;
+
         return $this;
     }
 
@@ -3737,9 +3778,11 @@ public function throwError($msg)
         $line = $this->sourceLine;
         $loc = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] . " on line $line" : "line: $line";
         $msg = "$msg: $loc";
+
         if ($this->callStack) {
             $msg .= "\nCall Stack:\n";
             $ncall = 0;
+
             foreach (array_reverse($this->callStack) as $call) {
                 $msg .= "#" . $ncall++ . " " . $call['n'] . " ";
                 $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]]) ? $this->sourceNames[$call[Parser::SOURCE_INDEX]] : '(unknown file)');
diff --git a/src/Parser.php b/src/Parser.php
index 44747643..c7ef2558 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -418,7 +418,6 @@ protected function parseChunk()
 
             $this->seek($s);
 
-
             if ($this->literal('@return', 7) && ($this->valueList($retVal) || true) && $this->end()) {
                 $this->append([Type::T_RETURN, isset($retVal) ? $retVal : [Type::T_NULL]], $s);
 
@@ -769,9 +768,11 @@ protected function popBlock()
         }
 
         $this->env = $block->parent;
+
         unset($block->parent);
 
         $comments = $block->comments;
+
         if ($comments) {
             $this->env->comments = $comments;
             unset($block->comments);
@@ -865,7 +866,6 @@ protected function matchString(&$m, $delim)
      */
     protected function match($regex, &$out, $eatWhitespace = null)
     {
-
         $r = '/' . $regex . '/' . $this->patternModifiers;
 
         if (! preg_match($r, $this->buffer, $out, null, $this->count)) {
@@ -885,7 +885,6 @@ protected function match($regex, &$out, $eatWhitespace = null)
         return true;
     }
 
-
     /**
      * Match a single string
      *
@@ -896,7 +895,6 @@ protected function match($regex, &$out, $eatWhitespace = null)
      */
     protected function matchChar($char, $eatWhitespace = null)
     {
-
         if (! isset($this->buffer[$this->count]) || $this->buffer[$this->count] !== $char) {
             return false;
         }
@@ -913,7 +911,6 @@ protected function matchChar($char, $eatWhitespace = null)
         return true;
     }
 
-
     /**
      * Match literal string
      *
@@ -942,7 +939,6 @@ protected function literal($what, $len, $eatWhitespace = null)
         return true;
     }
 
-
     /**
      * Match some whitespace
      *
@@ -1204,6 +1200,7 @@ protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
         $s = $this->count;
         $items = [];
         $value = null;
+
         while ($this->$parseItem($value)) {
             $items[] = $value;
 
@@ -1329,7 +1326,6 @@ protected function expHelper($lhs, $minP)
      */
     protected function value(&$out)
     {
-
         if (! isset($this->buffer[$this->count])) {
             return false;
         }
@@ -1356,6 +1352,7 @@ protected function value(&$out)
         if ($char === 'n' && $this->literal('not', 3, false)) {
             if ($this->whitespace() && $this->value($inner)) {
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+
                 return true;
             }
 
@@ -1363,6 +1360,7 @@ protected function value(&$out)
 
             if ($this->parenValue($inner)) {
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
+
                 return true;
             }
 
@@ -1372,18 +1370,21 @@ protected function value(&$out)
         // addition
         if ($char === '+') {
             $this->count++;
+
             if ($this->value($inner)) {
                 $out = [Type::T_UNARY, '+', $inner, $this->inParens];
                 return true;
             }
+
             $this->count--;
+
             return false;
         }
 
-
         // negation
         if ($char === '-') {
             $this->count++;
+
             if ($this->variable($inner) || $this->unit($inner) || $this->parenValue($inner)) {
                 $out = [Type::T_UNARY, '-', $inner, $this->inParens];
                 return true;
@@ -1419,7 +1420,6 @@ protected function value(&$out)
             return true;
         }
 
-
         if ($this->unit($out)) {
             return true;
         }
@@ -2194,7 +2194,6 @@ protected function selectorSingle(&$out)
                 break;
             }
 
-
             //self
             switch ($char) {
                 case '&':
@@ -2211,20 +2210,20 @@ protected function selectorSingle(&$out)
                     continue 2;
             }
 
-
             if ($char === '\\' && $this->match('\\\\\S', $m)) {
                 $parts[] = $m[0];
                 continue;
             }
 
-
             if ($char === '%') {
                 $this->count++;
+
                 if ($this->placeholder($placeholder)) {
                     $parts[] = '%';
                     $parts[] = $placeholder;
                     continue;
                 }
+
                 break;
             }
 
@@ -2239,7 +2238,6 @@ protected function selectorSingle(&$out)
                 continue;
             }
 
-
             // a pseudo selector
             if ($char === ':') {
                 if ($this->buffer[$this->count + 1] === ':') {
@@ -2249,6 +2247,7 @@ protected function selectorSingle(&$out)
                     $this->count++;
                     $part = ':';
                 }
+
                 if ($this->mixedKeyword($nameParts)) {
                     $parts[] = $part;
 
@@ -2277,10 +2276,8 @@ protected function selectorSingle(&$out)
                 }
             }
 
-
             $this->seek($s);
 
-
             // attribute selector
             if ($char === '[' &&
               $this->matchChar('[') &&
@@ -2300,7 +2297,6 @@ protected function selectorSingle(&$out)
 
             $this->seek($s);
 
-
             // for keyframes
             if ($this->unit($unit)) {
                 $parts[] = $unit;
@@ -2312,9 +2308,6 @@ protected function selectorSingle(&$out)
                 continue;
             }
 
-
-
-
             break;
         }
 
diff --git a/tests/FrameworkTest.php b/tests/FrameworkTest.php
index 59d86621..3be524dc 100644
--- a/tests/FrameworkTest.php
+++ b/tests/FrameworkTest.php
@@ -56,10 +56,11 @@ public function testFramework($frameworkVerion, $inputdirectory, $inputfiles)
     {
         $this->scss->addImportPath($inputdirectory);
 
-        $input = file_get_contents($inputdirectory.$inputfiles);
+        $input = file_get_contents($inputdirectory . $inputfiles);
         
         //Test if no exeption are raised for the given framwork
         $e = null;
+
         try {
             $this->scss->compile($input, $inputfiles);
         } catch (Exception $e) {
@@ -69,7 +70,8 @@ public function testFramework($frameworkVerion, $inputdirectory, $inputfiles)
         $this->assertNull($e);
     }
 
-    public function frameworkProvider(){
+    public function frameworkProvider()
+    {
         return self::$frameworks;
     }
 }
diff --git a/tests/ServerTest.php b/tests/ServerTest.php
index 290d8fbf..c65f00ac 100644
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -11,8 +11,6 @@
 
 namespace Leafo\ScssPhp\Tests;
 
-require_once __DIR__ . '/../example/Server.php';
-
 use Leafo\ScssPhp\Server;
 
 /**
@@ -24,6 +22,8 @@ class ServerTest extends \PHPUnit_Framework_TestCase
 {
     public function testCheckedCachedCompile()
     {
+        require_once __DIR__ . '/../example/Server.php';
+
         if (! file_exists(__DIR__ . '/inputs/scss_cache')) {
             mkdir(__DIR__ . '/inputs/scss_cache', 0755);
         }

From 191760aa65ac2a1aa1af8f30407f99d881a05df5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 16:51:06 +0200
Subject: [PATCH 141/254] Simple test case for
 https://github.com/leafo/scssphp/issues/660

---
 tests/inputs/extends.scss          | 13 +++++++++++++
 tests/outputs/extends.css          |  3 +++
 tests/outputs_numbered/extends.css |  7 +++++++
 3 files changed, 23 insertions(+)

diff --git a/tests/inputs/extends.scss b/tests/inputs/extends.scss
index f9ea2a30..609d0292 100644
--- a/tests/inputs/extends.scss
+++ b/tests/inputs/extends.scss
@@ -375,3 +375,16 @@ embed.bar {
         @extend .popup
     }
 }
+
+.class1:not(:last-child) {
+	color:red;
+}
+
+.class2:not(.foo) {
+	@extend .class1;
+}
+
+.class3:not(:last-child) {
+	@extend .class1;
+}
+
diff --git a/tests/outputs/extends.css b/tests/outputs/extends.css
index 6a8dd855..15a80f3b 100644
--- a/tests/outputs/extends.css
+++ b/tests/outputs/extends.css
@@ -163,3 +163,6 @@ div.popup, .prepend div.foo {
 
 .before span.popup .after {
   color: green; }
+
+.class1:not(:last-child), .class2:not(.foo):not(:last-child), .class3:not(:last-child) {
+  color: red; }
diff --git a/tests/outputs_numbered/extends.css b/tests/outputs_numbered/extends.css
index aa4c20ac..0a81b240 100644
--- a/tests/outputs_numbered/extends.css
+++ b/tests/outputs_numbered/extends.css
@@ -262,3 +262,10 @@ div.popup, .prepend div.foo {
 /* line 372, inputs/extends.scss */
 
 /* line 373, inputs/extends.scss */
+
+/* line 379, inputs/extends.scss */
+
+.class1:not(:last-child), .class2:not(.foo):not(:last-child), .class3:not(:last-child) {
+  color: red; }
+/* line 383, inputs/extends.scss */
+/* line 387, inputs/extends.scss */

From a8a759ca382cfb4dc1dfb7ca93a694431f68ecbb Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 16:56:14 +0200
Subject: [PATCH 142/254] Fix https://github.com/leafo/scssphp/issues/660 :
 glue :not(), :nth-child() and other selector functions before @extend
 compilation

---
 src/Compiler.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index a6014c0a..f65fdaa2 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -430,6 +430,32 @@ protected function flattenSelectors(OutputBlock $block, $parentKey = null)
         }
     }
 
+    /**
+     * glue parts of :not( or :nth-child( ... that are in general splitted in selectors parts
+     * @param array $parts
+     * @return array
+     */
+    protected function glueFunctionSelectors($parts)
+    {
+        $new = [];
+        foreach ($parts as $part) {
+            if (is_array($part)) {
+                $part = $this->glueFunctionSelectors($part);
+                $new[] = $part;
+            } else {
+                // a selector part finishing with a ) is the last part of a :not( or :nth-child(
+                // and need to be joined to this
+                if (count($new) && is_string($new[count($new) - 1])
+                  && strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false) {
+                    $new[count($new) - 1] .= $part;
+                } else {
+                    $new[] = $part;
+                }
+            }
+        }
+        return $new;
+    }
+
     /**
      * Match extends
      *
@@ -440,6 +466,8 @@ protected function flattenSelectors(OutputBlock $block, $parentKey = null)
      */
     protected function matchExtends($selector, &$out, $from = 0, $initial = true)
     {
+
+        $selector = $this->glueFunctionSelectors($selector);
         foreach ($selector as $i => $part) {
             if ($i < $from) {
                 continue;
@@ -570,6 +598,7 @@ protected function matchExtendsSingle($rawSingle, &$outOrigin)
 
         foreach ($counts as $idx => $count) {
             list($target, $origin, /* $block */) = $this->extends[$idx];
+            $origin = $this->glueFunctionSelectors($origin);
 
             // check count
             if ($count !== count($target)) {

From 712842478144684135efc3e20172a19eefe36414 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 17:30:05 +0200
Subject: [PATCH 143/254] Extend test case for
 https://github.com/leafo/scssphp/issues/659

---
 tests/inputs/directives.scss          | 1 +
 tests/outputs/directives.css          | 3 ++-
 tests/outputs_numbered/directives.css | 5 +++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/inputs/directives.scss b/tests/inputs/directives.scss
index 46a5ab50..8214a170 100644
--- a/tests/inputs/directives.scss
+++ b/tests/inputs/directives.scss
@@ -164,6 +164,7 @@ div {
 .sticky-top {
   @supports (position: sticky) {
     position: sticky;
+    top: 0;
   }
 }
 
diff --git a/tests/outputs/directives.css b/tests/outputs/directives.css
index 6bbec3ee..e253dae8 100644
--- a/tests/outputs/directives.css
+++ b/tests/outputs/directives.css
@@ -108,7 +108,8 @@ div {
 
 @supports (position: sticky) {
     .sticky-top {
-      position: sticky; } }
+      position: sticky;
+      top: 0; } }
 
 @supports (position: sticky) {
   .sticky-top2 {
diff --git a/tests/outputs_numbered/directives.css b/tests/outputs_numbered/directives.css
index 79b61cc1..510945aa 100644
--- a/tests/outputs_numbered/directives.css
+++ b/tests/outputs_numbered/directives.css
@@ -125,9 +125,10 @@ to {
 /* line 164, inputs/directives.scss */
 @supports (position: sticky) {
     .sticky-top {
-      position: sticky; } }
+      position: sticky;
+      top: 0; } }
 
 @supports (position: sticky) {
-/* line 171, inputs/directives.scss */
+/* line 172, inputs/directives.scss */
 .sticky-top2 {
   position: sticky; } }

From 3d3a61a3edd0421e78d6956c79e72e5e33ee67dc Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 17:33:38 +0200
Subject: [PATCH 144/254] Fix https://github.com/leafo/scssphp/issues/659 :
 wrap successive inline assign in only one block when compiling nested blocks

---
 src/Compiler.php | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index a6014c0a..960a4a66 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1089,20 +1089,30 @@ protected function compileNestedBlock(Block $block, $selectors)
         $this->scope->parent->children[] = $this->scope;
 
         // wrap assign children in a block
+        // (siblings children in the same block)
+        $previousWrap = null;
         foreach ($block->children as $k => $child) {
             if ($child[0] === Type::T_ASSIGN) {
-                $wrapped = new Block;
-                $wrapped->sourceName   = $block->sourceName;
-                $wrapped->sourceIndex  = $block->sourceIndex;
-                $wrapped->sourceLine   = $block->sourceLine;
-                $wrapped->sourceColumn = $block->sourceColumn;
-                $wrapped->selectors    = [];
-                $wrapped->comments     = [];
-                $wrapped->parent       = $block;
-                $wrapped->children     = [$child];
-                $wrapped->selfParent   = $block->selfParent;
-
-                $block->children[$k] = [Type::T_BLOCK, $wrapped];
+                if (! is_null($previousWrap)) {
+                    $block->children[$previousWrap][1]->children[] = $child;
+                    unset($block->children[$k]);
+                } else {
+                    $wrapped = new Block;
+                    $wrapped->sourceName   = $block->sourceName;
+                    $wrapped->sourceIndex  = $block->sourceIndex;
+                    $wrapped->sourceLine   = $block->sourceLine;
+                    $wrapped->sourceColumn = $block->sourceColumn;
+                    $wrapped->selectors    = [];
+                    $wrapped->comments     = [];
+                    $wrapped->parent       = $block;
+                    $wrapped->children     = [$child];
+                    $wrapped->selfParent   = $block->selfParent;
+
+                    $block->children[$k] = [Type::T_BLOCK, $wrapped];
+                    $previousWrap = $k;
+                }
+            } else {
+                $previousWrap = null;
             }
         }
 

From ab12da06fb44ff2690e88e4bc1baf61a52e26aff Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 17:34:07 +0200
Subject: [PATCH 145/254] less blank lines in the output tests because wrapping
 in one block only

---
 tests/outputs/directives.css          | 1 -
 tests/outputs/scss_css.css            | 9 ---------
 tests/outputs_numbered/directives.css | 1 -
 tests/outputs_numbered/scss_css.css   | 9 ---------
 4 files changed, 20 deletions(-)

diff --git a/tests/outputs/directives.css b/tests/outputs/directives.css
index e253dae8..ac8c1b1f 100644
--- a/tests/outputs/directives.css
+++ b/tests/outputs/directives.css
@@ -22,7 +22,6 @@ div {
 
 @font-face {
   color: red;
-
   height: 20px; }
 
 @keyframes 'bounce' {
diff --git a/tests/outputs/scss_css.css b/tests/outputs/scss_css.css
index 21f6446c..63381b6b 100644
--- a/tests/outputs/scss_css.css
+++ b/tests/outputs/scss_css.css
@@ -78,11 +78,8 @@ sel {
 
 foo {
   a: 12px calc(100%/3 - 2*1em - 2*1px);
-
   b: 12px -moz-calc(100%/3 - 2*1em - 2*1px);
-
   b: 12px -webkit-calc(100%/3 - 2*1em - 2*1px);
-
   b: 12px -foobar-calc(100%/3 - 2*1em - 2*1px); }
 
 foo {
@@ -158,9 +155,7 @@ foo {
 
 foo {
   a: -moz-element(#foo);
-
   b: -webkit-element(#foo);
-
   b: -foobar-element(#foo); }
 
 @foo ;
@@ -534,22 +529,18 @@ foo {
 
 @page {
   prop1: val;
-
   prop2: val; }
 
 @page flap {
   prop1: val;
-
   prop2: val; }
 
 @page :first {
   prop1: val;
-
   prop2: val; }
 
 @page flap:first {
   prop1: val;
-
   prop2: val; }
 
 .foo {
diff --git a/tests/outputs_numbered/directives.css b/tests/outputs_numbered/directives.css
index 510945aa..bacc36d7 100644
--- a/tests/outputs_numbered/directives.css
+++ b/tests/outputs_numbered/directives.css
@@ -26,7 +26,6 @@ height: 20px; } }
 
 @font-face {
   color: red;
-
   height: 20px; }
 
 @keyframes 'bounce' {
diff --git a/tests/outputs_numbered/scss_css.css b/tests/outputs_numbered/scss_css.css
index 8bd95ca9..ccaa829a 100644
--- a/tests/outputs_numbered/scss_css.css
+++ b/tests/outputs_numbered/scss_css.css
@@ -79,11 +79,8 @@ a: b; }
 
 foo {
   a: 12px calc(100%/3 - 2*1em - 2*1px);
-
   b: 12px -moz-calc(100%/3 - 2*1em - 2*1px);
-
   b: 12px -webkit-calc(100%/3 - 2*1em - 2*1px);
-
   b: 12px -foobar-calc(100%/3 - 2*1em - 2*1px); }
 /* line 84, inputs/scss_css.scss */
 foo {
@@ -166,9 +163,7 @@ foo {
 
 foo {
   a: -moz-element(#foo);
-
   b: -webkit-element(#foo);
-
   b: -foobar-element(#foo); }
 
 @foo ;
@@ -548,22 +543,18 @@ foo {
 
 @page {
   prop1: val;
-
   prop2: val; }
 
 @page flap {
   prop1: val;
-
   prop2: val; }
 
 @page :first {
   prop1: val;
-
   prop2: val; }
 
 @page flap:first {
   prop1: val;
-
   prop2: val; }
 /* line 688, inputs/scss_css.scss */
 .foo {

From 6f83e872ebfb68e1f4ded4e5abe7087ee3d27694 Mon Sep 17 00:00:00 2001
From: Roland Soos <roland@nextendweb.com>
Date: Tue, 7 May 2019 17:46:24 +0200
Subject: [PATCH 146/254] Fixing PHPdoc wrong argument types (#662)

* Fixing PHPdoc wrong argument types

* Fixing return type
---
 src/Parser.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index c7ef2558..0a96e59d 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1164,7 +1164,7 @@ protected function argValue(&$out)
     /**
      * Parse comma separated value list
      *
-     * @param string $out
+     * @param array $out
      *
      * @return boolean
      */
@@ -2579,7 +2579,7 @@ private function extractLineNumbers($buffer)
      *
      * @param integer $pos
      *
-     * @return integer
+     * @return array
      */
     private function getSourcePosition($pos)
     {

From 0d4425f39de87d98aab8dc55cf137992011c96ae Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 18:17:46 +0200
Subject: [PATCH 147/254] Test case for bracketed lists
 https://github.com/leafo/scssphp/issues/558

---
 tests/inputs/list.scss          | 7 +++++++
 tests/outputs/list.css          | 3 +++
 tests/outputs_numbered/list.css | 9 ++++++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/tests/inputs/list.scss b/tests/inputs/list.scss
index 8d290e9f..61fab7d2 100644
--- a/tests/inputs/list.scss
+++ b/tests/inputs/list.scss
@@ -14,6 +14,13 @@ p {
   background: linear-gradient($list);
 }
 
+$list: [];
+$list: join($list, [red, blue], comma);
+
+.bracket-list {
+  background: linear-gradient($list);
+}
+
 div {
 x: index(1px solid red, solid);
 y: index(1px solid red, dashed);
diff --git a/tests/outputs/list.css b/tests/outputs/list.css
index 7358b340..2e2f542b 100644
--- a/tests/outputs/list.css
+++ b/tests/outputs/list.css
@@ -6,6 +6,9 @@ div {
 p {
   background: linear-gradient(red, blue); }
 
+.bracket-list {
+  background: linear-gradient(red, blue); }
+
 div {
   x: 2;
   z: 2; }
diff --git a/tests/outputs_numbered/list.css b/tests/outputs_numbered/list.css
index d80d6150..6fa2ea80 100644
--- a/tests/outputs_numbered/list.css
+++ b/tests/outputs_numbered/list.css
@@ -6,17 +6,20 @@ div {
 /* line 13, inputs/list.scss */
 p {
   background: linear-gradient(red, blue); }
-/* line 17, inputs/list.scss */
+/* line 20, inputs/list.scss */
+.bracket-list {
+  background: linear-gradient(red, blue); }
+/* line 24, inputs/list.scss */
 div {
   x: 2;
   z: 2; }
-/* line 24, inputs/list.scss */
+/* line 31, inputs/list.scss */
 div {
   a: 10px;
   b: -20px;
   c: 30px;
   d: 30px; }
-/* line 31, inputs/list.scss */
+/* line 38, inputs/list.scss */
 div {
   x: space;
   y: comma;

From 7afb8c32bf2cd5c058dbb5cbf452bdc0fa1a98da Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 18:18:46 +0200
Subject: [PATCH 148/254] Fix https://github.com/leafo/scssphp/issues/558 :
 support of bracketed lists Thanks to @niaccurshi
 https://github.com/leafo/scssphp/pull/593/commits/a8553aa54118ca4d34325041e100d29c38d69303

---
 src/Parser.php | 42 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 0a96e59d..2aa166f8 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1238,19 +1238,15 @@ protected function expression(&$out)
         $s = $this->count;
 
         if ($this->matchChar('(')) {
-            if ($this->matchChar(')')) {
-                $out = [Type::T_LIST, '', []];
-
-                return true;
-            }
-
-            if ($this->valueList($out) && $this->matchChar(')') && $out[0] === Type::T_LIST) {
+            if ($this->parenExpression($out, $s, ")")) {
                 return true;
             }
 
             $this->seek($s);
+        }
 
-            if ($this->map($out)) {
+        if ($this->matchChar('[')) {
+            if ($this->parenExpression($out, $s, "]")) {
                 return true;
             }
 
@@ -1266,6 +1262,36 @@ protected function expression(&$out)
         return false;
     }
 
+    /**
+     * Parse expression specifically checking for lists in parenthesis or brackets
+     *
+     * @param array $out
+     * @param integer $s
+     * @param string $closingParen
+     *
+     * @return boolean
+     */
+    protected function parenExpression(&$out, $s, $closingParen = ")")
+    {
+        if ($this->matchChar($closingParen)) {
+            $out = [Type::T_LIST, '', []];
+
+            return true;
+        }
+
+        if ($this->valueList($out) && $this->matchChar($closingParen) && $out[0] === Type::T_LIST) {
+            return true;
+        }
+
+        $this->seek($s);
+
+        if ($this->map($out)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Parse left-hand side of subexpression
      *

From 9511eda3e3a3c0a0910fd6725464c46ca86ed25f Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 23:53:38 +0200
Subject: [PATCH 149/254] https://github.com/leafo/scssphp/issues/490 : Avoid
 an infinite loop when trying to resolve a variable value - allow to exit and
 throw

---
 src/Compiler.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 331f9af0..3344f584 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3428,7 +3428,11 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
         $nextIsRoot = false;
         $hasNamespace = $normalizedName[0] === '^' || $normalizedName[0] === '@' || $normalizedName[0] === '%';
 
+        $max_depth = 10000;
         for (;;) {
+            if ($max_depth-- <= 0) {
+                break;
+            }
             if (array_key_exists($normalizedName, $env->store)) {
                 if ($unreduced && isset($env->storeUnreduced[$normalizedName])) {
                     return $env->storeUnreduced[$normalizedName];

From f91fa043257f407edc0185a6836365f60553b488 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 7 May 2019 23:58:56 +0200
Subject: [PATCH 150/254] https://github.com/leafo/scssphp/issues/490 : clone
 the content before storing it to avoid spoiling the scope by a further
 @include of the same mixin with new scope

---
 src/Compiler.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 3344f584..5b45620d 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2074,10 +2074,13 @@ protected function compileChild($child, OutputBlock $out)
                     }
                 }
 
+                // the content stored need to be cloned to not have its scope spoiled by a further call to the same mixin
+                // ie recursive @include of the same mixin
                 if (isset($content)) {
-                    $content->scope = $callingScope;
+                    $copy_content = clone $content;
+                    $copy_content->scope = $callingScope;
 
-                    $this->setRaw(static::$namespaces['special'] . 'content', $content, $this->env);
+                    $this->setRaw(static::$namespaces['special'] . 'content', $copy_content, $this->env);
                 }
 
                 if (isset($mixin->args)) {

From 4b55707c80f13be0fb7050949270eba8660ea2ae Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 01:47:15 +0200
Subject: [PATCH 151/254] Fix https://github.com/leafo/scssphp/issues/490 :
 when combining @media, you need to evaluate each with its own scope, keeping
 the structure + detecting that an interpolated @media was an expresion and
 not a type, which the parser had no mean to know

---
 src/Compiler.php | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 5b45620d..94a224f2 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1505,6 +1505,39 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
         }
     }
 
+
+    /**
+     * evaluate media query : compile internal value keeping the structure inchanged
+     *
+     * @param array $queryList
+     *
+     * @return array
+     */
+    protected function evaluateMediaQuery($queryList)
+    {
+        foreach ($queryList as $kql => $query) {
+            foreach ($query as $kq => $q) {
+                for ($i = 1; $i < count($q); $i++) {
+                    $value = $this->compileValue($q[$i]);
+
+                    // the parser had no mean to know if media type or expression if it was an interpolation
+                    if ($q[0] == Type::T_MEDIA_TYPE &&
+                      (strpos($value, '(') !== false ||
+                        strpos($value, ')') !== false ||
+                        strpos($value, ':') !== false)) {
+                        $queryList[$kql][$kq][0] = Type::T_MEDIA_EXPRESSION;
+
+                        $value = ltrim($value, '(');
+                        $value = rtrim($value, ')');
+                    }
+                    $queryList[$kql][$kq][$i] = [Type::T_KEYWORD, $value];
+                }
+            }
+        }
+
+        return $queryList;
+    }
+
     /**
      * Compile media query
      *
@@ -2111,7 +2144,6 @@ protected function compileChild($child, OutputBlock $out)
 
                 $storeEnv = $this->storeEnv;
                 $this->storeEnv = $content->scope;
-
                 $this->compileChildrenNoReturn($content->children, $out);
 
                 $this->storeEnv = $storeEnv;
@@ -3240,6 +3272,11 @@ protected function multiplyMedia(Environment $env = null, $childQueries = null)
             ? $env->block->queryList
             : [[[Type::T_MEDIA_VALUE, $env->block->value]]];
 
+        $storeEnv = $this->env;
+        $this->env = $env;
+        $parentQueries = $this->evaluateMediaQuery($parentQueries);
+        $this->env = $storeEnv;
+
         if ($childQueries === null) {
             $childQueries = $parentQueries;
         } else {

From edb9e2af94c12e76ca9f62e4f9f3562bce80beeb Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 02:23:02 +0200
Subject: [PATCH 152/254] additionnal test for a combination of @media +
 @at-root + @font-face

---
 tests/inputs/directives.scss          | 16 ++++++++++++++++
 tests/outputs/directives.css          |  6 ++++++
 tests/outputs_numbered/directives.css |  8 ++++++++
 3 files changed, 30 insertions(+)

diff --git a/tests/inputs/directives.scss b/tests/inputs/directives.scss
index 8214a170..83b3bcfc 100644
--- a/tests/inputs/directives.scss
+++ b/tests/inputs/directives.scss
@@ -172,4 +172,20 @@ div {
   .sticky-top2 {
     position: sticky;
   }
+}
+
+@media print {
+.table-bordered {
+    th,
+    td {
+      border: 1px solid #ddd !important;
+    }
+  }
+}
+
+@at-root {
+  // Import the fonts
+  @font-face {
+    font-family: "Glyphicons Halflings";
+  }
 }
\ No newline at end of file
diff --git a/tests/outputs/directives.css b/tests/outputs/directives.css
index ac8c1b1f..1cb99889 100644
--- a/tests/outputs/directives.css
+++ b/tests/outputs/directives.css
@@ -113,3 +113,9 @@ div {
 @supports (position: sticky) {
   .sticky-top2 {
     position: sticky; } }
+
+@media print {
+  .table-bordered th, .table-bordered td {
+    border: 1px solid #ddd !important; } }
+  @font-face {
+    font-family: "Glyphicons Halflings"; }
diff --git a/tests/outputs_numbered/directives.css b/tests/outputs_numbered/directives.css
index bacc36d7..4c17a831 100644
--- a/tests/outputs_numbered/directives.css
+++ b/tests/outputs_numbered/directives.css
@@ -131,3 +131,11 @@ to {
 /* line 172, inputs/directives.scss */
 .sticky-top2 {
   position: sticky; } }
+
+@media print {
+/* line 178, inputs/directives.scss */
+/* line 179, inputs/directives.scss */
+  .table-bordered th, .table-bordered td {
+    border: 1px solid #ddd !important; } }
+  @font-face {
+    font-family: "Glyphicons Halflings"; }

From 2dc0813b06b2a99a10e2e42ca24e56b0881751af Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 02:27:36 +0200
Subject: [PATCH 153/254] Fix https://github.com/leafo/scssphp/issues/668 : no
 wrapping for an assign in a @font-face

---
 src/Compiler.php | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 94a224f2..83e1c6b1 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1118,30 +1118,33 @@ protected function compileNestedBlock(Block $block, $selectors)
         $this->scope->parent->children[] = $this->scope;
 
         // wrap assign children in a block
-        // (siblings children in the same block)
-        $previousWrap = null;
-        foreach ($block->children as $k => $child) {
-            if ($child[0] === Type::T_ASSIGN) {
-                if (! is_null($previousWrap)) {
-                    $block->children[$previousWrap][1]->children[] = $child;
-                    unset($block->children[$k]);
+        // except for @font-face
+        if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") {
+            // (siblings children in the same block)
+            $previousWrap = null;
+            foreach ($block->children as $k => $child) {
+                if ($child[0] === Type::T_ASSIGN) {
+                    if (! is_null($previousWrap)) {
+                        $block->children[$previousWrap][1]->children[] = $child;
+                        unset($block->children[$k]);
+                    } else {
+                        $wrapped = new Block;
+                        $wrapped->sourceName   = $block->sourceName;
+                        $wrapped->sourceIndex  = $block->sourceIndex;
+                        $wrapped->sourceLine   = $block->sourceLine;
+                        $wrapped->sourceColumn = $block->sourceColumn;
+                        $wrapped->selectors    = [];
+                        $wrapped->comments     = [];
+                        $wrapped->parent       = $block;
+                        $wrapped->children     = [$child];
+                        $wrapped->selfParent   = $block->selfParent;
+
+                        $block->children[$k] = [Type::T_BLOCK, $wrapped];
+                        $previousWrap = $k;
+                    }
                 } else {
-                    $wrapped = new Block;
-                    $wrapped->sourceName   = $block->sourceName;
-                    $wrapped->sourceIndex  = $block->sourceIndex;
-                    $wrapped->sourceLine   = $block->sourceLine;
-                    $wrapped->sourceColumn = $block->sourceColumn;
-                    $wrapped->selectors    = [];
-                    $wrapped->comments     = [];
-                    $wrapped->parent       = $block;
-                    $wrapped->children     = [$child];
-                    $wrapped->selfParent   = $block->selfParent;
-
-                    $block->children[$k] = [Type::T_BLOCK, $wrapped];
-                    $previousWrap = $k;
+                    $previousWrap = null;
                 }
-            } else {
-                $previousWrap = null;
             }
         }
 

From 04ffd6de509d4caf78bb2edeb753da13e827e78e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 12:19:29 +0200
Subject: [PATCH 154/254] Test case for #517

---
 tests/inputs/media.scss          | 7 +++++++
 tests/outputs/media.css          | 4 ++++
 tests/outputs_numbered/media.css | 5 +++++
 3 files changed, 16 insertions(+)

diff --git a/tests/inputs/media.scss b/tests/inputs/media.scss
index 3c2c147a..4389b224 100644
--- a/tests/inputs/media.scss
+++ b/tests/inputs/media.scss
@@ -206,3 +206,10 @@ dt {
     }
 }
 
+@media screen and (max-width: 749px) {
+  @media screen and (max-width: 600px) and (min-width: 361px) {
+    .item {
+      color:red;
+    }
+  }
+}
diff --git a/tests/outputs/media.css b/tests/outputs/media.css
index 66276527..0098f37a 100644
--- a/tests/outputs/media.css
+++ b/tests/outputs/media.css
@@ -101,3 +101,7 @@ code {
 @media only screen and (color: blue) and (width: 13) {
       .only-screen {
         height: 15px; } }
+
+@media screen and (max-width: 749px) and (max-width: 600px) and (min-width: 361px) {
+    .item {
+      color: red; } }
diff --git a/tests/outputs_numbered/media.css b/tests/outputs_numbered/media.css
index 779bd31b..d7d1055b 100644
--- a/tests/outputs_numbered/media.css
+++ b/tests/outputs_numbered/media.css
@@ -126,3 +126,8 @@ code pre {
 /* line 202, inputs/media.scss */
 .only-screen {
   height: 15px; } }
+
+@media screen and (max-width: 749px) and (max-width: 600px) and (min-width: 361px) {
+/* line 211, inputs/media.scss */
+.item {
+  color: red; } }

From 45dd4f4cdb8b52b7a3127407dcc9e73ca1a7521d Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 21:31:48 +0200
Subject: [PATCH 155/254] in case of infinite recursion display it in the
 Exception message

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 83e1c6b1..d988b025 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3502,7 +3502,7 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
         }
 
         if ($shouldThrow) {
-            $this->throwError("Undefined variable \$$name");
+            $this->throwError("Undefined variable \$$name" . ($max_depth<=0 ? " (infinite recursion)" : ""));
         }
 
         // found nothing

From 91175411e7cd6b1a28032ccbaba14fc0af22de7d Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 21:32:31 +0200
Subject: [PATCH 156/254] Fix https://github.com/leafo/scssphp/issues/511 and
 https://github.com/leafo/scssphp/issues/423 : scope when evaluating @media
 (this is a complement of #669)

---
 src/Compiler.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index d988b025..c1589580 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3275,10 +3275,11 @@ protected function multiplyMedia(Environment $env = null, $childQueries = null)
             ? $env->block->queryList
             : [[[Type::T_MEDIA_VALUE, $env->block->value]]];
 
-        $storeEnv = $this->env;
+        $store = [$this->env, $this->storeEnv];
         $this->env = $env;
+        $this->storeEnv = null;
         $parentQueries = $this->evaluateMediaQuery($parentQueries);
-        $this->env = $storeEnv;
+        list($this->env, $this->storeEnv) = $store;
 
         if ($childQueries === null) {
             $childQueries = $parentQueries;

From adf46d27bf12819dcd0c56eb6f6fc8302ad3d6b3 Mon Sep 17 00:00:00 2001
From: Roland Soos <roland@nextendweb.com>
Date: Wed, 8 May 2019 22:42:58 +0200
Subject: [PATCH 157/254] Moving `commentsSeen` property (#665)

* Update Compiler.php

* Fixing commentsSeen

* Making commentSeen private

Making commentSeen private as other properties are private.
---
 src/Compiler.php | 2 --
 src/Parser.php   | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index c1589580..c1d1eddb 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -146,7 +146,6 @@ class Compiler
     protected $sourceNames;
 
     protected $indentLevel;
-    protected $commentsSeen;
     protected $extends;
     protected $extendsMap;
     protected $parsedFiles;
@@ -182,7 +181,6 @@ public function __construct()
     public function compile($code, $path = null)
     {
         $this->indentLevel    = -1;
-        $this->commentsSeen   = [];
         $this->extends        = [];
         $this->extendsMap     = [];
         $this->sourceIndex    = null;
diff --git a/src/Parser.php b/src/Parser.php
index 2aa166f8..313b3467 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -65,6 +65,7 @@ class Parser
     private $utf8;
     private $encoding;
     private $patternModifiers;
+    private $commentsSeen;
 
     /**
      * Constructor
@@ -82,6 +83,7 @@ public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8')
         $this->charset          = null;
         $this->utf8             = ! $encoding || strtolower($encoding) === 'utf-8';
         $this->patternModifiers = $this->utf8 ? 'Aisu' : 'Ais';
+        $this->commentsSeen   = [];
 
         if (empty(static::$operatorPattern)) {
             static::$operatorPattern = '([*\/%+-]|[!=]\=|\>\=?|\<\=\>|\<\=?|and|or)';

From 417bb6a48846dd45bb6222e3f91277a49ab816d9 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 8 May 2019 22:44:21 +0200
Subject: [PATCH 158/254] Fix https://github.com/leafo/scssphp/issues/409 in
 better slicing the @media expression

---
 src/Compiler.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index c1589580..a9490e11 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1530,14 +1530,30 @@ protected function evaluateMediaQuery($queryList)
                         strpos($value, ':') !== false)) {
                         $queryList[$kql][$kq][0] = Type::T_MEDIA_EXPRESSION;
 
-                        $value = ltrim($value, '(');
-                        $value = rtrim($value, ')');
+                        if (strpos($value, 'and') !== false) {
+                            $values = explode('and', $value);
+                            $value = trim(array_pop($values));
+                            while ($v = trim(array_pop($values))) {
+                                $type = Type::T_MEDIA_EXPRESSION;
+                                if (strpos($v, '(') === false &&
+                                  strpos($v, ')') === false &&
+                                  strpos($v, ':') === false) {
+                                    $type = Type::T_MEDIA_TYPE;
+                                }
+                                if (substr($v, 0, 1) === '(' && substr($v, -1) === ')') {
+                                    $v = substr($v, 1, -1);
+                                }
+                                $queryList[$kql][] = [$type,[Type::T_KEYWORD, $v]];
+                            }
+                        }
+                        if (substr($value, 0, 1) === '(' && substr($value, -1) === ')') {
+                            $value = substr($value, 1, -1);
+                        }
                     }
                     $queryList[$kql][$kq][$i] = [Type::T_KEYWORD, $value];
                 }
             }
         }
-
         return $queryList;
     }
 

From 203f0c06c6bcd0730b6b06ed60e0c5db352c4a1a Mon Sep 17 00:00:00 2001
From: Roland Soos <roland@nextendweb.com>
Date: Tue, 7 May 2019 17:55:07 +0200
Subject: [PATCH 159/254] phpdocs: Update Compiler.php, Parser.php,
 SourceMapGenerator.php

---
 src/Compiler.php                     | 16 ++++++++--------
 src/Parser.php                       |  6 ++----
 src/SourceMap/SourceMapGenerator.php |  1 -
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index c1d1eddb..61aadc50 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1711,13 +1711,13 @@ protected function mergeMediaTypes($type1, $type2)
     /**
      * Compile import; returns true if the value was something that could be imported
      *
-     * @param array   $rawPath
-     * @param array   $out
-     * @param boolean $once
+     * @param array         $rawPath
+     * @param OutputBlock   $out
+     * @param boolean       $once
      *
      * @return boolean
      */
-    protected function compileImport($rawPath, $out, $once = false)
+    protected function compileImport($rawPath, OutputBlock $out, $once = false)
     {
         if ($rawPath[0] === Type::T_STRING) {
             $path = $this->compileStringContent($rawPath);
@@ -2219,7 +2219,7 @@ protected function expToString($exp)
      *
      * @param array $value
      *
-     * @return array
+     * @return boolean
      */
     protected function isTruthy($value)
     {
@@ -3736,10 +3736,10 @@ public function addFeature($name)
     /**
      * Import file
      *
-     * @param string $path
-     * @param array  $out
+     * @param OutputBlock $path
+     * @param array       $out
      */
-    protected function importFile($path, $out)
+    protected function importFile($path, OutputBlock $out)
     {
         // see if tree is cached
         $realPath = realpath($path);
diff --git a/src/Parser.php b/src/Parser.php
index 313b3467..56cc5b21 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -808,8 +808,6 @@ protected function peek($regex, &$out, $from = null)
      * Seek to position in input stream (or return current position in input stream)
      *
      * @param integer $where
-     *
-     * @return integer
      */
     protected function seek($where)
     {
@@ -1542,7 +1540,7 @@ protected function progid(&$out)
      * Parse function call
      *
      * @param string $name
-     * @param array $out
+     * @param array $func
      *
      * @return boolean
      */
@@ -1793,7 +1791,7 @@ protected function color(&$out)
     /**
      * Parse number with unit
      *
-     * @param array $out
+     * @param array $unit
      *
      * @return boolean
      */
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 3c636a88..8702726d 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -123,7 +123,6 @@ public function addMapping($generatedLine, $generatedColumn, $originalLine, $ori
     /**
      * Saves the source map to a file
      *
-     * @param string $file    The absolute path to a file
      * @param string $content The content to write
      *
      * @throws \Leafo\ScssPhp\Exception\CompilerException If the file could not be saved

From 34d16940e28128cd19a4fa495f85ebd1391472bd Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 8 May 2019 17:14:10 -0400
Subject: [PATCH 160/254] misc phpdoc updates

---
 src/Compiler.php                     | 28 +++++++++++++++++++---------
 src/Parser.php                       |  6 +++---
 src/SourceMap/SourceMapGenerator.php | 17 +++++++++++++----
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 61aadc50..a01f42f0 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -429,8 +429,10 @@ protected function flattenSelectors(OutputBlock $block, $parentKey = null)
     }
 
     /**
-     * glue parts of :not( or :nth-child( ... that are in general splitted in selectors parts
+     * Glue parts of :not( or :nth-child( ... that are in general splitted in selectors parts
+     *
      * @param array $parts
+     *
      * @return array
      */
     protected function glueFunctionSelectors($parts)
@@ -1044,7 +1046,7 @@ protected function filterWithout($envs, $without)
     /**
      * Filter WITH rules
      *
-     * @param integer              $without
+     * @param integer                                                   $without
      * @param \Leafo\ScssPhp\Block|\Leafo\ScssPhp\Formatter\OutputBlock $block
      *
      * @return boolean
@@ -1479,7 +1481,7 @@ protected function compileChildren($stms, OutputBlock $out)
      *
      * @param array                                $stms
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
-     * @param \Leafo\ScssPhp\Block $selfParent
+     * @param \Leafo\ScssPhp\Block                 $selfParent
      *
      * @throws \Exception
      */
@@ -1611,6 +1613,14 @@ protected function compileMediaQuery($queryList)
         return $out;
     }
 
+    /**
+     * Merge direct relationships between selectors
+     *
+     * @param array $selectors1
+     * @param array $selectors2
+     *
+     * @return array
+     */
     protected function mergeDirectRelationships($selectors1, $selectors2)
     {
         if (empty($selectors1) || empty($selectors2)) {
@@ -1711,9 +1721,9 @@ protected function mergeMediaTypes($type1, $type2)
     /**
      * Compile import; returns true if the value was something that could be imported
      *
-     * @param array         $rawPath
-     * @param OutputBlock   $out
-     * @param boolean       $once
+     * @param array                                $rawPath
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
+     * @param boolean                              $once
      *
      * @return boolean
      */
@@ -3142,7 +3152,7 @@ protected function extractInterpolation($list)
      * Find the final set of selectors
      *
      * @param \Leafo\ScssPhp\Compiler\Environment $env
-     * @param Leafo\ScssPhp\Block $selfParent
+     * @param \Leafo\ScssPhp\Block                $selfParent
      *
      * @return array
      */
@@ -3736,8 +3746,8 @@ public function addFeature($name)
     /**
      * Import file
      *
-     * @param OutputBlock $path
-     * @param array       $out
+     * @param string                               $path
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
      */
     protected function importFile($path, OutputBlock $out)
     {
diff --git a/src/Parser.php b/src/Parser.php
index 56cc5b21..45840e07 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1265,9 +1265,9 @@ protected function expression(&$out)
     /**
      * Parse expression specifically checking for lists in parenthesis or brackets
      *
-     * @param array $out
+     * @param array   $out
      * @param integer $s
-     * @param string $closingParen
+     * @param string  $closingParen
      *
      * @return boolean
      */
@@ -1540,7 +1540,7 @@ protected function progid(&$out)
      * Parse function call
      *
      * @param string $name
-     * @param array $func
+     * @param array  $func
      *
      * @return boolean
      */
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 8702726d..279a0214 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -110,11 +110,11 @@ public function __construct(array $options = [])
     public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile)
     {
         $this->mappings[] = [
-            'generated_line' => $generatedLine,
+            'generated_line'   => $generatedLine,
             'generated_column' => $generatedColumn,
-            'original_line' => $originalLine,
-            'original_column' => $originalColumn,
-            'source_file' => $sourceFile
+            'original_line'    => $originalLine,
+            'original_column'  => $originalColumn,
+            'source_file'      => $sourceFile
         ];
 
         $this->sources[$sourceFile] = $sourceFile;
@@ -125,6 +125,8 @@ public function addMapping($generatedLine, $generatedColumn, $originalLine, $ori
      *
      * @param string $content The content to write
      *
+     * @return string
+     *
      * @throws \Leafo\ScssPhp\Exception\CompilerException If the file could not be saved
      */
     public function saveMap($content)
@@ -295,6 +297,13 @@ protected function findFileIndex($filename)
         return $this->source_keys[$filename];
     }
 
+    /**
+     * Normalize filename
+     *
+     * @param string $filename
+     *
+     * @return string
+     */
     protected function normalizeFilename($filename)
     {
         $filename = $this->fixWindowsPath($filename);

From 7394ea58f6dbc5673c327599a5d62b50dbc0c7ae Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Wed, 8 May 2019 17:29:48 -0400
Subject: [PATCH 161/254] whitespace tweaks

---
 src/Compiler.php | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 1e82af70..cf23e65b 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -446,7 +446,8 @@ protected function glueFunctionSelectors($parts)
                 // a selector part finishing with a ) is the last part of a :not( or :nth-child(
                 // and need to be joined to this
                 if (count($new) && is_string($new[count($new) - 1])
-                  && strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false) {
+                    && strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false
+                ) {
                     $new[count($new) - 1] .= $part;
                 } else {
                     $new[] = $part;
@@ -835,7 +836,9 @@ protected function compileAtRoot(Block $block)
 
         $selfParent = $block->selfParent;
 
-        if (! $block->selfParent->selectors && isset($block->parent) && $block->parent && isset($block->parent->selectors) && $block->parent->selectors) {
+        if (! $block->selfParent->selectors && isset($block->parent) && $block->parent &&
+            isset($block->parent->selectors) && $block->parent->selectors
+        ) {
             $selfParent = $block->parent;
         }
 
@@ -1488,7 +1491,7 @@ protected function compileChildren($stms, OutputBlock $out)
     protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null)
     {
         foreach ($stms as $stm) {
-            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) == 'Leafo\ScssPhp\Block') {
+            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) === Block::class) {
                 $stm[1]->selfParent = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 $stm[1]->selfParent = null;
@@ -1525,31 +1528,39 @@ protected function evaluateMediaQuery($queryList)
 
                     // the parser had no mean to know if media type or expression if it was an interpolation
                     if ($q[0] == Type::T_MEDIA_TYPE &&
-                      (strpos($value, '(') !== false ||
+                        (strpos($value, '(') !== false ||
                         strpos($value, ')') !== false ||
-                        strpos($value, ':') !== false)) {
+                        strpos($value, ':') !== false)
+                    ) {
                         $queryList[$kql][$kq][0] = Type::T_MEDIA_EXPRESSION;
 
                         if (strpos($value, 'and') !== false) {
                             $values = explode('and', $value);
                             $value = trim(array_pop($values));
+
                             while ($v = trim(array_pop($values))) {
                                 $type = Type::T_MEDIA_EXPRESSION;
+
                                 if (strpos($v, '(') === false &&
-                                  strpos($v, ')') === false &&
-                                  strpos($v, ':') === false) {
+                                    strpos($v, ')') === false &&
+                                    strpos($v, ':') === false
+                                ) {
                                     $type = Type::T_MEDIA_TYPE;
                                 }
+
                                 if (substr($v, 0, 1) === '(' && substr($v, -1) === ')') {
                                     $v = substr($v, 1, -1);
                                 }
+
                                 $queryList[$kql][] = [$type,[Type::T_KEYWORD, $v]];
                             }
                         }
+
                         if (substr($value, 0, 1) === '(' && substr($value, -1) === ')') {
                             $value = substr($value, 1, -1);
                         }
                     }
+
                     $queryList[$kql][$kq][$i] = [Type::T_KEYWORD, $value];
                 }
             }
@@ -1878,8 +1889,8 @@ protected function compileChild($child, OutputBlock $out)
                 // handle shorthand syntax: size / line-height
                 if ($compiledName === 'font') {
                     if ($value[0] === Type::T_VARIABLE) {
-                        // if the font value comes from variable, the content is already reduced (which means formulars where already calculated)
-                        // so we need the original unreduced value
+                        // if the font value comes from variable, the content is already reduced
+                        // (i.e., formulas were already calculated), so we need the original unreduced value
                         $value = $this->get($value[1], true, null, true);
                     }
 
@@ -2127,15 +2138,15 @@ protected function compileChild($child, OutputBlock $out)
                         $parent->selectors = $parentSelectors;
 
                         foreach ($mixin->children as $k => $child) {
-                            if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) == 'Leafo\ScssPhp\Block') {
+                            if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) === Block::class) {
                                 $mixin->children[$k][1]->parent = $parent;
                             }
                         }
                     }
                 }
 
-                // the content stored need to be cloned to not have its scope spoiled by a further call to the same mixin
-                // ie recursive @include of the same mixin
+                // clone the stored content to not have its scope spoiled by a further call to the same mixin
+                // i.e., recursive @include of the same mixin
                 if (isset($content)) {
                     $copy_content = clone $content;
                     $copy_content->scope = $callingScope;
@@ -3887,7 +3898,9 @@ public function throwError($msg)
         }
 
         $line = $this->sourceLine;
-        $loc = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] . " on line $line" : "line: $line";
+        $loc = isset($this->sourceNames[$this->sourceIndex])
+             ? $this->sourceNames[$this->sourceIndex] . " on line $line"
+             : "line: $line";
         $msg = "$msg: $loc";
 
         if ($this->callStack) {
@@ -3896,7 +3909,9 @@ public function throwError($msg)
 
             foreach (array_reverse($this->callStack) as $call) {
                 $msg .= "#" . $ncall++ . " " . $call['n'] . " ";
-                $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]]) ? $this->sourceNames[$call[Parser::SOURCE_INDEX]] : '(unknown file)');
+                $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
+                      ? $this->sourceNames[$call[Parser::SOURCE_INDEX]]
+                      : '(unknown file)');
                 $msg .= " on line " . $call[Parser::SOURCE_LINE] . "\n";
             }
         }

From 787b4e736225edd42592cd8b12922235d07375d6 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 11:17:04 +0200
Subject: [PATCH 162/254] Fix #540: wrap the whole children instead of each 
 line this is following 3d3a61a3edd0421e78d6956c79e72e5e33ee67dc and
 01ec539b3bdbf91bc5b78ffb783e42fda4826b24

---
 src/Compiler.php | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index cf23e65b..08cb1279 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1123,32 +1123,29 @@ protected function compileNestedBlock(Block $block, $selectors)
         // wrap assign children in a block
         // except for @font-face
         if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") {
-            // (siblings children in the same block)
-            $previousWrap = null;
-            foreach ($block->children as $k => $child) {
+
+            // need wraping?
+            $needWrapping = false;
+            foreach ($block->children as $child) {
                 if ($child[0] === Type::T_ASSIGN) {
-                    if (! is_null($previousWrap)) {
-                        $block->children[$previousWrap][1]->children[] = $child;
-                        unset($block->children[$k]);
-                    } else {
-                        $wrapped = new Block;
-                        $wrapped->sourceName   = $block->sourceName;
-                        $wrapped->sourceIndex  = $block->sourceIndex;
-                        $wrapped->sourceLine   = $block->sourceLine;
-                        $wrapped->sourceColumn = $block->sourceColumn;
-                        $wrapped->selectors    = [];
-                        $wrapped->comments     = [];
-                        $wrapped->parent       = $block;
-                        $wrapped->children     = [$child];
-                        $wrapped->selfParent   = $block->selfParent;
-
-                        $block->children[$k] = [Type::T_BLOCK, $wrapped];
-                        $previousWrap = $k;
-                    }
-                } else {
-                    $previousWrap = null;
+                  $needWrapping = true;
+                  break;
                 }
             }
+            if ($needWrapping) {
+                $wrapped = new Block;
+                $wrapped->sourceName   = $block->sourceName;
+                $wrapped->sourceIndex  = $block->sourceIndex;
+                $wrapped->sourceLine   = $block->sourceLine;
+                $wrapped->sourceColumn = $block->sourceColumn;
+                $wrapped->selectors    = [];
+                $wrapped->comments     = [];
+                $wrapped->parent       = $block;
+                $wrapped->children     = $block->children;
+                $wrapped->selfParent   = $block->selfParent;
+
+                $block->children = [[Type::T_BLOCK, $wrapped]];
+            }
         }
 
         $this->compileChildrenNoReturn($block->children, $this->scope);

From 7cec646d1ad316291ac77c2668b991acb0011b17 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 11:20:19 +0200
Subject: [PATCH 163/254] Revert "Slight change in the outputs due to directive
 compilation enhancement:"

This reverts commit 210495ad08c2135b0b4a9f038bf01648dbe5cb07.
---
 tests/outputs/scss_css.css          | 5 ++---
 tests/outputs_numbered/scss_css.css | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/outputs/scss_css.css b/tests/outputs/scss_css.css
index 63381b6b..061fcad7 100644
--- a/tests/outputs/scss_css.css
+++ b/tests/outputs/scss_css.css
@@ -63,10 +63,9 @@ sel {
   a: b; }
 
 @foo {
+  a: b;
   rule {
-    a: b; }
-
-  a: b; }
+    a: b; } }
 
 @foo {
   a: b; }
diff --git a/tests/outputs_numbered/scss_css.css b/tests/outputs_numbered/scss_css.css
index ccaa829a..f2336adc 100644
--- a/tests/outputs_numbered/scss_css.css
+++ b/tests/outputs_numbered/scss_css.css
@@ -64,10 +64,10 @@ sel {
   a: b; }
 
 @foo {
+  a: b;
 /* line 65, inputs/scss_css.scss */
 rule {
-  a: b; }
-a: b; }
+  a: b; } }
 
 @foo {
   a: b; }

From 4cd243db012a62097a1c817351cef9887569633b Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 11:23:56 +0200
Subject: [PATCH 164/254] Indentation change in one case due to directive
 wrapping content in the compilation

---
 tests/outputs/scss_css.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/outputs/scss_css.css b/tests/outputs/scss_css.css
index 061fcad7..3e6270da 100644
--- a/tests/outputs/scss_css.css
+++ b/tests/outputs/scss_css.css
@@ -64,8 +64,8 @@ sel {
 
 @foo {
   a: b;
-  rule {
-    a: b; } }
+    rule {
+      a: b; } }
 
 @foo {
   a: b; }

From dd12cc89b822d1924078e412e47bc2edc03e7c2b Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 11:33:50 +0200
Subject: [PATCH 165/254] PSR2

---
 src/Compiler.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 08cb1279..e41a0125 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1123,26 +1123,25 @@ protected function compileNestedBlock(Block $block, $selectors)
         // wrap assign children in a block
         // except for @font-face
         if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") {
-
             // need wraping?
             $needWrapping = false;
             foreach ($block->children as $child) {
                 if ($child[0] === Type::T_ASSIGN) {
-                  $needWrapping = true;
-                  break;
+                    $needWrapping = true;
+                    break;
                 }
             }
             if ($needWrapping) {
                 $wrapped = new Block;
-                $wrapped->sourceName   = $block->sourceName;
-                $wrapped->sourceIndex  = $block->sourceIndex;
-                $wrapped->sourceLine   = $block->sourceLine;
+                $wrapped->sourceName = $block->sourceName;
+                $wrapped->sourceIndex = $block->sourceIndex;
+                $wrapped->sourceLine = $block->sourceLine;
                 $wrapped->sourceColumn = $block->sourceColumn;
-                $wrapped->selectors    = [];
-                $wrapped->comments     = [];
-                $wrapped->parent       = $block;
-                $wrapped->children     = $block->children;
-                $wrapped->selfParent   = $block->selfParent;
+                $wrapped->selectors = [];
+                $wrapped->comments = [];
+                $wrapped->parent = $block;
+                $wrapped->children = $block->children;
+                $wrapped->selfParent = $block->selfParent;
 
                 $block->children = [[Type::T_BLOCK, $wrapped]];
             }

From d5fbc04745df06d1d1b1681c2e54bbd41e84aad1 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 11:43:33 +0200
Subject: [PATCH 166/254] Test case for grid-column and grid-row shorthands

---
 tests/inputs/shorthand.scss          | 11 +++++++++++
 tests/outputs/shorthand.css          | 12 +++++++++++-
 tests/outputs_numbered/shorthand.css | 12 +++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/tests/inputs/shorthand.scss b/tests/inputs/shorthand.scss
index a8bef7cb..ac1d712d 100644
--- a/tests/inputs/shorthand.scss
+++ b/tests/inputs/shorthand.scss
@@ -33,4 +33,15 @@ div {
 
     /* The font used in system dialogs */
     font: message-box;
+
+    grid-column: 1 / 3;
+    grid-column: 2 / -1;
+    grid-column: auto / auto;
+    grid-column: span 3 / 6;
+    grid-column: 5 somegridarea span / 2 span;
+    grid-row: 1 / 3;
+    grid-row: 2 / -1;
+    grid-row: auto / auto;
+    grid-row: span 3 / 6;
+    grid-row: 5 somegridarea span / 2 span;
 }
diff --git a/tests/outputs/shorthand.css b/tests/outputs/shorthand.css
index a4769c9c..5d587e04 100644
--- a/tests/outputs/shorthand.css
+++ b/tests/outputs/shorthand.css
@@ -25,4 +25,14 @@ div {
   /* style | variant | weight | size/line-height | family */
   font: italic small-caps bolder 16px/3 cursive;
   /* The font used in system dialogs */
-  font: message-box; }
+  font: message-box;
+  grid-column: 1 / 3;
+  grid-column: 2 / -1;
+  grid-column: auto / auto;
+  grid-column: span 3 / 6;
+  grid-column: 5 somegridarea span / 2 span;
+  grid-row: 1 / 3;
+  grid-row: 2 / -1;
+  grid-row: auto / auto;
+  grid-row: span 3 / 6;
+  grid-row: 5 somegridarea span / 2 span; }
diff --git a/tests/outputs_numbered/shorthand.css b/tests/outputs_numbered/shorthand.css
index 7dbeb488..581aebe2 100644
--- a/tests/outputs_numbered/shorthand.css
+++ b/tests/outputs_numbered/shorthand.css
@@ -26,4 +26,14 @@ div {
   /* style | variant | weight | size/line-height | family */
   font: italic small-caps bolder 16px/3 cursive;
   /* The font used in system dialogs */
-  font: message-box; }
+  font: message-box;
+  grid-column: 1 / 3;
+  grid-column: 2 / -1;
+  grid-column: auto / auto;
+  grid-column: span 3 / 6;
+  grid-column: 5 somegridarea span / 2 span;
+  grid-row: 1 / 3;
+  grid-row: 2 / -1;
+  grid-row: auto / auto;
+  grid-row: span 3 / 6;
+  grid-row: 5 somegridarea span / 2 span; }

From 58362d289e2b0dc2ce2dc179d8c4839decf1fa65 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 11:44:32 +0200
Subject: [PATCH 167/254] Fix https://github.com/leafo/scssphp/issues/552 :
 grid-row and grid-column shorthands

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index cf23e65b..8413588c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1887,7 +1887,7 @@ protected function compileChild($child, OutputBlock $out)
                 $compiledName = $this->compileValue($name);
 
                 // handle shorthand syntax: size / line-height
-                if ($compiledName === 'font') {
+                if ($compiledName === 'font' || $compiledName === 'grid-row' || $compiledName === 'grid-column') {
                     if ($value[0] === Type::T_VARIABLE) {
                         // if the font value comes from variable, the content is already reduced
                         // (i.e., formulas were already calculated), so we need the original unreduced value

From f4d6570ec39e5991485d09e29c56e623ef975782 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 9 May 2019 12:10:54 +0200
Subject: [PATCH 168/254] Version 0.8.1

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 8a530296..d2ef8185 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.8.0';
+    const VERSION = 'v0.8.1';
 }

From 1cad1c8fa3e0ecb29973ec25612455c6480d12b6 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 9 May 2019 12:55:07 -0400
Subject: [PATCH 169/254] whitespace and camelCase

---
 src/Compiler.php                     | 21 +++++++++++++--------
 src/SourceMap/SourceMapGenerator.php | 14 +++++++-------
 tests/FrameworkTest.php              |  4 ++--
 tests/inputs/extends.scss            |  1 -
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 720e6f1e..75accf8e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -467,8 +467,8 @@ protected function glueFunctionSelectors($parts)
      */
     protected function matchExtends($selector, &$out, $from = 0, $initial = true)
     {
-
         $selector = $this->glueFunctionSelectors($selector);
+
         foreach ($selector as $i => $part) {
             if ($i < $from) {
                 continue;
@@ -501,6 +501,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                                 $slice[] = $chunk;
                             }
                         }
+
                         array_unshift($replacement, $slice);
 
                         if (! $this->isImmediateRelationshipCombinator(end($slice))) {
@@ -1123,14 +1124,16 @@ protected function compileNestedBlock(Block $block, $selectors)
         // wrap assign children in a block
         // except for @font-face
         if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") {
-            // need wraping?
+            // need wrapping?
             $needWrapping = false;
+
             foreach ($block->children as $child) {
                 if ($child[0] === Type::T_ASSIGN) {
                     $needWrapping = true;
                     break;
                 }
             }
+
             if ($needWrapping) {
                 $wrapped = new Block;
                 $wrapped->sourceName = $block->sourceName;
@@ -1561,6 +1564,7 @@ protected function evaluateMediaQuery($queryList)
                 }
             }
         }
+
         return $queryList;
     }
 
@@ -2144,10 +2148,10 @@ protected function compileChild($child, OutputBlock $out)
                 // clone the stored content to not have its scope spoiled by a further call to the same mixin
                 // i.e., recursive @include of the same mixin
                 if (isset($content)) {
-                    $copy_content = clone $content;
-                    $copy_content->scope = $callingScope;
+                    $copyContent = clone $content;
+                    $copyContent->scope = $callingScope;
 
-                    $this->setRaw(static::$namespaces['special'] . 'content', $copy_content, $this->env);
+                    $this->setRaw(static::$namespaces['special'] . 'content', $copyContent, $this->env);
                 }
 
                 if (isset($mixin->args)) {
@@ -3503,9 +3507,10 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
         $nextIsRoot = false;
         $hasNamespace = $normalizedName[0] === '^' || $normalizedName[0] === '@' || $normalizedName[0] === '%';
 
-        $max_depth = 10000;
+        $maxDepth = 10000;
+
         for (;;) {
-            if ($max_depth-- <= 0) {
+            if ($maxDepth-- <= 0) {
                 break;
             }
             if (array_key_exists($normalizedName, $env->store)) {
@@ -3534,7 +3539,7 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
         }
 
         if ($shouldThrow) {
-            $this->throwError("Undefined variable \$$name" . ($max_depth<=0 ? " (infinite recursion)" : ""));
+            $this->throwError("Undefined variable \$$name" . ($maxDepth<=0 ? " (infinite recursion)" : ""));
         }
 
         // found nothing
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index 279a0214..d2001462 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -85,7 +85,7 @@ class SourceMapGenerator
      * @var array
      */
     protected $sources = [];
-    protected $source_keys = [];
+    protected $sourceKeys = [];
 
     /**
      * @var array
@@ -181,8 +181,8 @@ public function generateJson()
         // A list of original sources used by the 'mappings' entry.
         $sourceMap['sources'] = [];
 
-        foreach ($this->sources as $source_uri => $source_filename) {
-            $sourceMap['sources'][] = $this->normalizeFilename($source_filename);
+        foreach ($this->sources as $sourceUri => $sourceFilename) {
+            $sourceMap['sources'][] = $this->normalizeFilename($sourceFilename);
         }
 
         // A list of symbol names used by the 'mappings' entry.
@@ -237,7 +237,7 @@ public function generateMappings()
             return '';
         }
 
-        $this->source_keys = array_flip(array_keys($this->sources));
+        $this->sourceKeys = array_flip(array_keys($this->sources));
 
         // group mappings by generated line number.
         $groupedMap = $groupedMapEncoded = [];
@@ -249,7 +249,7 @@ public function generateMappings()
         ksort($groupedMap);
         $lastGeneratedLine = $lastOriginalIndex = $lastOriginalLine = $lastOriginalColumn = 0;
 
-        foreach ($groupedMap as $lineNumber => $line_map) {
+        foreach ($groupedMap as $lineNumber => $lineMap) {
             while (++$lastGeneratedLine < $lineNumber) {
                 $groupedMapEncoded[] = ';';
             }
@@ -257,7 +257,7 @@ public function generateMappings()
             $lineMapEncoded = [];
             $lastGeneratedColumn = 0;
 
-            foreach ($line_map as $m) {
+            foreach ($lineMap as $m) {
                 $mapEncoded = $this->encoder->encode($m['generated_column'] - $lastGeneratedColumn);
                 $lastGeneratedColumn = $m['generated_column'];
 
@@ -294,7 +294,7 @@ public function generateMappings()
      */
     protected function findFileIndex($filename)
     {
-        return $this->source_keys[$filename];
+        return $this->sourceKeys[$filename];
     }
 
     /**
diff --git a/tests/FrameworkTest.php b/tests/FrameworkTest.php
index 3be524dc..f4317e27 100644
--- a/tests/FrameworkTest.php
+++ b/tests/FrameworkTest.php
@@ -57,8 +57,8 @@ public function testFramework($frameworkVerion, $inputdirectory, $inputfiles)
         $this->scss->addImportPath($inputdirectory);
 
         $input = file_get_contents($inputdirectory . $inputfiles);
-        
-        //Test if no exeption are raised for the given framwork
+
+        // Test if no exceptions are raised for the given framework
         $e = null;
 
         try {
diff --git a/tests/inputs/extends.scss b/tests/inputs/extends.scss
index 609d0292..bd0ed959 100644
--- a/tests/inputs/extends.scss
+++ b/tests/inputs/extends.scss
@@ -387,4 +387,3 @@ embed.bar {
 .class3:not(:last-child) {
 	@extend .class1;
 }
-

From 906b9ec6b4294fc6f17532e7b11b9aa5278b19a3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 12 Apr 2019 15:33:54 +0200
Subject: [PATCH 170/254] Adding a Cache system that is used to cache the
 parser result (at first) Improve the parsing speed only reparsing changed
 file since last time

---
 scss.inc.php     |   1 +
 src/Cache.php    | 204 +++++++++++++++++++++++++++++++++++++++++++++++
 src/Compiler.php |  11 ++-
 src/Parser.php   |  26 +++++-
 4 files changed, 239 insertions(+), 3 deletions(-)
 create mode 100644 src/Cache.php

diff --git a/scss.inc.php b/scss.inc.php
index d75ecb55..2a5f0774 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -6,6 +6,7 @@
 if (! class_exists('Leafo\ScssPhp\Version', false)) {
     include_once __DIR__ . '/src/Base/Range.php';
     include_once __DIR__ . '/src/Block.php';
+    include_once __DIR__ . '/src/Cache.php';
     include_once __DIR__ . '/src/Colors.php';
     include_once __DIR__ . '/src/Compiler.php';
     include_once __DIR__ . '/src/Compiler/Environment.php';
diff --git a/src/Cache.php b/src/Cache.php
new file mode 100644
index 00000000..d86f94d1
--- /dev/null
+++ b/src/Cache.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2018 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://leafo.github.io/scssphp
+ */
+
+namespace Leafo\ScssPhp;
+
+use Exception;
+
+/**
+ * The scss cacher.
+ *
+ * In summary:
+ *
+ * TODO
+ */
+
+/**
+ * SCSS cache
+ *
+ * @author Cedric Morin
+ */
+class Cache
+{
+
+    const CACHE_VERSION = 0;
+
+
+    // directory used for storing data
+    public static $cache_dir = false;
+
+    // prefix for the storing data
+    public static $prefix = 'scssphp_';
+
+    public static $force_refresh = false;
+
+    // specifies the number of seconds after which data cached will be seen as 'garbage' and potentially cleaned up
+    public static $gc_lifetime = 604800;
+
+
+    /**
+     * Constructor
+     */
+    public function __construct($options)
+    {
+        //check $cache_dir
+        if (isset($options['cache_dir'])) {
+            self::$cache_dir = $options['cache_dir'];
+        }
+
+        if (empty(self::$cache_dir)) {
+            throw new Exception('cache_dir not set');
+        }
+
+        if (isset($options['prefix'])) {
+            self::$prefix = $options['prefix'];
+        }
+
+        if (empty(self::$prefix)) {
+            throw new Exception('prefix not set');
+        }
+
+        if (isset($options['force_refresh'])) {
+            self::$force_refresh = $options['force_refresh'];
+        }
+
+        self::checkCacheDir();
+    }
+
+
+    /**
+     * Generic get
+     *    Get the previous computed result of $what, affected by $options
+     *
+     * @param string $operation
+     *   parse, compile?
+     * @param $what
+     *  content key (filename to be treated?)
+     * @param array $options
+     *  any option that affect the operation result on the content
+     * @return mixed
+     * @throws Exception
+     */
+    public function getCache($operation, $what, $options = array())
+    {
+
+        $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
+
+        if (! self::$force_refresh
+          and file_exists($fileCache)
+          and filemtime($fileCache) + self::$gc_lifetime > time()) {
+            $c = file_get_contents($fileCache);
+            $c = unserialize($c);
+            if (is_array($c) and isset($c['value'])) {
+                return $c['value'];
+            }
+        }
+
+        return null;
+    }
+
+    public function setCache($operation, $what, $value, $options = array())
+    {
+        $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
+
+        $c = array('value' => $value);
+        $c = serialize($c);
+        file_put_contents($fileCache, $c);
+    }
+
+
+    private static function cacheName($operation, $what, $options = array())
+    {
+
+        $t = array(
+          'version' => self::CACHE_VERSION,
+          'operation' => $operation,
+          'what' => $what,
+          'options' => $options
+        );
+
+        $t = self::$prefix
+          . sha1(json_encode($t))
+          . ".$operation"
+          . ".scsscache";
+
+        return $t;
+    }
+
+
+    public static function checkCacheDir()
+    {
+
+        self::$cache_dir = str_replace('\\', '/', self::$cache_dir);
+        self::$cache_dir = rtrim(self::$cache_dir, '/') . '/';
+
+        if (! file_exists(self::$cache_dir)) {
+            if (! mkdir(self::$cache_dir)) {
+                throw new Exception('Cache directory couldn\'t be created: ' . self::$cache_dir);
+            }
+        } elseif (! is_dir(self::$cache_dir)) {
+            throw new Exception('Cache directory doesn\'t exist: ' . self::$cache_dir);
+        } elseif (! is_writable(self::$cache_dir)) {
+            throw new Exception('Cache directory isn\'t writable: ' . self::$cache_dir);
+        }
+    }
+
+    /**
+     * Delete unused cached files
+     *
+     */
+    public static function cleanCache()
+    {
+        static $clean = false;
+
+
+        if ($clean || empty(self::$cache_dir)) {
+            return;
+        }
+
+        $clean = true;
+
+        // only remove files with extensions created by SCSSPHP Cache
+        // css files removed based on the list files
+        $remove_types = array('scsscache' => 1);
+
+        $files = scandir(self::$cache_dir);
+        if (! $files) {
+            return;
+        }
+
+        $check_time = time() - self::$gc_lifetime;
+        foreach ($files as $file) {
+            // don't delete if the file wasn't created with SCSSPHP Cache
+            if (strpos($file, self::$prefix) !== 0) {
+                continue;
+            }
+
+            $parts = explode('.', $file);
+            $type = array_pop($parts);
+
+
+            if (! isset($remove_types[$type])) {
+                continue;
+            }
+
+            $full_path = self::$cache_dir . $file;
+            $mtime = filemtime($full_path);
+
+            // don't delete if it's a relatively new file
+            if ($mtime > $check_time) {
+                continue;
+            }
+
+            unlink($full_path);
+        }
+    }
+}
diff --git a/src/Compiler.php b/src/Compiler.php
index 75accf8e..7bc2b69e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -13,6 +13,7 @@
 
 use Leafo\ScssPhp\Base\Range;
 use Leafo\ScssPhp\Block;
+use Leafo\ScssPhp\Cache;
 use Leafo\ScssPhp\Colors;
 use Leafo\ScssPhp\Compiler\Environment;
 use Leafo\ScssPhp\Exception\CompilerException;
@@ -145,6 +146,8 @@ class Compiler
     protected $charsetSeen;
     protected $sourceNames;
 
+    protected $cache;
+
     protected $indentLevel;
     protected $extends;
     protected $extendsMap;
@@ -162,10 +165,14 @@ class Compiler
     /**
      * Constructor
      */
-    public function __construct()
+    public function __construct($cache_options = null)
     {
         $this->parsedFiles = [];
         $this->sourceNames = [];
+
+        if ($cache_options) {
+            $this->cache = new Cache($cache_options);
+        }
     }
 
     /**
@@ -247,7 +254,7 @@ public function compile($code, $path = null)
      */
     protected function parserFactory($path)
     {
-        $parser = new Parser($path, count($this->sourceNames), $this->encoding);
+        $parser = new Parser($path, count($this->sourceNames), $this->encoding, $this->cache);
 
         $this->sourceNames[] = $path;
         $this->addParsedFile($path);
diff --git a/src/Parser.php b/src/Parser.php
index 45840e07..755f563c 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -53,6 +53,8 @@ class Parser
     protected static $operatorPattern;
     protected static $whitePattern;
 
+    protected $cache;
+
     private $sourceName;
     private $sourceIndex;
     private $sourcePositions;
@@ -75,8 +77,9 @@ class Parser
      * @param string  $sourceName
      * @param integer $sourceIndex
      * @param string  $encoding
+     * @param Cache $cache
      */
-    public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8')
+    public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8', $cache = null)
     {
         $this->sourceName       = $sourceName ?: '(stdin)';
         $this->sourceIndex      = $sourceIndex;
@@ -97,6 +100,10 @@ public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8')
                 ? '/' . $commentSingle . '[^\n]*\s*|(' . static::$commentPattern . ')\s*|\s+/AisuS'
                 : '/' . $commentSingle . '[^\n]*\s*|(' . static::$commentPattern . ')\s*|\s+/AisS';
         }
+
+        if ($cache) {
+            $this->cache = $cache;
+        }
     }
 
     /**
@@ -144,6 +151,19 @@ public function throwParseError($msg = 'parse error')
      */
     public function parse($buffer)
     {
+
+        if ($this->cache) {
+            $cache_key = $this->sourceName . ":" . md5($buffer);
+            $parse_options = array(
+                'charset' => $this->charset,
+                'utf8' => $this->utf8,
+            );
+            $v = $this->cache->getCache("parse", $cache_key, $parse_options);
+            if (!is_null($v)) {
+                return $v;
+            }
+        }
+
         // strip BOM (byte order marker)
         if (substr($buffer, 0, 3) === "\xef\xbb\xbf") {
             $buffer = substr($buffer, 3);
@@ -183,6 +203,10 @@ public function parse($buffer)
 
         $this->restoreEncoding();
 
+        if ($this->cache) {
+            $this->cache->setCache("parse", $cache_key, $this->env, $parse_options);
+        }
+
         return $this->env;
     }
 

From 5b41c388d08d873248feee9dd0e3b9711add0bf2 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 15 Apr 2019 14:58:08 +0200
Subject: [PATCH 171/254] Cache documentation + improvements: * on the refresh
 feature, allowing to refresh each cache only once in a hit * add the
 possibility to provide a timestamp to getCache() (implying only more fresh
 cache is accepted)

---
 src/Cache.php | 65 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 50 insertions(+), 15 deletions(-)

diff --git a/src/Cache.php b/src/Cache.php
index d86f94d1..1e12770a 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -14,11 +14,15 @@
 use Exception;
 
 /**
- * The scss cacher.
+ * The scss cache manager.
  *
- * In summary:
+ * In short:
+ *
+ * allow to put in cache/get from fache a generic result from a known operation on a generic dataset,
+ * taking in account options that affects the result
+ *
+ * The cache manager is agnostic about data format and only the operation is expected to be descripted by string
  *
- * TODO
  */
 
 /**
@@ -38,12 +42,17 @@ class Cache
     // prefix for the storing data
     public static $prefix = 'scssphp_';
 
+    // force a refresh : 'once' for refreshing the first hit on a cache only, true to never use the cache in this hit
     public static $force_refresh = false;
 
     // specifies the number of seconds after which data cached will be seen as 'garbage' and potentially cleaned up
     public static $gc_lifetime = 604800;
 
 
+    // array of already refreshed cache if $force_refresh==='once'
+    protected static $refreshed = [];
+
+
     /**
      * Constructor
      */
@@ -75,36 +84,47 @@ public function __construct($options)
 
 
     /**
-     * Generic get
-     *    Get the previous computed result of $what, affected by $options
+     * Get the cached result of $operation on $what, which is known as dependant from the content of $options
      *
      * @param string $operation
-     *   parse, compile?
+     *   parse, compile...
      * @param $what
-     *  content key (filename to be treated?)
+     *  content key (filename to be treated for instance)
      * @param array $options
      *  any option that affect the operation result on the content
+     * @param int $last_modified
      * @return mixed
      * @throws Exception
      */
-    public function getCache($operation, $what, $options = array())
+    public function getCache($operation, $what, $options = array(), $last_modified = null)
     {
 
         $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
 
-        if (! self::$force_refresh
-          and file_exists($fileCache)
-          and filemtime($fileCache) + self::$gc_lifetime > time()) {
-            $c = file_get_contents($fileCache);
-            $c = unserialize($c);
-            if (is_array($c) and isset($c['value'])) {
-                return $c['value'];
+        if ((! self::$force_refresh || (self::$force_refresh === 'once' && isset(self::$refreshed[$fileCache])))
+          and file_exists($fileCache)) {
+            $cache_time = filemtime($fileCache);
+            if ((is_null($last_modified) or $cache_time > $last_modified)
+              and $cache_time + self::$gc_lifetime > time()) {
+                $c = file_get_contents($fileCache);
+                $c = unserialize($c);
+                if (is_array($c) and isset($c['value'])) {
+                    return $c['value'];
+                }
             }
         }
 
         return null;
     }
 
+    /**
+     * Put in cache the result of $operation on $what, which is known as dependant from the content of $options
+     *
+     * @param string $operation
+     * @param $what
+     * @param $value
+     * @param array $options
+     */
     public function setCache($operation, $what, $value, $options = array())
     {
         $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
@@ -112,9 +132,20 @@ public function setCache($operation, $what, $value, $options = array())
         $c = array('value' => $value);
         $c = serialize($c);
         file_put_contents($fileCache, $c);
+
+        if (self::$force_refresh === 'once') {
+            self::$refreshed[$fileCache] = true;
+        }
     }
 
 
+    /**
+     * get the cachename for the caching of $opetation on $what, which is known as dependant from the content of $options
+     * @param string $operation
+     * @param $what
+     * @param array $options
+     * @return string
+     */
     private static function cacheName($operation, $what, $options = array())
     {
 
@@ -134,6 +165,10 @@ private static function cacheName($operation, $what, $options = array())
     }
 
 
+    /**
+     * Check that the cache dir is existing and writeable
+     * @throws Exception
+     */
     public static function checkCacheDir()
     {
 

From 9d21d4d720da4b928a5040055ddf2c7d73e458d0 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 15 Apr 2019 14:59:55 +0200
Subject: [PATCH 172/254] Using the cache for the compile result :   * storing
 the compile result and the list of the parsed files   * when getting result
 from a cache, check all parsed files for their timestamp. If any changed do
 not use the cache but compile again

Without any cache_options set on the compiler nothing changes.
With cache_options set, The compile() called on an unchanged BS4 compilation only takes few ms, and if any file change, only the needed parts are parsed again while the whole is re-compiled
Allow easy on the fly framework compilation without performance struggling
---
 src/Compiler.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 7bc2b69e..9b612fae 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -175,6 +175,20 @@ public function __construct($cache_options = null)
         }
     }
 
+    public function getCompileOptions()
+    {
+        $options = array(
+            'importPaths' => $this->importPaths,
+            'registeredVars' => $this->registeredVars,
+            'registeredFeatures' => $this->registeredFeatures,
+            'encoding' => $this->encoding,
+            'sourceMap' => serialize($this->sourceMap),
+            'sourceMapOptions' => $this->sourceMapOptions,
+            'formater' => $this->formatter,
+        );
+        return $options;
+    }
+
     /**
      * Compile scss
      *
@@ -187,6 +201,29 @@ public function __construct($cache_options = null)
      */
     public function compile($code, $path = null)
     {
+
+        if ($this->cache) {
+            $cache_key = ($path ? $path : "(stdin)") . ":" . md5($code);
+            $compile_options = $this->getCompileOptions();
+            $cache = $this->cache->getCache("compile", $cache_key, $compile_options);
+            if (is_array($cache)
+                and isset($cache['dependencies'])
+                and isset($cache['out']) ) {
+                // check if any dependency file changed before accepting the cache
+                foreach ($cache['dependencies'] as $file => $mtime) {
+                    if (!file_exists($file)
+                        or filemtime($file) !== $mtime) {
+                        unset($cache);
+                        break;
+                    }
+                }
+                if (isset($cache)) {
+                    return $cache['out'];
+                }
+            }
+        }
+
+
         $this->indentLevel    = -1;
         $this->extends        = [];
         $this->extendsMap     = [];
@@ -242,6 +279,14 @@ public function compile($code, $path = null)
             $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
         }
 
+        if ($this->cache and isset($cache_key) and isset($compile_options)) {
+            $v = array(
+                'dependencies' => $this->getParsedFiles(),
+                'out' => &$out,
+            );
+            $this->cache->setCache("compile", $cache_key, $v, $compile_options);
+        }
+
         return $out;
     }
 

From 1b168bfee60889547e1fe55b9afdf055f6d3c58d Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 9 May 2019 14:51:51 -0400
Subject: [PATCH 173/254] Bump to 0.8.2; requires php 5.6+

---
 .travis.yml     | 2 --
 scss.inc.php    | 4 ++--
 src/Version.php | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 710b72f8..ccbbf00b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,6 @@ language: php
 sudo: false
 
 php:
-  - 5.4
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
diff --git a/scss.inc.php b/scss.inc.php
index d75ecb55..cdfc7992 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -1,6 +1,6 @@
 <?php
-if (version_compare(PHP_VERSION, '5.4') < 0) {
-    throw new \Exception('scssphp requires PHP 5.4 or above');
+if (version_compare(PHP_VERSION, '5.6') < 0) {
+    throw new \Exception('scssphp requires PHP 5.6 or above');
 }
 
 if (! class_exists('Leafo\ScssPhp\Version', false)) {
diff --git a/src/Version.php b/src/Version.php
index d2ef8185..19a6a02c 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.8.1';
+    const VERSION = 'v0.8.2';
 }

From 6c8e5fe0c2d1c1a8e5253396b91755a36ce6f0fe Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 9 May 2019 14:56:41 -0400
Subject: [PATCH 174/254] Use instanceof instead. (But still keeping the php
 5.6+ requirement.)

---
 src/Compiler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 75accf8e..b69cf43c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1490,7 +1490,7 @@ protected function compileChildren($stms, OutputBlock $out)
     protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null)
     {
         foreach ($stms as $stm) {
-            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && get_class($stm[1]) === Block::class) {
+            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && $stm[1] instanceof Block) {
                 $stm[1]->selfParent = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 $stm[1]->selfParent = null;
@@ -2138,7 +2138,7 @@ protected function compileChild($child, OutputBlock $out)
                         $parent->selectors = $parentSelectors;
 
                         foreach ($mixin->children as $k => $child) {
-                            if (isset($child[1]) && is_object($child[1]) && get_class($child[1]) === Block::class) {
+                            if (isset($child[1]) && is_object($child[1]) && $child[1] instanceof Block) {
                                 $mixin->children[$k][1]->parent = $parent;
                             }
                         }

From 394da81242bf3b4ef97a3cec90b06ce8b1a073dc Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 10 May 2019 07:50:02 -0400
Subject: [PATCH 175/254] bump composer's php requirement

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7591662e..21590ebe 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "psr-4": { "Leafo\\ScssPhp\\Test\\": "tests/" }
     },
     "require": {
-        "php": ">=5.4.0"
+        "php": ">=5.6.0"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.5",

From 3adab756ef5d91122b60c3bc16c68184b71a306a Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 16:35:55 +0200
Subject: [PATCH 176/254] Test case for
 https://github.com/leafo/scssphp/issues/567

---
 tests/inputs/extends.scss          | 13 +++++++++++++
 tests/outputs/extends.css          |  3 +++
 tests/outputs_numbered/extends.css |  9 +++++++++
 3 files changed, 25 insertions(+)

diff --git a/tests/inputs/extends.scss b/tests/inputs/extends.scss
index bd0ed959..376cec95 100644
--- a/tests/inputs/extends.scss
+++ b/tests/inputs/extends.scss
@@ -387,3 +387,16 @@ embed.bar {
 .class3:not(:last-child) {
 	@extend .class1;
 }
+
+%corners {
+  border-radius: 5px;
+}
+.inline-menu {
+    &:hover > .sub-menu {
+      @extend %corners;
+    }
+}
+
+.header-menu {
+  @extend .inline-menu;
+}
\ No newline at end of file
diff --git a/tests/outputs/extends.css b/tests/outputs/extends.css
index 15a80f3b..1a713241 100644
--- a/tests/outputs/extends.css
+++ b/tests/outputs/extends.css
@@ -166,3 +166,6 @@ div.popup, .prepend div.foo {
 
 .class1:not(:last-child), .class2:not(.foo):not(:last-child), .class3:not(:last-child) {
   color: red; }
+
+.inline-menu:hover > .sub-menu, .header-menu:hover > .sub-menu {
+  border-radius: 5px; }
diff --git a/tests/outputs_numbered/extends.css b/tests/outputs_numbered/extends.css
index 0a81b240..2b0154a3 100644
--- a/tests/outputs_numbered/extends.css
+++ b/tests/outputs_numbered/extends.css
@@ -269,3 +269,12 @@ div.popup, .prepend div.foo {
   color: red; }
 /* line 383, inputs/extends.scss */
 /* line 387, inputs/extends.scss */
+
+/* line 391, inputs/extends.scss */
+
+.inline-menu:hover > .sub-menu, .header-menu:hover > .sub-menu {
+  border-radius: 5px; }
+/* line 394, inputs/extends.scss */
+/* line 395, inputs/extends.scss */
+
+/* line 400, inputs/extends.scss */

From 2e8b3c0aa2a9a22a505a8fca1d782f239bc502b2 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 14:24:31 +0200
Subject: [PATCH 177/254] Fix https://github.com/leafo/scssphp/issues/567 :
 recursive check for @extend should not skip part

---
 src/Compiler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index b69cf43c..1493e50f 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -528,7 +528,8 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                     $out[] = $result;
 
                     // recursively check for more matches
-                    $this->matchExtends($result, $out, count($before) + count($mergedBefore), false);
+                    $startRecursFrom = count($before) + min(count($nonBreakableBefore), count($mergedBefore));
+                    $this->matchExtends($result, $out, $startRecursFrom, false);
 
                     // selector sequence merging
                     if (! empty($before) && count($new) > 1) {

From 3533dc2959c4846649d9e0713fcf05d862e96c2c Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 16:32:13 +0200
Subject: [PATCH 178/254] Test case for
 https://github.com/leafo/scssphp/issues/67

---
 tests/inputs/extends_nesting.scss          | 16 ++++++++++++++++
 tests/outputs/extends_nesting.css          |  5 +++++
 tests/outputs_numbered/extends_nesting.css | 10 ++++++++++
 3 files changed, 31 insertions(+)

diff --git a/tests/inputs/extends_nesting.scss b/tests/inputs/extends_nesting.scss
index 0cae18dc..65294db5 100644
--- a/tests/inputs/extends_nesting.scss
+++ b/tests/inputs/extends_nesting.scss
@@ -42,3 +42,19 @@
         @extend .btn;
     }
 }
+
+
+.nav-bar {
+    background: #eee;
+    > .item {
+        margin: 0 10px;
+    }
+}
+
+header ul {
+    @extend .nav-bar;
+    > li {
+        @extend .item;
+    }
+}
+
diff --git a/tests/outputs/extends_nesting.css b/tests/outputs/extends_nesting.css
index 42329481..af3b841a 100644
--- a/tests/outputs/extends_nesting.css
+++ b/tests/outputs/extends_nesting.css
@@ -26,3 +26,8 @@
   content: "dropupbtn"; }
   .dropup.btn.caret, .extend .the-button.dropup.caret {
     content: "dropupbtncaret"; }
+
+.nav-bar, header ul {
+  background: #eee; }
+  .nav-bar > .item, header ul > .item, header ul > li, header ul.nav-bar > li {
+    margin: 0 10px; }
diff --git a/tests/outputs_numbered/extends_nesting.css b/tests/outputs_numbered/extends_nesting.css
index 08c3027d..54f503e6 100644
--- a/tests/outputs_numbered/extends_nesting.css
+++ b/tests/outputs_numbered/extends_nesting.css
@@ -35,3 +35,13 @@
 /* line 40, inputs/extends_nesting.scss */
 
 /* line 41, inputs/extends_nesting.scss */
+
+/* line 47, inputs/extends_nesting.scss */
+
+.nav-bar, header ul {
+  background: #eee; }
+/* line 49, inputs/extends_nesting.scss */
+.nav-bar > .item, header ul > .item, header ul > li, header ul.nav-bar > li {
+  margin: 0 10px; }
+/* line 54, inputs/extends_nesting.scss */
+/* line 56, inputs/extends_nesting.scss */

From e954da5cb1494b2531cec3b78ef88c3bb6b381a7 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 15:48:09 +0200
Subject: [PATCH 179/254] mergeDirectRelationships : 1 bug from refactoring and
 1 from initial proposal

---
 src/Compiler.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 1493e50f..ff0119cd 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1668,13 +1668,12 @@ protected function mergeDirectRelationships($selectors1, $selectors2)
             $part1 = array_pop($selectors1);
             $part2 = array_pop($selectors2);
 
-            if ($this->isImmediateRelationshipCombinator($part1[0]) && $part1 !== $part2) {
+            if (! $this->isImmediateRelationshipCombinator($part1[0]) || $part1 !== $part2) {
                 $merged = array_merge($selectors1, [$part1], $selectors2, [$part2], $merged);
                 break;
             }
 
             array_unshift($merged, $part1);
-            array_unshift($merged, [array_pop($selectors1)[0] . array_pop($selectors2)[0]]);
         } while (! empty($selectors1) && ! empty($selectors2));
 
         return $merged;

From ecc476bb499c66bad2bfe82a0dec6c8515b5356b Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 16:12:49 +0200
Subject: [PATCH 180/254] Fix mergeDirectRelationships

---
 src/Compiler.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index ff0119cd..d002548b 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1658,7 +1658,7 @@ protected function mergeDirectRelationships($selectors1, $selectors2)
         $part1 = end($selectors1);
         $part2 = end($selectors2);
 
-        if (! $this->isImmediateRelationshipCombinator($part1[0]) || $part1 !== $part2) {
+        if (! $this->isImmediateRelationshipCombinator($part1[0]) && $part1 !== $part2) {
             return array_merge($selectors1, $selectors2);
         }
 
@@ -1668,8 +1668,13 @@ protected function mergeDirectRelationships($selectors1, $selectors2)
             $part1 = array_pop($selectors1);
             $part2 = array_pop($selectors2);
 
-            if (! $this->isImmediateRelationshipCombinator($part1[0]) || $part1 !== $part2) {
-                $merged = array_merge($selectors1, [$part1], $selectors2, [$part2], $merged);
+            if (! $this->isImmediateRelationshipCombinator($part1[0]) && $part1 !== $part2) {
+                if ($this->isImmediateRelationshipCombinator(reset($merged)[0])) {
+                    array_unshift($merged, [$part1[0] . $part2[0]]);
+                    $merged = array_merge($selectors1, $selectors2, $merged);
+                } else {
+                    $merged = array_merge($selectors1, [$part1], $selectors2, [$part2], $merged);
+                }
                 break;
             }
 

From bdbd194150bf4c3ca9eef29ee4a7ea9f82c1c0c3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 16:14:10 +0200
Subject: [PATCH 181/254] Fix https://github.com/leafo/scssphp/issues/67 :
 shared part should be removed if initial or recurse call but only if several
 elements in the new selector

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index d002548b..6f11a83c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -484,7 +484,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                     $k = 0;
 
                     // remove shared parts
-                    if ($initial) {
+                    if (count($new)>1) {
                         while ($k < $i && isset($new[$k]) && $selector[$k] === $new[$k]) {
                             $k++;
                         }

From c794e20a420eaa314307beccbcc82c8a1b0e30b5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 15:54:20 +0200
Subject: [PATCH 182/254] Slight optimisation

---
 src/Compiler.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 6f11a83c..20c569fa 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -568,6 +568,11 @@ protected function matchExtendsSingle($rawSingle, &$outOrigin)
         $counts = [];
         $single = [];
 
+        // simple usual cases, no need to do the whole trick
+        if (in_array($rawSingle, [['>'],['+'],['~']])) {
+            return false;
+        }
+
         foreach ($rawSingle as $part) {
             // matches Number
             if (! is_string($part)) {

From 98f950580e15ebb69d275048b33ab2e42086fcf6 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 17:53:05 +0200
Subject: [PATCH 183/254] Test case for
 https://github.com/leafo/scssphp/issues/371 and combinatorial self

---
 tests/inputs/selectors.scss          | 7 +++++++
 tests/outputs/selectors.css          | 3 +++
 tests/outputs_numbered/selectors.css | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/tests/inputs/selectors.scss b/tests/inputs/selectors.scss
index 4c902820..36ae5a2b 100644
--- a/tests/inputs/selectors.scss
+++ b/tests/inputs/selectors.scss
@@ -280,3 +280,10 @@ $all: $span, $p, $div;
         content: "should match .parent + .parent";
     }
 }
+
+// combinatorial self
+ul, ol {
+    & & {
+        display: block;
+    }
+}
diff --git a/tests/outputs/selectors.css b/tests/outputs/selectors.css
index a08b904f..64d55926 100644
--- a/tests/outputs/selectors.css
+++ b/tests/outputs/selectors.css
@@ -367,3 +367,6 @@ span a, p a, div a {
     content: "should match .self1 .parent"; }
   .parent + .parent {
     content: "should match .parent + .parent"; }
+
+ul ul, ul ol, ol ul, ol ol {
+  display: block; }
diff --git a/tests/outputs_numbered/selectors.css b/tests/outputs_numbered/selectors.css
index 56fdbfa6..d2572233 100644
--- a/tests/outputs_numbered/selectors.css
+++ b/tests/outputs_numbered/selectors.css
@@ -402,3 +402,8 @@ span a, p a, div a {
 /* line 279, inputs/selectors.scss */
 .parent + .parent {
   content: "should match .parent + .parent"; }
+/* line 285, inputs/selectors.scss */
+/* line 286, inputs/selectors.scss */
+
+ul ul, ul ol, ol ul, ol ol {
+  display: block; }

From 52d0c019c9f5777c0143cf246d3c4113d91c9718 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 17:39:48 +0200
Subject: [PATCH 184/254] Fix https://github.com/leafo/scssphp/issues/371 : to
 combine multiples self you need to replace only one each time and iterate on
 parents as long as there is still self in the result

---
 src/Compiler.php | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index b69cf43c..2f7b7567 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3200,29 +3200,28 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
                 continue;
             }
 
-            $selectors = [];
-
-            foreach ($env->selectors as $selector) {
-                foreach ($parentSelectors as $parent) {
-                    if ($selfParentSelectors) {
-                        $previous = null;
-
-                        foreach ($selfParentSelectors as $selfParent) {
-                            // if no '&' in the selector, each call will give same result, only add once
-                            $s = $this->joinSelectors($parent, $selector, $selfParent);
-
-                            if ($s !== $previous) {
+            $selectors = $env->selectors;
+
+            do {
+                $stillHasSelf = false;
+                $prevSelectors = $selectors;
+                $selectors = [];
+
+                foreach ($prevSelectors as $selector) {
+                    foreach ($parentSelectors as $parent) {
+                        if ($selfParentSelectors) {
+                            foreach ($selfParentSelectors as $selfParent) {
+                                // if no '&' in the selector, each call will give same result, only add once
+                                $s = $this->joinSelectors($parent, $selector, $stillHasSelf, $selfParent);
                                 $selectors[serialize($s)] = $s;
                             }
-
-                            $previous = $s;
+                        } else {
+                            $s = $this->joinSelectors($parent, $selector,$stillHasSelf);
+                            $selectors[serialize($s)] = $s;
                         }
-                    } else {
-                        $s = $this->joinSelectors($parent, $selector);
-                        $selectors[serialize($s)] = $s;
                     }
                 }
-            }
+            } while ($stillHasSelf);
 
             $parentSelectors = $selectors;
         }
@@ -3237,11 +3236,12 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
      *
      * @param array $parent
      * @param array $child
+     * @param bool  &$stillHasSelf
      * @param array $selfParentSelectors
 
      * @return array
      */
-    protected function joinSelectors($parent, $child, $selfParentSelectors = null)
+    protected function joinSelectors($parent, $child, &$stillHasSelf, $selfParentSelectors = null)
     {
         $setSelf = false;
         $out = [];
@@ -3250,7 +3250,11 @@ protected function joinSelectors($parent, $child, $selfParentSelectors = null)
             $newPart = [];
 
             foreach ($part as $p) {
-                if ($p === static::$selfSelector) {
+                // only replace & once and should be recalled to be able to make combinations
+                if ($p === static::$selfSelector && $setSelf) {
+                    $stillHasSelf = true;
+                }
+                if ($p === static::$selfSelector && !$setSelf) {
                     $setSelf = true;
 
                     if (is_null($selfParentSelectors)) {

From 390559846dec26d76176defe530988acfec5f4e8 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 20:24:09 +0200
Subject: [PATCH 185/254] Test case for
 https://github.com/leafo/scssphp/issues/522

---
 tests/inputs/extending_compound_selector.scss | 24 +++++++++++++++++++
 tests/outputs/extending_compound_selector.css |  6 +++++
 .../extending_compound_selector.css           | 16 +++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/tests/inputs/extending_compound_selector.scss b/tests/inputs/extending_compound_selector.scss
index 669591fd..9bb65d1e 100644
--- a/tests/inputs/extending_compound_selector.scss
+++ b/tests/inputs/extending_compound_selector.scss
@@ -17,3 +17,27 @@
 .baz.bar:before {
   @extend .bar:before;
 }
+
+a {
+  color: #fff;
+}
+
+a:link {
+  @extend a;
+}
+
+a:visited {
+  @extend a;
+}
+
+a:active {
+  @extend a;
+}
+
+a:hover {
+  @extend a;
+}
+
+.nest a.some-class {
+  color: #ccc;
+}
diff --git a/tests/outputs/extending_compound_selector.css b/tests/outputs/extending_compound_selector.css
index 7e8cb599..5e14829f 100644
--- a/tests/outputs/extending_compound_selector.css
+++ b/tests/outputs/extending_compound_selector.css
@@ -2,3 +2,9 @@
   color: red; }
   .foo:hover:after, .bar:hover:after, .bar:before:hover, .baz.bar:before:hover {
     color: blue; }
+
+a, a:link, a:visited, a:active, a:hover {
+  color: #fff; }
+
+.nest a.some-class, .nest a:link.some-class, .nest a:visited.some-class, .nest a:active.some-class, .nest a:hover.some-class {
+  color: #ccc; }
diff --git a/tests/outputs_numbered/extending_compound_selector.css b/tests/outputs_numbered/extending_compound_selector.css
index 50685dcf..5be74586 100644
--- a/tests/outputs_numbered/extending_compound_selector.css
+++ b/tests/outputs_numbered/extending_compound_selector.css
@@ -9,3 +9,19 @@
 /* line 12, inputs/extending_compound_selector.scss */
 
 /* line 17, inputs/extending_compound_selector.scss */
+
+/* line 21, inputs/extending_compound_selector.scss */
+
+a, a:link, a:visited, a:active, a:hover {
+  color: #fff; }
+/* line 25, inputs/extending_compound_selector.scss */
+/* line 29, inputs/extending_compound_selector.scss */
+
+/* line 33, inputs/extending_compound_selector.scss */
+
+/* line 37, inputs/extending_compound_selector.scss */
+
+/* line 41, inputs/extending_compound_selector.scss */
+
+.nest a.some-class, .nest a:link.some-class, .nest a:visited.some-class, .nest a:active.some-class, .nest a:hover.some-class {
+  color: #ccc; }

From fddfd416aeb70a3cfc878feaaf02717ac7892c19 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Fri, 10 May 2019 20:24:30 +0200
Subject: [PATCH 186/254] Fix https://github.com/leafo/scssphp/issues/522 :
 avoid infinite loop of @extend

---
 src/Compiler.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 20c569fa..c7207258 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -467,6 +467,7 @@ protected function glueFunctionSelectors($parts)
      */
     protected function matchExtends($selector, &$out, $from = 0, $initial = true)
     {
+        static $partsPile = [];
         $selector = $this->glueFunctionSelectors($selector);
 
         foreach ($selector as $i => $part) {
@@ -474,7 +475,18 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                 continue;
             }
 
+            // check that we are not building an infinite loop of extensions
+            // if the new part is just including a previous part don't try to extend anymore
+            if (count($part) > 1) {
+                foreach ($partsPile as $previousPart) {
+                    if (! count(array_diff($previousPart, $part))) {
+                        continue 2;
+                    }
+                }
+            }
+
             if ($this->matchExtendsSingle($part, $origin)) {
+                $partsPile[] = $part;
                 $after = array_slice($selector, $i + 1);
                 $before = array_slice($selector, 0, $i);
 
@@ -551,6 +563,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                         $out[] = $result2;
                     }
                 }
+                array_pop($partsPile);
             }
         }
     }

From 5c398061ffece09944885f955f2f6be5600b6412 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sat, 11 May 2019 11:35:15 +0200
Subject: [PATCH 187/254] define a upper bound for the php version requirement

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 21590ebe..62153e7b 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "psr-4": { "Leafo\\ScssPhp\\Test\\": "tests/" }
     },
     "require": {
-        "php": ">=5.6.0"
+        "php": "^5.6.0 || ^7"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.5",

From 5f854d474b5bf14be94fbe5c5c634ddc83c8b5a3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 10:14:04 +0200
Subject: [PATCH 188/254] push/pop in call stack all compile children call,
 only @include and function call being named and displayed in error messages

---
 src/Compiler.php | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index b69cf43c..2ad2bed2 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1462,11 +1462,13 @@ protected function popCallStack()
      *
      * @param array                                $stms
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
+     * @param string                               $traceName
      *
      * @return array|null
      */
-    protected function compileChildren($stms, OutputBlock $out)
+    protected function compileChildren($stms, OutputBlock $out, $traceName = '')
     {
+        $this->pushCallStack($traceName);
         foreach ($stms as $stm) {
             $ret = $this->compileChild($stm, $out);
 
@@ -1474,6 +1476,7 @@ protected function compileChildren($stms, OutputBlock $out)
                 return $ret;
             }
         }
+        $this->popCallStack();
 
         return null;
     }
@@ -1484,11 +1487,13 @@ protected function compileChildren($stms, OutputBlock $out)
      * @param array                                $stms
      * @param \Leafo\ScssPhp\Formatter\OutputBlock $out
      * @param \Leafo\ScssPhp\Block                 $selfParent
+     * @param string                               $traceName
      *
      * @throws \Exception
      */
-    protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null)
+    protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null, $traceName = '')
     {
+        $this->pushCallStack($traceName);
         foreach ($stms as $stm) {
             if ($selfParent && isset($stm[1]) && is_object($stm[1]) && $stm[1] instanceof Block) {
                 $stm[1]->selfParent = $selfParent;
@@ -1508,6 +1513,7 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
                 return;
             }
         }
+        $this->popCallStack();
     }
 
 
@@ -2160,9 +2166,7 @@ protected function compileChild($child, OutputBlock $out)
 
                 $this->env->marker = 'mixin';
 
-                $this->pushCallStack($this->env->marker . " " . $name);
-                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent);
-                $this->popCallStack();
+                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent, $this->env->marker . " " . $name);
 
                 $this->storeEnv = $storeEnv;
 
@@ -3905,15 +3909,20 @@ public function throwError($msg)
         $msg = "$msg: $loc";
 
         if ($this->callStack) {
-            $msg .= "\nCall Stack:\n";
+            $callStackMsg = "";
             $ncall = 0;
 
             foreach (array_reverse($this->callStack) as $call) {
-                $msg .= "#" . $ncall++ . " " . $call['n'] . " ";
-                $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
-                      ? $this->sourceNames[$call[Parser::SOURCE_INDEX]]
-                      : '(unknown file)');
-                $msg .= " on line " . $call[Parser::SOURCE_LINE] . "\n";
+                if (isset($call['n']) && $call['n']) {
+                    $callStackMsg .= "#" . $ncall++ . " " . $call['n'] . " ";
+                    $callStackMsg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
+                          ? $this->sourceNames[$call[Parser::SOURCE_INDEX]]
+                          : '(unknown file)');
+                    $callStackMsg .= " on line " . $call[Parser::SOURCE_LINE] . "\n";
+                }
+            }
+            if ($callStackMsg) {
+                $msg .= "\nCall Stack:\n" . $callStackMsg;
             }
         }
 
@@ -3984,11 +3993,8 @@ protected function callScssFunction($name, $argValues, &$returnValue)
         $tmp->children = [];
 
         $this->env->marker = 'function';
-        $this->pushCallStack($this->env->marker . " " . $name);
-
-        $ret = $this->compileChildren($func->children, $tmp);
 
-        $this->popCallStack();
+        $ret = $this->compileChildren($func->children, $tmp, $this->env->marker . " " . $name);
 
         $this->storeEnv = $storeEnv;
 

From 78d9dab2748b1372be421d25c0aa539f6f357f8f Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 10:50:54 +0200
Subject: [PATCH 189/254] Use the full callStack to detect an infinite calling
 loop and throw an error when its length exceeds 1000

---
 src/Compiler.php | 44 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 2ad2bed2..807040b6 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1450,6 +1450,13 @@ protected function pushCallStack($name = '')
           Parser::SOURCE_LINE => $this->sourceLine,
           Parser::SOURCE_COLUMN => $this->sourceColumn
         ];
+        // infinite calling loop
+        if (count($this->callStack) > 1000) {
+            // not displayed but you can var_dump it to deep debug
+            $msg = $this->callStackMessage(true, 100);
+            $msg = "Infinite calling loop";
+            $this->throwError($msg);
+        }
     }
 
     protected function popCallStack()
@@ -3908,25 +3915,40 @@ public function throwError($msg)
              : "line: $line";
         $msg = "$msg: $loc";
 
-        if ($this->callStack) {
-            $callStackMsg = "";
-            $ncall = 0;
+        $callStackMsg = $this->callStackMessage();
+        if ($callStackMsg) {
+            $msg .= "\nCall Stack:\n" . $callStackMsg;
+        }
+
+        throw new CompilerException($msg);
+    }
 
+    /**
+     * @param bool $all
+     * @param null $limit
+     * @return string
+     */
+    protected function callStackMessage($all = false, $limit = null) {
+        $callStackMsg = [];
+        $ncall = 0;
+
+        if ($this->callStack) {
             foreach (array_reverse($this->callStack) as $call) {
-                if (isset($call['n']) && $call['n']) {
-                    $callStackMsg .= "#" . $ncall++ . " " . $call['n'] . " ";
-                    $callStackMsg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
+                if ($all || (isset($call['n']) && $call['n'])) {
+                    $msg = "#" . $ncall++ . " " . $call['n'] . " ";
+                    $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
                           ? $this->sourceNames[$call[Parser::SOURCE_INDEX]]
                           : '(unknown file)');
-                    $callStackMsg .= " on line " . $call[Parser::SOURCE_LINE] . "\n";
+                    $msg .= " on line " . $call[Parser::SOURCE_LINE];
+                    $callStackMsg[] = $msg;
+                    if (!is_null($limit) && $ncall>$limit) {
+                        break;
+                    }
                 }
             }
-            if ($callStackMsg) {
-                $msg .= "\nCall Stack:\n" . $callStackMsg;
-            }
         }
 
-        throw new CompilerException($msg);
+        return implode("\n", $callStackMsg);
     }
 
     /**

From 8d967ab13ee4c6ac5c534818bfc6a38e62f68d76 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 11:16:16 +0200
Subject: [PATCH 190/254] Increase callstack length thresold to be able to
 compile big framework like Foundation (erm...)

---
 src/Compiler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 807040b6..f5bdaccc 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1451,7 +1451,7 @@ protected function pushCallStack($name = '')
           Parser::SOURCE_COLUMN => $this->sourceColumn
         ];
         // infinite calling loop
-        if (count($this->callStack) > 1000) {
+        if (count($this->callStack) > 25000) {
             // not displayed but you can var_dump it to deep debug
             $msg = $this->callStackMessage(true, 100);
             $msg = "Infinite calling loop";

From 1e6ca86956d8e5a80255984644757aeeba35f65a Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 11:17:53 +0200
Subject: [PATCH 191/254] Fix https://github.com/leafo/scssphp/issues/432: If
 there is a storeEnv you should take the @content from it, even if it's emtpy,
 not pickink it from the env (which would leads to a mistaken @content)

---
 src/Compiler.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index f5bdaccc..c5a7401c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2181,8 +2181,7 @@ protected function compileChild($child, OutputBlock $out)
                 break;
 
             case Type::T_MIXIN_CONTENT:
-                $content = $this->get(static::$namespaces['special'] . 'content', false, $this->getStoreEnv())
-                         ?: $this->get(static::$namespaces['special'] . 'content', false, $this->env);
+                $content = $this->get(static::$namespaces['special'] . 'content', false, isset($this->storeEnv) ? $this->storeEnv : $this->env);
 
                 if (! $content) {
                     $content = new \stdClass();

From 1a7a8ec561564eb722b1dd8ed7679bcce8677a1c Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 11:24:45 +0200
Subject: [PATCH 192/254] PSR2

---
 src/Compiler.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index c5a7401c..62ef74d1 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -3927,7 +3927,8 @@ public function throwError($msg)
      * @param null $limit
      * @return string
      */
-    protected function callStackMessage($all = false, $limit = null) {
+    protected function callStackMessage($all = false, $limit = null)
+    {
         $callStackMsg = [];
         $ncall = 0;
 

From 0a4831e7f4a93b7f66a940c3dba8100f1afa385b Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 14:57:39 +0200
Subject: [PATCH 193/254] Test for https://github.com/leafo/scssphp/issues/684
 and combining media: 'not' is applying not only to the media type but the
 whole media expression, so it's safer to keep separate expressions as soon as
 a not and an expression is involved + you can combine a media all with any
 other type of media

---
 tests/inputs/media.scss          | 36 +++++++++++++++++
 tests/outputs/media.css          | 28 +++++++++++++-
 tests/outputs_numbered/media.css | 66 +++++++++++++++++++++-----------
 3 files changed, 106 insertions(+), 24 deletions(-)

diff --git a/tests/inputs/media.scss b/tests/inputs/media.scss
index 4389b224..adb55a20 100644
--- a/tests/inputs/media.scss
+++ b/tests/inputs/media.scss
@@ -57,6 +57,12 @@ $navbarCollapseWidth: 940px;
     }
 }
 
+@media all, b {
+    @media c {
+      color: blue;
+    }
+}
+
 $media: cree;
 $feature: -webkit-min-device-pixel-ratio;
 $value: 1.5;
@@ -213,3 +219,33 @@ dt {
     }
   }
 }
+
+a {
+  @media not all and (max-width: 450px) {
+  	@media not all and (max-width: 690px) and (orientation: portrait) {
+	  	@media (max-width: 1000px) {
+		  	color: red;
+		  }
+	  }
+  }
+}
+
+a {
+  @media not all and (max-width: 450px) {
+  	@media all and (max-width: 690px) and (orientation: portrait) {
+	  	@media (max-width: 1000px) {
+		  	color: red;
+		  }
+	  }
+  }
+}
+
+a {
+  @media all and (max-width: 450px) {
+  	@media not all and (max-width: 690px) and (orientation: portrait) {
+	  	@media not all and (max-width: 1000px) {
+		  	color: red;
+		  }
+	  }
+  }
+}
diff --git a/tests/outputs/media.css b/tests/outputs/media.css
index 0098f37a..8ef1f821 100644
--- a/tests/outputs/media.css
+++ b/tests/outputs/media.css
@@ -25,10 +25,14 @@
   color: blue;
     pre {
       color: blue; } }
-  @media butt and (world) {
+  @media not hello and (world) {
+  @media butt {
     color: red;
       div {
-        color: red; } }
+        color: red; } } }
+
+@media c {
+    color: blue; }
 
 div {
   color: blue; }
@@ -105,3 +109,23 @@ code {
 @media screen and (max-width: 749px) and (max-width: 600px) and (min-width: 361px) {
     .item {
       color: red; } }
+
+
+  @media not all and (max-width: 450px) {
+    @media not all and (max-width: 690px) and (orientation: portrait) {
+  @media (max-width: 1000px) {
+      a {
+        color: red; } } } }
+
+
+  @media not all and (max-width: 450px) {
+    @media (max-width: 690px) and (orientation: portrait) and (max-width: 1000px) {
+    a {
+      color: red; } } }
+
+
+  @media (max-width: 450px) {
+    @media not all and (max-width: 690px) and (orientation: portrait) {
+  @media not all and (max-width: 1000px) {
+      a {
+        color: red; } } } }
diff --git a/tests/outputs_numbered/media.css b/tests/outputs_numbered/media.css
index d7d1055b..58532b68 100644
--- a/tests/outputs_numbered/media.css
+++ b/tests/outputs_numbered/media.css
@@ -31,21 +31,23 @@ div {
 /* line 30, inputs/media.scss */
 pre {
   color: blue; } }
-  @media butt and (world) {
+  @media not hello and (world) {
+  @media butt {
     color: red;
 /* line 36, inputs/media.scss */
 div {
-color: red; } }
-
-/* line 64, inputs/media.scss */
+color: red; } } }
 
+@media c {
+    color: blue; }
+/* line 70, inputs/media.scss */
 div {
   color: blue; }
   @media screen and (-webkit-min-device-pixel-ratio: 1.5) {
-/* line 67, inputs/media.scss */
+/* line 73, inputs/media.scss */
 div .sidebar {
 width: 500px; } }
-/* line 81, inputs/media.scss */
+/* line 87, inputs/media.scss */
 div {
   position: absolute; }
   @media screen {
@@ -53,18 +55,18 @@ div {
     top: 0;
     bottom: 8em;
     color: red; }
-/* line 87, inputs/media.scss */
+/* line 93, inputs/media.scss */
 div p {
 margin: 5px; }
-/* line 76, inputs/media.scss */
+/* line 82, inputs/media.scss */
 div .success {
 color: green; } }
-/* line 95, inputs/media.scss */
+/* line 101, inputs/media.scss */
 .button {
   width: 300px;
   height: 100px;
   background: #eee; }
-/* line 100, inputs/media.scss */
+/* line 106, inputs/media.scss */
 .button :hover {
   background: #aaa; }
 
@@ -72,62 +74,82 @@ color: green; } }
     .button {
       width: 100px;
       height: 100px; } }
-/* line 110, inputs/media.scss */
+/* line 116, inputs/media.scss */
 code {
   position: absolute; }
 
 @media screen {
     code {
       height: 10px; }
-/* line 113, inputs/media.scss */
+/* line 119, inputs/media.scss */
 code pre {
   height: 20px; } }
-/* line 120, inputs/media.scss */
+/* line 126, inputs/media.scss */
 @media screen and (color: blue) {
       dt {
         height: 10px; } }
 
 @media screen {
-/* line 130, inputs/media.scss */
+/* line 136, inputs/media.scss */
 .screen {
   width: 12px; } }
 
 @media only screen {
-/* line 134, inputs/media.scss */
+/* line 140, inputs/media.scss */
 .only-screen {
   height: 11px; } }
 
 @media only screen {
-/* line 141, inputs/media.scss */
+/* line 147, inputs/media.scss */
 .only-screen {
   width: 14px; } }
 
 @media only screen {
-/* line 145, inputs/media.scss */
+/* line 151, inputs/media.scss */
 .only-screen {
   height: 16px; } }
 
 @media print {
-/* line 161, inputs/media.scss */
+/* line 167, inputs/media.scss */
 .only-print {
   height: 12px; } }
 
 @media screen {
-/* line 169, inputs/media.scss */
+/* line 175, inputs/media.scss */
 .only-print {
   height: 12px; } }
 
 @media not screen {
-/* line 185, inputs/media.scss */
+/* line 191, inputs/media.scss */
 .not-screen {
   height: 15px; } }
 
 @media only screen and (color: blue) and (width: 13) {
-/* line 202, inputs/media.scss */
+/* line 208, inputs/media.scss */
 .only-screen {
   height: 15px; } }
 
 @media screen and (max-width: 749px) and (max-width: 600px) and (min-width: 361px) {
-/* line 211, inputs/media.scss */
+/* line 217, inputs/media.scss */
 .item {
   color: red; } }
+/* line 223, inputs/media.scss */
+
+  @media not all and (max-width: 450px) {
+    @media not all and (max-width: 690px) and (orientation: portrait) {
+  @media (max-width: 1000px) {
+      a {
+        color: red; } } } }
+/* line 233, inputs/media.scss */
+
+  @media not all and (max-width: 450px) {
+    @media (max-width: 690px) and (orientation: portrait) and (max-width: 1000px) {
+    a {
+      color: red; } } }
+/* line 243, inputs/media.scss */
+
+  @media (max-width: 450px) {
+    @media not all and (max-width: 690px) and (orientation: portrait) {
+  @media not all and (max-width: 1000px) {
+      a {
+        color: red; } } } }

From e7d19a216c538ef01eceb35650f31022c138a7b1 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 14:59:33 +0200
Subject: [PATCH 194/254] Fix https://github.com/leafo/scssphp/issues/684:
 never merge media expressions if one has a 'not' + allow to merge media all
 with anything The fix is not super elegant but is doing the job: * when
 combining media expression, we insert a 'all' between each to know we're in a
 different @media, * in the compilation check previous and current type for a
 'not' each time we meet a media type, and if there is one (and anything else
 than media types) split * ignore any media all as they can merge with
 everything + a little trick to keep an empty '@media' as is, not adding any
 'all'

---
 src/Compiler.php | 116 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 80 insertions(+), 36 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index b69cf43c..abe03510 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -721,13 +721,17 @@ protected function compileMedia(Block $media)
     {
         $this->pushEnv($media);
 
-        $mediaQuery = $this->compileMediaQuery($this->multiplyMedia($this->env));
-
-        if (! empty($mediaQuery)) {
-            $this->scope = $this->makeOutputBlock(Type::T_MEDIA, [$mediaQuery]);
+        $mediaQueries = $this->compileMediaQuery($this->multiplyMedia($this->env));
 
+        if (! empty($mediaQueries) && $mediaQueries) {
+            $previousScope = $this->scope;
             $parentScope = $this->mediaParent($this->scope);
-            $parentScope->children[] = $this->scope;
+            foreach ($mediaQueries as $mediaQuery) {
+                $this->scope = $this->makeOutputBlock(Type::T_MEDIA, [$mediaQuery]);
+
+                $parentScope->children[] = $this->scope;
+                $parentScope = $this->scope;
+            }
 
             // top level properties in a media cause it to be wrapped
             $needsWrap = false;
@@ -736,9 +740,9 @@ protected function compileMedia(Block $media)
                 $type = $child[0];
 
                 if ($type !== Type::T_BLOCK &&
-                    $type !== Type::T_MEDIA &&
-                    $type !== Type::T_DIRECTIVE &&
-                    $type !== Type::T_IMPORT
+                  $type !== Type::T_MEDIA &&
+                  $type !== Type::T_DIRECTIVE &&
+                  $type !== Type::T_IMPORT
                 ) {
                     $needsWrap = true;
                     break;
@@ -747,21 +751,21 @@ protected function compileMedia(Block $media)
 
             if ($needsWrap) {
                 $wrapped = new Block;
-                $wrapped->sourceName   = $media->sourceName;
-                $wrapped->sourceIndex  = $media->sourceIndex;
-                $wrapped->sourceLine   = $media->sourceLine;
+                $wrapped->sourceName = $media->sourceName;
+                $wrapped->sourceIndex = $media->sourceIndex;
+                $wrapped->sourceLine = $media->sourceLine;
                 $wrapped->sourceColumn = $media->sourceColumn;
-                $wrapped->selectors    = [];
-                $wrapped->comments     = [];
-                $wrapped->parent       = $media;
-                $wrapped->children     = $media->children;
+                $wrapped->selectors = [];
+                $wrapped->comments = [];
+                $wrapped->parent = $media;
+                $wrapped->children = $media->children;
 
                 $media->children = [[Type::T_BLOCK, $wrapped]];
             }
 
             $this->compileChildrenNoReturn($media->children, $this->scope);
 
-            $this->scope = $this->scope->parent;
+            $this->scope = $previousScope;
         }
 
         $this->popEnv();
@@ -1573,31 +1577,67 @@ protected function evaluateMediaQuery($queryList)
      *
      * @param array $queryList
      *
-     * @return string
+     * @return array
      */
     protected function compileMediaQuery($queryList)
     {
-        $out = '@media';
-        $first = true;
+        $start = '@media ';
+        $default = trim($start);
+        $out = [];
+        $current = "";
 
         foreach ($queryList as $query) {
             $type = null;
             $parts = [];
 
+            $mediaTypeOnly = true;
+            foreach ($query as $q) {
+                if ($q[0] !== Type::T_MEDIA_TYPE) {
+                    $mediaTypeOnly = false;
+                    break;
+                }
+            }
             foreach ($query as $q) {
                 switch ($q[0]) {
                     case Type::T_MEDIA_TYPE:
-                        if ($type) {
-                            $type = $this->mergeMediaTypes(
-                                $type,
-                                array_map([$this, 'compileValue'], array_slice($q, 1))
-                            );
-
-                            if (empty($type)) { // merge failed
-                                return null;
+                        $newType = array_map([$this, 'compileValue'], array_slice($q, 1));
+                        // combining not and anything else than media type is too risky and should be avoided
+                        if (! $mediaTypeOnly) {
+                            if (in_array(Type::T_NOT, $newType) || ($type && in_array(Type::T_NOT, $type) )) {
+                                if ($type) {
+                                    array_unshift($parts, implode(' ', array_filter($type)));
+                                }
+                                if (! empty($parts)) {
+                                    if (strlen($current)) {
+                                        $current .= $this->formatter->tagSeparator;
+                                    }
+                                    $current .= implode(' and ', $parts);
+                                }
+                                if ($current) {
+                                    $out[] = $start . $current;
+                                }
+                                $current = "";
+                                $type = null;
+                                $parts = [];
+                            }
+                        }
+                        if ($newType === ['all'] && $default) {
+                            $default = $start . 'all';
+                        }
+                        // all can be safely ignored and mixed with whatever else
+                        if ($newType !== ['all']) {
+                            if ($type) {
+                                $type = $this->mergeMediaTypes($type, $newType);
+
+                                if (empty($type)) {
+                                    // merge failed : ignore this query that is not valid, skip to the next one
+                                    $parts = [];
+                                    $default = ''; // if everything fail, no @media at all
+                                    continue 3;
+                                }
+                            } else {
+                                $type = $newType;
                             }
-                        } else {
-                            $type = array_map([$this, 'compileValue'], array_slice($q, 1));
                         }
                         break;
 
@@ -1626,17 +1666,21 @@ protected function compileMediaQuery($queryList)
             }
 
             if (! empty($parts)) {
-                if ($first) {
-                    $first = false;
-                    $out .= ' ';
-                } else {
-                    $out .= $this->formatter->tagSeparator;
+                if (strlen($current)) {
+                    $current .= $this->formatter->tagSeparator;
                 }
 
-                $out .= implode(' and ', $parts);
+                $current .= implode(' and ', $parts);
             }
         }
 
+        if ($current) {
+            $out[] = $start . $current;
+        }
+        // no @media type except all, and no conflict?
+        if (!$out && $default) {
+            $out[] = $default;
+        }
         return $out;
     }
 
@@ -3324,7 +3368,7 @@ protected function multiplyMedia(Environment $env = null, $childQueries = null)
 
             foreach ($parentQueries as $parentQuery) {
                 foreach ($originalQueries as $childQuery) {
-                    $childQueries []= array_merge($parentQuery, $childQuery);
+                    $childQueries []= array_merge($parentQuery, [[Type::T_MEDIA_TYPE, [Type::T_KEYWORD, 'all']]], $childQuery);
                 }
             }
         }

From 43eb9f0b7d499f6ca8d65a6bd031f779f67b1b9e Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 16:44:33 +0200
Subject: [PATCH 195/254] Fix #598: striping space around relationshop
 operators in format crunched or compressed

---
 src/Formatter/Compressed.php | 14 ++++++++++++++
 src/Formatter/Crunched.php   | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/Formatter/Compressed.php b/src/Formatter/Compressed.php
index 1faa7e11..52410b6c 100644
--- a/src/Formatter/Compressed.php
+++ b/src/Formatter/Compressed.php
@@ -59,4 +59,18 @@ public function blockLines(OutputBlock $block)
             $this->write($this->break);
         }
     }
+
+    /**
+     * Output block selectors
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $block
+     */
+    protected function blockSelectors(OutputBlock $block)
+    {
+        $inner = $this->indentStr();
+
+        $this->write($inner
+            . implode($this->tagSeparator, str_replace(array(' > ', ' + ', ' ~ '), array('>', '+', '~'), $block->selectors))
+            . $this->open . $this->break);
+    }
 }
diff --git a/src/Formatter/Crunched.php b/src/Formatter/Crunched.php
index 42d77b5f..31970255 100644
--- a/src/Formatter/Crunched.php
+++ b/src/Formatter/Crunched.php
@@ -57,4 +57,18 @@ public function blockLines(OutputBlock $block)
             $this->write($this->break);
         }
     }
+
+    /**
+     * Output block selectors
+     *
+     * @param \Leafo\ScssPhp\Formatter\OutputBlock $block
+     */
+    protected function blockSelectors(OutputBlock $block)
+    {
+        $inner = $this->indentStr();
+
+        $this->write($inner
+            . implode($this->tagSeparator, str_replace(array(' > ', ' + ', ' ~ '), array('>', '+', '~'), $block->selectors))
+            . $this->open . $this->break);
+    }
 }

From d1bdc4f1d1b03630b167a64eef60fa00b8d17ad2 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 16:20:37 +0200
Subject: [PATCH 196/254] Fix proposal for #475: generate line number in
 wrapped media blocks with option --line-numbers

---
 src/Compiler.php                         | 24 +++++++++++
 tests/outputs_numbered/at_root.css       | 12 +++---
 tests/outputs_numbered/content.css       | 14 ++++---
 tests/outputs_numbered/media.css         | 53 ++++++++++++++----------
 tests/outputs_numbered/mixins.css        |  5 ++-
 tests/outputs_numbered/nested_mixins.css |  9 ++--
 tests/outputs_numbered/scss_css.css      |  6 ++-
 7 files changed, 83 insertions(+), 40 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 5191b713..54ba4753 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -832,6 +832,30 @@ protected function compileMedia(Block $media)
                 $wrapped->children = $media->children;
 
                 $media->children = [[Type::T_BLOCK, $wrapped]];
+                if (isset($this->lineNumberStyle)) {
+                    $annotation = $this->makeOutputBlock(Type::T_COMMENT);
+                    $annotation->depth = 0;
+
+                    $file = $this->sourceNames[$media->sourceIndex];
+                    $line = $media->sourceLine;
+
+                    switch ($this->lineNumberStyle) {
+                        case static::LINE_COMMENTS:
+                            $annotation->lines[] = '/* line ' . $line
+                                                 . ($file ? ', ' . $file : '')
+                                                 . ' */';
+                            break;
+
+                        case static::DEBUG_INFO:
+                            $annotation->lines[] = '@media -sass-debug-info{'
+                                                 . ($file ? 'filename{font-family:"' . $file . '"}' : '')
+                                                 . 'line{font-family:' . $line . '}}';
+                            break;
+                    }
+
+                    $this->scope->children[] = $annotation;
+                }
+
             }
 
             $this->compileChildrenNoReturn($media->children, $this->scope);
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index c170305c..d57926ab 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -45,9 +45,10 @@ body .second {
   color: red; }
 /* line 49, inputs/at_root.scss */
 @media (min-width: 300px) {
-    /* line 51, inputs/at_root.scss */
-      .my-widget .inside-mq {
-        inside-style: mq; } }
+/* line 50, inputs/at_root.scss */
+/* line 51, inputs/at_root.scss */
+  .my-widget .inside-mq {
+    inside-style: mq; } }
 
 /* line 56, inputs/at_root.scss */
 .my-widget .outside-mq {
@@ -146,8 +147,9 @@ a.badge-secondary:focus, a.badge-secondary.focus {
   display: inline-block; }
 
 @media (prefers-reduced-motion: reduce) {
-    .badge {
-      transition: none; } }
+/* line 194, inputs/at_root.scss */
+.badge {
+  transition: none; } }
 /* line 210, inputs/at_root.scss */
 /* line 200, inputs/at_root.scss */
 
diff --git a/tests/outputs_numbered/content.css b/tests/outputs_numbered/content.css
index 9d49e316..c01a1085 100644
--- a/tests/outputs_numbered/content.css
+++ b/tests/outputs_numbered/content.css
@@ -9,9 +9,10 @@
   border-color: blue; }
 
 @media only screen and (max-width: 480px) {
-  /* line 32, inputs/content.scss */
-    body {
-      color: red; } }
+/* line 26, inputs/content.scss */
+/* line 32, inputs/content.scss */
+  body {
+    color: red; } }
 /* line 36, inputs/content.scss */
 #sidebar {
   width: 300px; }
@@ -20,9 +21,10 @@
     width: 100px; } }
 
 @media only screen and (min-width: 40em) {
-  /* line 51, inputs/content.scss */
-    .grid-1 {
-      width: 100%; }
+/* line 46, inputs/content.scss */
+/* line 51, inputs/content.scss */
+  .grid-1 {
+    width: 100%; }
 /* line 51, inputs/content.scss */
 .grid-2 {
   width: 100%; } }
diff --git a/tests/outputs_numbered/media.css b/tests/outputs_numbered/media.css
index 58532b68..09a2b053 100644
--- a/tests/outputs_numbered/media.css
+++ b/tests/outputs_numbered/media.css
@@ -24,22 +24,26 @@ div {
   color: blue; } }
 
 @media (max-width: 940px) {
-  color: red; }
+/* line 23, inputs/media.scss */
+color: red; }
 
 @media not hello and (world) {
-  color: blue;
+/* line 28, inputs/media.scss */
+color: blue;
 /* line 30, inputs/media.scss */
 pre {
   color: blue; } }
   @media not hello and (world) {
   @media butt {
-    color: red;
+/* line 34, inputs/media.scss */
+color: red;
 /* line 36, inputs/media.scss */
 div {
 color: red; } } }
 
 @media c {
-    color: blue; }
+/* line 61, inputs/media.scss */
+color: blue; }
 /* line 70, inputs/media.scss */
 div {
   color: blue; }
@@ -51,10 +55,11 @@ width: 500px; } }
 div {
   position: absolute; }
   @media screen {
-  div {
-    top: 0;
-    bottom: 8em;
-    color: red; }
+/* line 90, inputs/media.scss */
+div {
+top: 0;
+bottom: 8em;
+color: red; }
 /* line 93, inputs/media.scss */
 div p {
 margin: 5px; }
@@ -71,23 +76,26 @@ color: green; } }
   background: #aaa; }
 
 @media only screen and (max-width: 300px) {
-    .button {
-      width: 100px;
-      height: 100px; } }
+/* line 110, inputs/media.scss */
+.button {
+  width: 100px;
+  height: 100px; } }
 /* line 116, inputs/media.scss */
 code {
   position: absolute; }
 
 @media screen {
-    code {
-      height: 10px; }
+/* line 118, inputs/media.scss */
+code {
+  height: 10px; }
 /* line 119, inputs/media.scss */
 code pre {
   height: 20px; } }
 /* line 126, inputs/media.scss */
 @media screen and (color: blue) {
-      dt {
-        height: 10px; } }
+/* line 128, inputs/media.scss */
+dt {
+  height: 10px; } }
 
 @media screen {
 /* line 136, inputs/media.scss */
@@ -138,18 +146,21 @@ code pre {
   @media not all and (max-width: 450px) {
     @media not all and (max-width: 690px) and (orientation: portrait) {
   @media (max-width: 1000px) {
-      a {
-        color: red; } } } }
+/* line 226, inputs/media.scss */
+a {
+color: red; } } } }
 /* line 233, inputs/media.scss */
 
   @media not all and (max-width: 450px) {
     @media (max-width: 690px) and (orientation: portrait) and (max-width: 1000px) {
-    a {
-      color: red; } } }
+/* line 236, inputs/media.scss */
+a {
+color: red; } } }
 /* line 243, inputs/media.scss */
 
   @media (max-width: 450px) {
     @media not all and (max-width: 690px) and (orientation: portrait) {
   @media not all and (max-width: 1000px) {
-      a {
-        color: red; } } } }
+/* line 246, inputs/media.scss */
+a {
+color: red; } } } }
diff --git a/tests/outputs_numbered/mixins.css b/tests/outputs_numbered/mixins.css
index ed1f4ffb..b9f67f52 100644
--- a/tests/outputs_numbered/mixins.css
+++ b/tests/outputs_numbered/mixins.css
@@ -106,8 +106,9 @@ div.parameter-name-scope {
   color: red; } }
 /* line 190, inputs/mixins.scss */
 @media screen and (min-width:0\0) {
-    .test {
-      color: #000; } }
+/* line 186, inputs/mixins.scss */
+.test {
+  color: #000; } }
 /* line 197, inputs/mixins.scss */
 div {
   content: "div";
diff --git a/tests/outputs_numbered/nested_mixins.css b/tests/outputs_numbered/nested_mixins.css
index 74e86c18..880ee491 100644
--- a/tests/outputs_numbered/nested_mixins.css
+++ b/tests/outputs_numbered/nested_mixins.css
@@ -14,10 +14,11 @@ div .container .bar {
   width: 12px; }
 
 @media print, screen and (min-width:640px) {
-  /* line 43, inputs/nested_mixins.scss */
-    .position-left {
-      color: red;
-      background: yellow; } }
+/* line 33, inputs/nested_mixins.scss */
+/* line 43, inputs/nested_mixins.scss */
+  .position-left {
+    color: red;
+    background: yellow; } }
 
 @media print, screen and (min-width:640px) {
 /* line 45, inputs/nested_mixins.scss */
diff --git a/tests/outputs_numbered/scss_css.css b/tests/outputs_numbered/scss_css.css
index f2336adc..dd19dda4 100644
--- a/tests/outputs_numbered/scss_css.css
+++ b/tests/outputs_numbered/scss_css.css
@@ -364,10 +364,12 @@ rule2 {
   prop: val; } }
 
 @media screen and (-webkit-min-device-pixel-ratio: 0) {
-  a: b; }
+/* line 440, inputs/scss_css.scss */
+a: b; }
 
 @media only screen, print and (foo: 0px) and (bar: flam(12px solid)) {
-  a: b; }
+/* line 444, inputs/scss_css.scss */
+a: b; }
 /* line 448, inputs/scss_css.scss */
 :-moz-any(h1, h2, h3) {
   a: b; }

From 4f992fcdb253d61701caaf132fba19a0e116e738 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 17:57:10 +0200
Subject: [PATCH 197/254] Test case for interpolation as a plceholder name
 https://github.com/leafo/scssphp/issues/510

---
 tests/inputs/extends.scss          | 12 +++++++++++-
 tests/outputs/extends.css          |  3 +++
 tests/outputs_numbered/extends.css |  6 ++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/tests/inputs/extends.scss b/tests/inputs/extends.scss
index 376cec95..a36b7e31 100644
--- a/tests/inputs/extends.scss
+++ b/tests/inputs/extends.scss
@@ -399,4 +399,14 @@ embed.bar {
 
 .header-menu {
   @extend .inline-menu;
-}
\ No newline at end of file
+}
+
+$placeholdername: 'myplaceholder';
+%#{$placeholdername} {
+  color: red;
+}
+.myclass {
+  @extend %myplaceholder;
+}
+
+
diff --git a/tests/outputs/extends.css b/tests/outputs/extends.css
index 1a713241..bd6b0c9f 100644
--- a/tests/outputs/extends.css
+++ b/tests/outputs/extends.css
@@ -169,3 +169,6 @@ div.popup, .prepend div.foo {
 
 .inline-menu:hover > .sub-menu, .header-menu:hover > .sub-menu {
   border-radius: 5px; }
+
+.myclass {
+  color: red; }
diff --git a/tests/outputs_numbered/extends.css b/tests/outputs_numbered/extends.css
index 2b0154a3..eeffb9c7 100644
--- a/tests/outputs_numbered/extends.css
+++ b/tests/outputs_numbered/extends.css
@@ -278,3 +278,9 @@ div.popup, .prepend div.foo {
 /* line 395, inputs/extends.scss */
 
 /* line 400, inputs/extends.scss */
+
+/* line 405, inputs/extends.scss */
+
+.myclass {
+  color: red; }
+/* line 408, inputs/extends.scss */

From da4d77cc97dc70040febef5a2f185a4b5b5f1462 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 18:02:18 +0200
Subject: [PATCH 198/254] Fix https://github.com/leafo/scssphp/issues/510 : the
 interpolation is a placeholder

---
 src/Parser.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 755f563c..eb264bce 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2430,14 +2430,17 @@ protected function placeholder(&$placeholder)
     {
         if ($this->match(
             $this->utf8
-                ? '([\pL\w\-_]+|#[{][$][\pL\w\-_]+[}])'
-                : '([\w\-_]+|#[{][$][\w\-_]+[}])',
+                ? '([\pL\w\-_]+)'
+                : '([\w\-_]+)',
             $m
         )) {
             $placeholder = $m[1];
 
             return true;
         }
+        if ($this->interpolation($placeholder)) {
+            return true;
+        }
 
         return false;
     }

From 38f26415b092db25cd6c583c0551e6b8d8f65756 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 13 May 2019 19:16:51 +0200
Subject: [PATCH 199/254] Fix https://github.com/leafo/scssphp/issues/585 : the
 first level of selector has to be collapsed with space

---
 src/Compiler.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 5191b713..ff646762 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1399,13 +1399,16 @@ protected function collapseSelectors($selectors)
 
         foreach ($selectors as $selector) {
             $output = '';
+            foreach ($selector as $node) {
+                $output .= ($output ? ' ' : '');
 
-            array_walk_recursive(
-                $selector,
-                function ($value, $key) use (&$output) {
-                    $output .= $value;
-                }
-            );
+                array_walk_recursive(
+                    $node,
+                    function ($value, $key) use (&$output) {
+                        $output .= $value;
+                    }
+                );
+            }
 
             $parts[] = $output;
         }

From 23cf33fe76301f41b6718df61bf56239380d07ac Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 14 May 2019 09:53:47 +0200
Subject: [PATCH 200/254] Tests case for selector functions, starting with
 parent selector itself https://github.com/leafo/scssphp/issues/438 and
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 14 ++++++++++++++
 tests/outputs/selector_functions.css          |  9 +++++++++
 tests/outputs_numbered/selector_functions.css | 10 ++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 tests/inputs/selector_functions.scss
 create mode 100644 tests/outputs/selector_functions.css
 create mode 100644 tests/outputs_numbered/selector_functions.css

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
new file mode 100644
index 00000000..e97336e2
--- /dev/null
+++ b/tests/inputs/selector_functions.scss
@@ -0,0 +1,14 @@
+.foo, .bar, .foo2 .bar2, .foo3 > .bar3 {
+	@each $selector in & {
+		content: "#{$selector}";
+	}
+}
+
+
+.main aside:hover,
+.sidebar p {
+	@each $selector in & {
+		content: "#{$selector}";
+	}
+}
+
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
new file mode 100644
index 00000000..d608dc9d
--- /dev/null
+++ b/tests/outputs/selector_functions.css
@@ -0,0 +1,9 @@
+.foo, .bar, .foo2 .bar2, .foo3 > .bar3 {
+  content: ".foo";
+  content: ".bar";
+  content: ".foo2 .bar2";
+  content: ".foo3 > .bar3"; }
+
+.main aside:hover, .sidebar p {
+  content: ".main aside:hover";
+  content: ".sidebar p"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
new file mode 100644
index 00000000..7bd5f1b4
--- /dev/null
+++ b/tests/outputs_numbered/selector_functions.css
@@ -0,0 +1,10 @@
+/* line 1, inputs/selector_functions.scss */
+.foo, .bar, .foo2 .bar2, .foo3 > .bar3 {
+  content: ".foo";
+  content: ".bar";
+  content: ".foo2 .bar2";
+  content: ".foo3 > .bar3"; }
+/* line 8, inputs/selector_functions.scss */
+.main aside:hover, .sidebar p {
+  content: ".main aside:hover";
+  content: ".sidebar p"; }

From 459b92bb28fad4ccaa18d960a58c4f96160ae642 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 14 May 2019 09:57:11 +0200
Subject: [PATCH 201/254] Fix https://github.com/leafo/scssphp/issues/438 and a
 start for parent selector functions
 https://github.com/leafo/scssphp/issues/310: collapseSelectors() is extended
 and able to provide a string as well as an array in the selector format
 (comma separated list of space separated list)

---
 src/Compiler.php | 48 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index af20970e..00c307ea 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1414,30 +1414,61 @@ protected function evalSelectorPart($part)
      * Collapse selectors
      *
      * @param array $selectors
+     * @param bool $selectorFormat
+     *   if false return a collapsed string
+     *   if true return an array description of a structured selector
      *
      * @return string
      */
-    protected function collapseSelectors($selectors)
+    protected function collapseSelectors($selectors, $selectorFormat = false)
     {
         $parts = [];
 
         foreach ($selectors as $selector) {
-            $output = '';
+            $output = [];
+            $glueNext = false;
             foreach ($selector as $node) {
-                $output .= ($output ? ' ' : '');
+                $compound = '';
 
                 array_walk_recursive(
                     $node,
-                    function ($value, $key) use (&$output) {
-                        $output .= $value;
+                    function ($value, $key) use (&$compound) {
+                        $compound .= $value;
                     }
                 );
+                if ($selectorFormat && $this->isImmediateRelationshipCombinator($compound)) {
+                    if (count($output)) {
+                        $output[count($output) - 1] .= ' ' . $compound;
+                    } else {
+                        $output[] = $compound;
+                    }
+                    $glueNext = true;
+                } elseif ($glueNext) {
+                    $output[count($output) - 1] .= ' ' . $compound;
+                    $glueNext = false;
+                } else {
+                    $output[] = $compound;
+                }
             }
 
+            if ($selectorFormat) {
+                foreach ($output as &$o) {
+                    $o = [Type::T_STRING, '', [$o]];
+                }
+                $output = [Type::T_LIST, ' ', $output];
+            } else {
+                $output = implode(' ', $output);
+            }
             $parts[] = $output;
         }
 
-        return implode(', ', $parts);
+        if ($selectorFormat) {
+            $parts = [Type::T_LIST, ',', $parts];
+        } else {
+            $parts = implode(', ', $parts);
+        }
+
+        return $parts;
     }
 
     /**
@@ -2638,9 +2669,8 @@ protected function reduce($value, $inExp = false)
 
             case Type::T_SELF:
                 $selfSelector = $this->multiplySelectors($this->env);
-                $selfSelector = $this->collapseSelectors($selfSelector);
-
-                return [Type::T_STRING, '', [$selfSelector]];
+                $selfSelector = $this->collapseSelectors($selfSelector, true);
+                return $selfSelector;
 
             default:
                 return $value;

From a5a8d79629af2fdb67423c34046791e441a1f7af Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 14 May 2019 10:28:49 +0200
Subject: [PATCH 202/254] test case for
 https://github.com/leafo/scssphp/issues/486

---
 tests/inputs/interpolation.scss          | 7 +++++++
 tests/outputs/interpolation.css          | 3 +++
 tests/outputs_numbered/interpolation.css | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/tests/inputs/interpolation.scss b/tests/inputs/interpolation.scss
index 0819a7c6..45a5133b 100644
--- a/tests/inputs/interpolation.scss
+++ b/tests/inputs/interpolation.scss
@@ -132,4 +132,11 @@ div {
 
 .pagination {
   @include pagination-mixin(5px);
+}
+
+@mixin set-border($width) {
+    border: $width solid #000;
+}
+.element {
+    @include set-border(#{2px}); // compiles to "2px solid #000"
 }
\ No newline at end of file
diff --git a/tests/outputs/interpolation.css b/tests/outputs/interpolation.css
index be302600..d9fd10e5 100644
--- a/tests/outputs/interpolation.css
+++ b/tests/outputs/interpolation.css
@@ -74,3 +74,6 @@ a.badge {
 
 .pagination .page-item:first-child .page-link {
   border-radius: 5px; }
+
+.element {
+  border: 2px solid #000; }
diff --git a/tests/outputs_numbered/interpolation.css b/tests/outputs_numbered/interpolation.css
index 768df93a..da509491 100644
--- a/tests/outputs_numbered/interpolation.css
+++ b/tests/outputs_numbered/interpolation.css
@@ -93,3 +93,6 @@ a.badge {
 /* line 126, inputs/interpolation.scss */
   .pagination .page-item:first-child .page-link {
     border-radius: 5px; }
+/* line 140, inputs/interpolation.scss */
+.element {
+  border: 2px solid #000; }

From a475f369433871dc3003fc899e71131c34fdc712 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 14 May 2019 10:29:50 +0200
Subject: [PATCH 203/254] Fix https://github.com/leafo/scssphp/issues/486: take
 in account the inExp flag for reducing T_INTERPOLATE

---
 src/Compiler.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index af20970e..fa66312c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -2630,6 +2630,9 @@ protected function reduce($value, $inExp = false)
 
             case Type::T_INTERPOLATE:
                 $value[1] = $this->reduce($value[1]);
+                if ($inExp) {
+                    return $value[1];
+                }
 
                 return $value;
 

From 2b871b27abb610120d89a0692b11d4db498b13d4 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 14 May 2019 10:36:28 +0200
Subject: [PATCH 204/254] PSR2 fixes

---
 src/Compiler.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index fa66312c..02ac275c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -855,7 +855,6 @@ protected function compileMedia(Block $media)
 
                     $this->scope->children[] = $annotation;
                 }
-
             }
 
             $this->compileChildrenNoReturn($media->children, $this->scope);
@@ -3375,7 +3374,7 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
                                 $selectors[serialize($s)] = $s;
                             }
                         } else {
-                            $s = $this->joinSelectors($parent, $selector,$stillHasSelf);
+                            $s = $this->joinSelectors($parent, $selector, $stillHasSelf);
                             $selectors[serialize($s)] = $s;
                         }
                     }

From 751a8bc4c713042113ed6f9f45cf0453d65749d7 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 14 May 2019 11:25:10 +0200
Subject: [PATCH 205/254] Before reparsing a selector that need a double pass,
 you should revert [self] to & https://github.com/leafo/scssphp/issues/368

---
 src/Compiler.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index af20970e..04c4d694 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1359,6 +1359,7 @@ protected function evalSelectors($selectors)
 
         // after evaluating interpolates, we might need a second pass
         if ($this->shouldEvaluate) {
+            $selectors = $this->revertSelfSelector($selectors);
             $buffer = $this->collapseSelectors($selectors);
             $parser = $this->parserFactory(__METHOD__);
 
@@ -1440,6 +1441,24 @@ function ($value, $key) use (&$output) {
         return implode(', ', $parts);
     }
 
+    /**
+     * Parse down the selector and revert [self] to "&" before a reparsing
+     * @param array $selectors
+     * @return array
+     */
+    protected function revertSelfSelector($selectors) {
+        foreach ($selectors as &$part) {
+            if (is_array($part)) {
+                if ($part === [Type::T_SELF]) {
+                    $part = '&';
+                } else {
+                    $part = $this->revertSelfSelector($part);
+                }
+            }
+        }
+        return $selectors;
+    }
+
     /**
      * Flatten selector single; joins together .classes and #ids
      *

From 67d535dea019d4574feee42e3a1566e4fecb53e8 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 14 May 2019 11:49:56 -0400
Subject: [PATCH 206/254] phpcs

---
 src/Compiler.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 84b38c16..50785aac 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1473,10 +1473,13 @@ function ($value, $key) use (&$compound) {
 
     /**
      * Parse down the selector and revert [self] to "&" before a reparsing
+     *
      * @param array $selectors
+     *
      * @return array
      */
-    protected function revertSelfSelector($selectors) {
+    protected function revertSelfSelector($selectors)
+    {
         foreach ($selectors as &$part) {
             if (is_array($part)) {
                 if ($part === [Type::T_SELF]) {

From 3589ae543f8a1041554c3b8f9227cdb56acc4e48 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 16 May 2019 10:47:39 +0200
Subject: [PATCH 207/254] Parser improvement to parse the content of :not()
 :has() :where() :is() itself as subselector - supporting all the selector
 syntax At the moment the subselector is re-flatten after the parsing because
 the compiler not know how to deal with nested selector structure
 https://github.com/leafo/scssphp/issues/368

---
 src/Parser.php | 72 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index eb264bce..f7e9043d 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2142,19 +2142,19 @@ protected function propertyName(&$out)
      *
      * @return boolean
      */
-    protected function selectors(&$out)
+    protected function selectors(&$out, $subSelector = false)
     {
         $s = $this->count;
         $selectors = [];
 
-        while ($this->selector($sel)) {
+        while ($this->selector($sel, $subSelector)) {
             $selectors[] = $sel;
 
-            if (! $this->matchChar(',')) {
+            if (! $this->matchChar(',',  true)) {
                 break;
             }
 
-            while ($this->matchChar(',')) {
+            while ($this->matchChar(',', true)) {
                 ; // ignore extra
             }
         }
@@ -2177,23 +2177,23 @@ protected function selectors(&$out)
      *
      * @return boolean
      */
-    protected function selector(&$out)
+    protected function selector(&$out, $subSelector = false)
     {
         $selector = [];
 
         for (;;) {
-            if ($this->match('[>+~]+', $m)) {
+            if ($this->match('[>+~]+', $m, true)) {
                 $selector[] = [$m[0]];
                 continue;
             }
 
-            if ($this->selectorSingle($part)) {
+            if ($this->selectorSingle($part, $subSelector)) {
                 $selector[] = $part;
                 $this->match('\s+', $m);
                 continue;
             }
 
-            if ($this->match('\/[^\/]+\/', $m)) {
+            if ($this->match('\/[^\/]+\/', $m, true)) {
                 $selector[] = [$m[0]];
                 continue;
             }
@@ -2220,7 +2220,7 @@ protected function selector(&$out)
      *
      * @return boolean
      */
-    protected function selectorSingle(&$out)
+    protected function selectorSingle(&$out, $subSelector = false)
     {
         $oldWhite = $this->eatWhiteDefault;
         $this->eatWhiteDefault = false;
@@ -2244,6 +2244,11 @@ protected function selectorSingle(&$out)
                 break;
             }
 
+            // parsing a sub selector in () stop with the closing )
+            if ($subSelector && $char === ')') {
+                break;
+            }
+
             //self
             switch ($char) {
                 case '&':
@@ -2307,21 +2312,46 @@ protected function selectorSingle(&$out)
 
                     $ss = $this->count;
 
-                    if ($this->matchChar('(') &&
-                      ($this->openString(')', $str, '(') || true) &&
-                      $this->matchChar(')')
-                    ) {
-                        $parts[] = '(';
-
-                        if (! empty($str)) {
-                            $parts[] = $str;
+                    if ($nameParts === ['not'] || $nameParts === ['is'] || $nameParts === ['has'] || $nameParts === ['where']) {
+                        if ($this->matchChar('(') &&
+                          ($this->selectors($subs, true) || true) &&
+                          $this->matchChar(')')
+                        ) {
+                            $parts[] = '(';
+
+                            while ($sub = array_shift($subs)) {
+                                while ($ps = array_shift($sub)) {
+                                    foreach ($ps as &$p) {
+                                        $parts[] = $p;
+                                    }
+                                    if (count($sub) && reset($sub)) {
+                                        $parts[] = ' ';
+                                    }
+                                }
+                                if (count($subs) && reset($subs)) {
+                                    $parts[] = ', ';
+                                }
+                            }
+                            $parts[] = ')';
+                        } else {
+                            $this->seek($ss);
                         }
-
-                        $parts[] = ')';
                     } else {
-                        $this->seek($ss);
+                        if ($this->matchChar('(') &&
+                          ($this->openString(')', $str, '(') || true) &&
+                          $this->matchChar(')')
+                        ) {
+                            $parts[] = '(';
+
+                            if (! empty($str)) {
+                                $parts[] = $str;
+                            }
+
+                            $parts[] = ')';
+                        } else {
+                            $this->seek($ss);
+                        }
                     }
-
                     continue;
                 }
             }

From 2c25b8b179e09e1b515b46ea3ff35b5ea624bcfa Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 16 May 2019 15:08:56 +0200
Subject: [PATCH 208/254] Add a test case for named grid lines syntax
 https://github.com/leafo/scssphp/issues/542

---
 tests/inputs/values.scss          |  1 +
 tests/outputs/values.css          |  3 ++-
 tests/outputs_numbered/values.css | 11 ++++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/inputs/values.scss b/tests/inputs/values.scss
index 8279447d..8b35bbd0 100644
--- a/tests/inputs/values.scss
+++ b/tests/inputs/values.scss
@@ -15,6 +15,7 @@ multiline block \
     content: "This is a \
 multiline string.";
     border-radius: -1px -1px -1px black;
+    grid-template-columns: [avatar] 2fr [body] 6fr;
 }
 
 #subtraction {
diff --git a/tests/outputs/values.css b/tests/outputs/values.css
index d6937374..419412f2 100644
--- a/tests/outputs/values.css
+++ b/tests/outputs/values.css
@@ -13,7 +13,8 @@ multiline block \
   margin: 4, 3, 1;
   content: "This is a \
 multiline string.";
-  border-radius: -1px -1px -1px black; }
+  border-radius: -1px -1px -1px black;
+  grid-template-columns: [avatar] 2fr [body] 6fr; }
 
 #subtraction {
   lit: 10 -11;
diff --git a/tests/outputs_numbered/values.css b/tests/outputs_numbered/values.css
index af231709..24a961eb 100644
--- a/tests/outputs_numbered/values.css
+++ b/tests/outputs_numbered/values.css
@@ -14,8 +14,9 @@ multiline block \
   margin: 4, 3, 1;
   content: "This is a \
 multiline string.";
-  border-radius: -1px -1px -1px black; }
-/* line 20, inputs/values.scss */
+  border-radius: -1px -1px -1px black;
+  grid-template-columns: [avatar] 2fr [body] 6fr; }
+/* line 21, inputs/values.scss */
 #subtraction {
   lit: 10 -11;
   lit: -1;
@@ -25,14 +26,14 @@ multiline string.";
   var: -90;
   var: -90;
   var: -90; }
-/* line 34, inputs/values.scss */
+/* line 35, inputs/values.scss */
 #special {
   a: 12px expression(1 + (3 / Foo.bar("baz" + "bang") + function() {return 12;}) % 12); }
-/* line 38, inputs/values.scss */
+/* line 39, inputs/values.scss */
 #unary {
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
-/* line 44, inputs/values.scss */
+/* line 45, inputs/values.scss */
 #self {
   content: "#self"; }

From c0ba191b3c4d3587fe50d71bbde270bb34ced2bb Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Thu, 16 May 2019 14:55:48 +0200
Subject: [PATCH 209/254] https://github.com/leafo/scssphp/issues/542 : be able
 to parse bracket enclosed keyword as part of a property value

---
 src/Parser.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index eb264bce..96e427ab 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1270,7 +1270,10 @@ protected function expression(&$out)
         }
 
         if ($this->matchChar('[')) {
-            if ($this->parenExpression($out, $s, "]")) {
+            if ($this->parenExpression($out, $s, "]", [Type::T_LIST, Type::T_KEYWORD])) {
+                if ($out[0] !== Type::T_LIST && $out[0] !== Type::T_MAP) {
+                    $out = [Type::T_STRING, '', [ '[', $out, ']' ]];
+                }
                 return true;
             }
 
@@ -1292,10 +1295,11 @@ protected function expression(&$out)
      * @param array   $out
      * @param integer $s
      * @param string  $closingParen
+     * @param array   $allowedTypes
      *
      * @return boolean
      */
-    protected function parenExpression(&$out, $s, $closingParen = ")")
+    protected function parenExpression(&$out, $s, $closingParen = ")", $allowedTypes = [Type::T_LIST, Type::T_MAP])
     {
         if ($this->matchChar($closingParen)) {
             $out = [Type::T_LIST, '', []];
@@ -1303,13 +1307,13 @@ protected function parenExpression(&$out, $s, $closingParen = ")")
             return true;
         }
 
-        if ($this->valueList($out) && $this->matchChar($closingParen) && $out[0] === Type::T_LIST) {
+        if ($this->valueList($out) && $this->matchChar($closingParen) && in_array($out[0], $allowedTypes)) {
             return true;
         }
 
         $this->seek($s);
 
-        if ($this->map($out)) {
+        if (in_array(Type::T_MAP, $allowedTypes) && $this->map($out)) {
             return true;
         }
 

From a24a0b6890a7bc76d7b1cc0af93c01472dbb0319 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 16 May 2019 10:18:57 -0400
Subject: [PATCH 210/254] phpcs

---
 src/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index e9053f9f..6732e937 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2154,7 +2154,7 @@ protected function selectors(&$out, $subSelector = false)
         while ($this->selector($sel, $subSelector)) {
             $selectors[] = $sel;
 
-            if (! $this->matchChar(',',  true)) {
+            if (! $this->matchChar(',', true)) {
                 break;
             }
 

From 4ba0e47c5facdbb1155087d736e576b9602b5fa2 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Thu, 16 May 2019 13:18:40 -0400
Subject: [PATCH 211/254] coding style tweaks

---
 src/Cache.php                        | 148 +++++++++++------------
 src/Compiler.php                     | 174 +++++++++++++++++----------
 src/Formatter/Compressed.php         |  11 +-
 src/Formatter/Crunched.php           |  11 +-
 src/Parser.php                       |  78 +++++++-----
 src/SourceMap/SourceMapGenerator.php |   4 +-
 6 files changed, 251 insertions(+), 175 deletions(-)

diff --git a/src/Cache.php b/src/Cache.php
index 1e12770a..49cf631b 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -18,10 +18,10 @@
  *
  * In short:
  *
- * allow to put in cache/get from fache a generic result from a known operation on a generic dataset,
+ * allow to put in cache/get from cache a generic result from a known operation on a generic dataset,
  * taking in account options that affects the result
  *
- * The cache manager is agnostic about data format and only the operation is expected to be descripted by string
+ * The cache manager is agnostic about data format and only the operation is expected to be described by string
  *
  */
 
@@ -32,38 +32,36 @@
  */
 class Cache
 {
-
     const CACHE_VERSION = 0;
 
-
     // directory used for storing data
-    public static $cache_dir = false;
+    public static $cacheDir = false;
 
     // prefix for the storing data
     public static $prefix = 'scssphp_';
 
     // force a refresh : 'once' for refreshing the first hit on a cache only, true to never use the cache in this hit
-    public static $force_refresh = false;
+    public static $forceFefresh = false;
 
     // specifies the number of seconds after which data cached will be seen as 'garbage' and potentially cleaned up
-    public static $gc_lifetime = 604800;
+    public static $gcLifetime = 604800;
 
-
-    // array of already refreshed cache if $force_refresh==='once'
+    // array of already refreshed cache if $forceFefresh==='once'
     protected static $refreshed = [];
 
-
     /**
      * Constructor
+     *
+     * @param array $options
      */
     public function __construct($options)
     {
-        //check $cache_dir
+        // check $cacheDir
         if (isset($options['cache_dir'])) {
-            self::$cache_dir = $options['cache_dir'];
+            self::$cacheDir = $options['cache_dir'];
         }
 
-        if (empty(self::$cache_dir)) {
+        if (empty(self::$cacheDir)) {
             throw new Exception('cache_dir not set');
         }
 
@@ -75,40 +73,42 @@ public function __construct($options)
             throw new Exception('prefix not set');
         }
 
-        if (isset($options['force_refresh'])) {
-            self::$force_refresh = $options['force_refresh'];
+        if (isset($options['forceRefresh'])) {
+            self::$forceFefresh = $options['force_refresh'];
         }
 
         self::checkCacheDir();
     }
 
-
     /**
-     * Get the cached result of $operation on $what, which is known as dependant from the content of $options
+     * Get the cached result of $operation on $what,
+     * which is known as dependant from the content of $options
+     *
+     * @param string  $operation    parse, compile...
+     * @param mixed   $what         content key (e.g., filename to be treated)
+     * @param array   $options      any option that affect the operation result on the content
+     * @param integer $lastModified last modified timestamp
      *
-     * @param string $operation
-     *   parse, compile...
-     * @param $what
-     *  content key (filename to be treated for instance)
-     * @param array $options
-     *  any option that affect the operation result on the content
-     * @param int $last_modified
      * @return mixed
-     * @throws Exception
+     *
+     * @throws \Exception
      */
-    public function getCache($operation, $what, $options = array(), $last_modified = null)
+    public function getCache($operation, $what, $options = [], $lastModified = null)
     {
+        $fileCache = self::$cacheDir . self::cacheName($operation, $what, $options);
 
-        $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
+        if ((! self::$forceRefresh || (self::$forceRefresh === 'once' && isset(self::$refreshed[$fileCache])))
+            && file_exists($fileCache)
+        ) {
+            $cacheTime = filemtime($fileCache);
 
-        if ((! self::$force_refresh || (self::$force_refresh === 'once' && isset(self::$refreshed[$fileCache])))
-          and file_exists($fileCache)) {
-            $cache_time = filemtime($fileCache);
-            if ((is_null($last_modified) or $cache_time > $last_modified)
-              and $cache_time + self::$gc_lifetime > time()) {
+            if ((is_null($lastModified) || $cacheTime > $lastModified)
+                && $cacheTime + self::$gcLifetime > time()
+            ) {
                 $c = file_get_contents($fileCache);
                 $c = unserialize($c);
-                if (is_array($c) and isset($c['value'])) {
+
+                if (is_array($c) && isset($c['value'])) {
                     return $c['value'];
                 }
             }
@@ -118,43 +118,45 @@ public function getCache($operation, $what, $options = array(), $last_modified =
     }
 
     /**
-     * Put in cache the result of $operation on $what, which is known as dependant from the content of $options
+     * Put in cache the result of $operation on $what,
+     * which is known as dependant from the content of $options
      *
      * @param string $operation
-     * @param $what
-     * @param $value
-     * @param array $options
+     * @param mixed  $what
+     * @param mixed  $value
+     * @param array  $options
      */
-    public function setCache($operation, $what, $value, $options = array())
+    public function setCache($operation, $what, $value, $options = [])
     {
-        $fileCache = self::$cache_dir . self::cacheName($operation, $what, $options);
+        $fileCache = self::$cacheDir . self::cacheName($operation, $what, $options);
 
-        $c = array('value' => $value);
+        $c = ['value' => $value];
         $c = serialize($c);
         file_put_contents($fileCache, $c);
 
-        if (self::$force_refresh === 'once') {
+        if (self::$forceRefresh === 'once') {
             self::$refreshed[$fileCache] = true;
         }
     }
 
-
     /**
-     * get the cachename for the caching of $opetation on $what, which is known as dependant from the content of $options
+     * Get the cache name for the caching of $operation on $what,
+     * which is known as dependant from the content of $options
+     *
      * @param string $operation
-     * @param $what
-     * @param array $options
+     * @param mixed  $what
+     * @param array  $options
+     *
      * @return string
      */
-    private static function cacheName($operation, $what, $options = array())
+    private static function cacheName($operation, $what, $options = [])
     {
-
-        $t = array(
+        $t = [
           'version' => self::CACHE_VERSION,
           'operation' => $operation,
           'what' => $what,
           'options' => $options
-        );
+        ];
 
         $t = self::$prefix
           . sha1(json_encode($t))
@@ -164,38 +166,35 @@ private static function cacheName($operation, $what, $options = array())
         return $t;
     }
 
-
     /**
-     * Check that the cache dir is existing and writeable
-     * @throws Exception
+     * Check that the cache dir exists and is writeable
+     *
+     * @throws \Exception
      */
     public static function checkCacheDir()
     {
+        self::$cacheDir = str_replace('\\', '/', self::$cacheDir);
+        self::$cacheDir = rtrim(self::$cacheDir, '/') . '/';
 
-        self::$cache_dir = str_replace('\\', '/', self::$cache_dir);
-        self::$cache_dir = rtrim(self::$cache_dir, '/') . '/';
-
-        if (! file_exists(self::$cache_dir)) {
-            if (! mkdir(self::$cache_dir)) {
-                throw new Exception('Cache directory couldn\'t be created: ' . self::$cache_dir);
+        if (! file_exists(self::$cacheDir)) {
+            if (! mkdir(self::$cacheDir)) {
+                throw new Exception('Cache directory couldn\'t be created: ' . self::$cacheDir);
             }
-        } elseif (! is_dir(self::$cache_dir)) {
-            throw new Exception('Cache directory doesn\'t exist: ' . self::$cache_dir);
-        } elseif (! is_writable(self::$cache_dir)) {
-            throw new Exception('Cache directory isn\'t writable: ' . self::$cache_dir);
+        } elseif (! is_dir(self::$cacheDir)) {
+            throw new Exception('Cache directory doesn\'t exist: ' . self::$cacheDir);
+        } elseif (! is_writable(self::$cacheDir)) {
+            throw new Exception('Cache directory isn\'t writable: ' . self::$cacheDir);
         }
     }
 
     /**
      * Delete unused cached files
-     *
      */
     public static function cleanCache()
     {
         static $clean = false;
 
-
-        if ($clean || empty(self::$cache_dir)) {
+        if ($clean || empty(self::$cacheDir)) {
             return;
         }
 
@@ -203,14 +202,16 @@ public static function cleanCache()
 
         // only remove files with extensions created by SCSSPHP Cache
         // css files removed based on the list files
-        $remove_types = array('scsscache' => 1);
+        $removeTypes = ['scsscache' => 1];
+
+        $files = scandir(self::$cacheDir);
 
-        $files = scandir(self::$cache_dir);
         if (! $files) {
             return;
         }
 
-        $check_time = time() - self::$gc_lifetime;
+        $checkTime = time() - self::$gcLifetime;
+
         foreach ($files as $file) {
             // don't delete if the file wasn't created with SCSSPHP Cache
             if (strpos($file, self::$prefix) !== 0) {
@@ -220,20 +221,19 @@ public static function cleanCache()
             $parts = explode('.', $file);
             $type = array_pop($parts);
 
-
-            if (! isset($remove_types[$type])) {
+            if (! isset($removeTypes[$type])) {
                 continue;
             }
 
-            $full_path = self::$cache_dir . $file;
-            $mtime = filemtime($full_path);
+            $fullPath = self::$cacheDir . $file;
+            $mtime = filemtime($fullPath);
 
             // don't delete if it's a relatively new file
-            if ($mtime > $check_time) {
+            if ($mtime > $checkTime) {
                 continue;
             }
 
-            unlink($full_path);
+            unlink($fullPath);
         }
     }
 }
diff --git a/src/Compiler.php b/src/Compiler.php
index 50785aac..782799d1 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -99,17 +99,17 @@ class Compiler
         'function' => '^',
     ];
 
-    static public $true = [Type::T_KEYWORD, 'true'];
-    static public $false = [Type::T_KEYWORD, 'false'];
-    static public $null = [Type::T_NULL];
-    static public $nullString = [Type::T_STRING, '', []];
+    static public $true         = [Type::T_KEYWORD, 'true'];
+    static public $false        = [Type::T_KEYWORD, 'false'];
+    static public $null         = [Type::T_NULL];
+    static public $nullString   = [Type::T_STRING, '', []];
     static public $defaultValue = [Type::T_KEYWORD, ''];
     static public $selfSelector = [Type::T_SELF];
-    static public $emptyList = [Type::T_LIST, '', []];
-    static public $emptyMap = [Type::T_MAP, [], []];
-    static public $emptyString = [Type::T_STRING, '"', []];
-    static public $with = [Type::T_KEYWORD, 'with'];
-    static public $without = [Type::T_KEYWORD, 'without'];
+    static public $emptyList    = [Type::T_LIST, '', []];
+    static public $emptyMap     = [Type::T_MAP, [], []];
+    static public $emptyString  = [Type::T_STRING, '"', []];
+    static public $with         = [Type::T_KEYWORD, 'with'];
+    static public $without      = [Type::T_KEYWORD, 'without'];
 
     protected $importPaths = [''];
     protected $importCache = [];
@@ -165,27 +165,28 @@ class Compiler
     /**
      * Constructor
      */
-    public function __construct($cache_options = null)
+    public function __construct($cacheOptions = null)
     {
         $this->parsedFiles = [];
         $this->sourceNames = [];
 
-        if ($cache_options) {
-            $this->cache = new Cache($cache_options);
+        if ($cacheOptions) {
+            $this->cache = new Cache($cacheOptions);
         }
     }
 
     public function getCompileOptions()
     {
-        $options = array(
-            'importPaths' => $this->importPaths,
-            'registeredVars' => $this->registeredVars,
+        $options = [
+            'importPaths'        => $this->importPaths,
+            'registeredVars'     => $this->registeredVars,
             'registeredFeatures' => $this->registeredFeatures,
-            'encoding' => $this->encoding,
-            'sourceMap' => serialize($this->sourceMap),
-            'sourceMapOptions' => $this->sourceMapOptions,
-            'formater' => $this->formatter,
-        );
+            'encoding'           => $this->encoding,
+            'sourceMap'          => serialize($this->sourceMap),
+            'sourceMapOptions'   => $this->sourceMapOptions,
+            'formatter'          => $this->formatter,
+        ];
+
         return $options;
     }
 
@@ -201,22 +202,25 @@ public function getCompileOptions()
      */
     public function compile($code, $path = null)
     {
-
         if ($this->cache) {
-            $cache_key = ($path ? $path : "(stdin)") . ":" . md5($code);
-            $compile_options = $this->getCompileOptions();
-            $cache = $this->cache->getCache("compile", $cache_key, $compile_options);
+            $cacheKey = ($path ? $path : "(stdin)") . ":" . md5($code);
+            $compileOptions = $this->getCompileOptions();
+            $cache = $this->cache->getCache("compile", $cacheKey, $compileOptions);
+
             if (is_array($cache)
-                and isset($cache['dependencies'])
-                and isset($cache['out']) ) {
+                && isset($cache['dependencies'])
+                && isset($cache['out'])
+            ) {
                 // check if any dependency file changed before accepting the cache
                 foreach ($cache['dependencies'] as $file => $mtime) {
-                    if (!file_exists($file)
-                        or filemtime($file) !== $mtime) {
+                    if (! file_exists($file)
+                        || filemtime($file) !== $mtime
+                    ) {
                         unset($cache);
                         break;
                     }
                 }
+
                 if (isset($cache)) {
                     return $cache['out'];
                 }
@@ -279,12 +283,13 @@ public function compile($code, $path = null)
             $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
         }
 
-        if ($this->cache and isset($cache_key) and isset($compile_options)) {
-            $v = array(
+        if ($this->cache && isset($cacheKey) && isset($compileOptions)) {
+            $v = [
                 'dependencies' => $this->getParsedFiles(),
                 'out' => &$out,
-            );
-            $this->cache->setCache("compile", $cache_key, $v, $compile_options);
+            ];
+
+            $this->cache->setCache("compile", $cacheKey, $v, $compileOptions);
         }
 
         return $out;
@@ -490,6 +495,7 @@ protected function flattenSelectors(OutputBlock $block, $parentKey = null)
     protected function glueFunctionSelectors($parts)
     {
         $new = [];
+
         foreach ($parts as $part) {
             if (is_array($part)) {
                 $part = $this->glueFunctionSelectors($part);
@@ -506,6 +512,7 @@ protected function glueFunctionSelectors($parts)
                 }
             }
         }
+
         return $new;
     }
 
@@ -520,6 +527,7 @@ protected function glueFunctionSelectors($parts)
     protected function matchExtends($selector, &$out, $from = 0, $initial = true)
     {
         static $partsPile = [];
+
         $selector = $this->glueFunctionSelectors($selector);
 
         foreach ($selector as $i => $part) {
@@ -539,8 +547,8 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
 
             if ($this->matchExtendsSingle($part, $origin)) {
                 $partsPile[] = $part;
-                $after = array_slice($selector, $i + 1);
-                $before = array_slice($selector, 0, $i);
+                $after       = array_slice($selector, $i + 1);
+                $before      = array_slice($selector, 0, $i);
 
                 list($before, $nonBreakableBefore) = $this->extractRelationshipFromFragment($before);
 
@@ -548,7 +556,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                     $k = 0;
 
                     // remove shared parts
-                    if (count($new)>1) {
+                    if (count($new) > 1) {
                         while ($k < $i && isset($new[$k]) && $selector[$k] === $new[$k]) {
                             $k++;
                         }
@@ -561,7 +569,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                         $slice = [];
 
                         foreach ($tempReplacement[$l] as $chunk) {
-                            if (!in_array($chunk, $slice)) {
+                            if (! in_array($chunk, $slice)) {
                                 $slice[] = $chunk;
                             }
                         }
@@ -592,19 +600,19 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                     $out[] = $result;
 
                     // recursively check for more matches
-                    $startRecursFrom = count($before) + min(count($nonBreakableBefore), count($mergedBefore));
-                    $this->matchExtends($result, $out, $startRecursFrom, false);
+                    $startRecurseFrom = count($before) + min(count($nonBreakableBefore), count($mergedBefore));
+                    $this->matchExtends($result, $out, $startRecurseFrom, false);
 
                     // selector sequence merging
                     if (! empty($before) && count($new) > 1) {
-                        $sharedParts = $k > 0 ? array_slice($before, 0, $k) : [];
+                        $preSharedParts = $k > 0 ? array_slice($before, 0, $k) : [];
                         $postSharedParts = $k > 0 ? array_slice($before, $k) : $before;
 
-                        list($injectBetweenSharedParts, $nonBreakable2) = $this->extractRelationshipFromFragment($afterBefore);
+                        list($betweenSharedParts, $nonBreakable2) = $this->extractRelationshipFromFragment($afterBefore);
 
                         $result2 = array_merge(
-                            $sharedParts,
-                            $injectBetweenSharedParts,
+                            $preSharedParts,
+                            $betweenSharedParts,
                             $postSharedParts,
                             $nonBreakable2,
                             $nonBreakableBefore,
@@ -615,6 +623,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
                         $out[] = $result2;
                     }
                 }
+
                 array_pop($partsPile);
             }
         }
@@ -671,6 +680,7 @@ protected function matchExtendsSingle($rawSingle, &$outOrigin)
 
         foreach ($counts as $idx => $count) {
             list($target, $origin, /* $block */) = $this->extends[$idx];
+
             $origin = $this->glueFunctionSelectors($origin);
 
             // check count
@@ -797,6 +807,7 @@ protected function compileMedia(Block $media)
         if (! empty($mediaQueries) && $mediaQueries) {
             $previousScope = $this->scope;
             $parentScope = $this->mediaParent($this->scope);
+
             foreach ($mediaQueries as $mediaQuery) {
                 $this->scope = $this->makeOutputBlock(Type::T_MEDIA, [$mediaQuery]);
 
@@ -811,9 +822,9 @@ protected function compileMedia(Block $media)
                 $type = $child[0];
 
                 if ($type !== Type::T_BLOCK &&
-                  $type !== Type::T_MEDIA &&
-                  $type !== Type::T_DIRECTIVE &&
-                  $type !== Type::T_IMPORT
+                    $type !== Type::T_MEDIA &&
+                    $type !== Type::T_DIRECTIVE &&
+                    $type !== Type::T_IMPORT
                 ) {
                     $needsWrap = true;
                     break;
@@ -1002,7 +1013,7 @@ protected function filterScopeWithout($scope, $without)
             }
         }
 
-        if (!count($filteredScopes)) {
+        if (! count($filteredScopes)) {
             return $this->rootBlock;
         }
 
@@ -1413,8 +1424,8 @@ protected function evalSelectorPart($part)
     /**
      * Collapse selectors
      *
-     * @param array $selectors
-     * @param bool $selectorFormat
+     * @param array   $selectors
+     * @param boolean $selectorFormat
      *   if false return a collapsed string
      *   if true return an array description of a structured selector
      *
@@ -1427,6 +1438,7 @@ protected function collapseSelectors($selectors, $selectorFormat = false)
         foreach ($selectors as $selector) {
             $output = [];
             $glueNext = false;
+
             foreach ($selector as $node) {
                 $compound = '';
 
@@ -1436,6 +1448,7 @@ function ($value, $key) use (&$compound) {
                         $compound .= $value;
                     }
                 );
+
                 if ($selectorFormat && $this->isImmediateRelationshipCombinator($compound)) {
                     if (count($output)) {
                         $output[count($output) - 1] .= ' ' . $compound;
@@ -1459,6 +1472,7 @@ function ($value, $key) use (&$compound) {
             } else {
                 $output = implode(' ', $output);
             }
+
             $parts[] = $output;
         }
 
@@ -1489,6 +1503,7 @@ protected function revertSelfSelector($selectors)
                 }
             }
         }
+
         return $selectors;
     }
 
@@ -1604,6 +1619,7 @@ protected function pushCallStack($name = '')
           Parser::SOURCE_LINE => $this->sourceLine,
           Parser::SOURCE_COLUMN => $this->sourceColumn
         ];
+
         // infinite calling loop
         if (count($this->callStack) > 25000) {
             // not displayed but you can var_dump it to deep debug
@@ -1630,6 +1646,7 @@ protected function popCallStack()
     protected function compileChildren($stms, OutputBlock $out, $traceName = '')
     {
         $this->pushCallStack($traceName);
+
         foreach ($stms as $stm) {
             $ret = $this->compileChild($stm, $out);
 
@@ -1637,6 +1654,7 @@ protected function compileChildren($stms, OutputBlock $out, $traceName = '')
                 return $ret;
             }
         }
+
         $this->popCallStack();
 
         return null;
@@ -1655,6 +1673,7 @@ protected function compileChildren($stms, OutputBlock $out, $traceName = '')
     protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null, $traceName = '')
     {
         $this->pushCallStack($traceName);
+
         foreach ($stms as $stm) {
             if ($selfParent && isset($stm[1]) && is_object($stm[1]) && $stm[1] instanceof Block) {
                 $stm[1]->selfParent = $selfParent;
@@ -1674,6 +1693,7 @@ protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent
                 return;
             }
         }
+
         $this->popCallStack();
     }
 
@@ -1754,12 +1774,14 @@ protected function compileMediaQuery($queryList)
             $parts = [];
 
             $mediaTypeOnly = true;
+
             foreach ($query as $q) {
                 if ($q[0] !== Type::T_MEDIA_TYPE) {
                     $mediaTypeOnly = false;
                     break;
                 }
             }
+
             foreach ($query as $q) {
                 switch ($q[0]) {
                     case Type::T_MEDIA_TYPE:
@@ -1770,23 +1792,29 @@ protected function compileMediaQuery($queryList)
                                 if ($type) {
                                     array_unshift($parts, implode(' ', array_filter($type)));
                                 }
+
                                 if (! empty($parts)) {
                                     if (strlen($current)) {
                                         $current .= $this->formatter->tagSeparator;
                                     }
+
                                     $current .= implode(' and ', $parts);
                                 }
+
                                 if ($current) {
                                     $out[] = $start . $current;
                                 }
+
                                 $current = "";
                                 $type = null;
                                 $parts = [];
                             }
                         }
+
                         if ($newType === ['all'] && $default) {
                             $default = $start . 'all';
                         }
+
                         // all can be safely ignored and mixed with whatever else
                         if ($newType !== ['all']) {
                             if ($type) {
@@ -1840,10 +1868,12 @@ protected function compileMediaQuery($queryList)
         if ($current) {
             $out[] = $start . $current;
         }
+
         // no @media type except all, and no conflict?
-        if (!$out && $default) {
+        if (! $out && $default) {
             $out[] = $default;
         }
+
         return $out;
     }
 
@@ -1881,6 +1911,7 @@ protected function mergeDirectRelationships($selectors1, $selectors2)
                 } else {
                     $merged = array_merge($selectors1, [$part1], $selectors2, [$part2], $merged);
                 }
+
                 break;
             }
 
@@ -2018,11 +2049,11 @@ protected function compileChild($child, OutputBlock $out)
             $this->sourceIndex = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null;
             $this->sourceLine = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1;
             $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1;
-        } elseif (is_array($child) and isset($child[1]->sourceLine)) {
+        } elseif (is_array($child) && isset($child[1]->sourceLine)) {
             $this->sourceIndex = $child[1]->sourceIndex;
             $this->sourceLine = $child[1]->sourceLine;
             $this->sourceColumn = $child[1]->sourceColumn;
-        } elseif (! empty($out->sourceLine) and ! empty($out->sourceName)) {
+        } elseif (! empty($out->sourceLine) && ! empty($out->sourceName)) {
             $this->sourceLine = $out->sourceLine;
             $this->sourceIndex = array_search($out->sourceName, $this->sourceNames);
 
@@ -2379,7 +2410,8 @@ protected function compileChild($child, OutputBlock $out)
                 break;
 
             case Type::T_MIXIN_CONTENT:
-                $content = $this->get(static::$namespaces['special'] . 'content', false, isset($this->storeEnv) ? $this->storeEnv : $this->env);
+                $env = isset($this->storeEnv) ? $this->storeEnv : $this->env;
+                $content = $this->get(static::$namespaces['special'] . 'content', false, $env);
 
                 if (! $content) {
                     $content = new \stdClass();
@@ -2901,7 +2933,7 @@ protected function opAnd($left, $right, $shouldEval)
             return null;
         }
 
-        if ($left !== static::$false and $left !== static::$null) {
+        if ($left !== static::$false && $left !== static::$null) {
             return $this->reduce($right, true);
         }
 
@@ -2923,7 +2955,7 @@ protected function opOr($left, $right, $shouldEval)
             return null;
         }
 
-        if ($left !== static::$false and $left !== static::$null) {
+        if ($left !== static::$false && $left !== static::$null) {
             return $left;
         }
 
@@ -3401,7 +3433,7 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
 
         $selfParentSelectors = null;
 
-        if (!is_null($selfParent) and $selfParent->selectors) {
+        if (! is_null($selfParent) && $selfParent->selectors) {
             $selfParentSelectors = $this->evalSelectors($selfParent->selectors);
         }
 
@@ -3444,10 +3476,10 @@ protected function multiplySelectors(Environment $env, $selfParent = null)
     /**
      * Join selectors; looks for & to replace, or append parent before child
      *
-     * @param array $parent
-     * @param array $child
-     * @param bool  &$stillHasSelf
-     * @param array $selfParentSelectors
+     * @param array   $parent
+     * @param array   $child
+     * @param boolean &$stillHasSelf
+     * @param array   $selfParentSelectors
 
      * @return array
      */
@@ -3464,7 +3496,8 @@ protected function joinSelectors($parent, $child, &$stillHasSelf, $selfParentSel
                 if ($p === static::$selfSelector && $setSelf) {
                     $stillHasSelf = true;
                 }
-                if ($p === static::$selfSelector && !$setSelf) {
+
+                if ($p === static::$selfSelector && ! $setSelf) {
                     $setSelf = true;
 
                     if (is_null($selfParentSelectors)) {
@@ -3485,6 +3518,7 @@ protected function joinSelectors($parent, $child, &$stillHasSelf, $selfParentSel
                                 });
                                 $pp = implode($flatten);
                             }
+
                             $newPart[] = $pp;
                         }
                     }
@@ -3538,7 +3572,11 @@ protected function multiplyMedia(Environment $env = null, $childQueries = null)
 
             foreach ($parentQueries as $parentQuery) {
                 foreach ($originalQueries as $childQuery) {
-                    $childQueries []= array_merge($parentQuery, [[Type::T_MEDIA_TYPE, [Type::T_KEYWORD, 'all']]], $childQuery);
+                    $childQueries[] = array_merge(
+                        $parentQuery,
+                        [[Type::T_MEDIA_TYPE, [Type::T_KEYWORD, 'all']]],
+                        $childQuery
+                    );
                 }
             }
         }
@@ -3727,6 +3765,7 @@ public function get($name, $shouldThrow = true, Environment $env = null, $unredu
             if ($maxDepth-- <= 0) {
                 break;
             }
+
             if (array_key_exists($normalizedName, $env->store)) {
                 if ($unreduced && isset($env->storeUnreduced[$normalizedName])) {
                     return $env->storeUnreduced[$normalizedName];
@@ -4040,7 +4079,7 @@ public function findImport($url)
                 // check urls for normal import paths
                 foreach ($urls as $full) {
                     $separator = (
-                        !empty($dir) &&
+                        ! empty($dir) &&
                         substr($dir, -1) !== '/' &&
                         substr($full, 0, 1) !== '/'
                     ) ? '/' : '';
@@ -4119,6 +4158,7 @@ public function throwError($msg)
         $msg = "$msg: $loc";
 
         $callStackMsg = $this->callStackMessage();
+
         if ($callStackMsg) {
             $msg .= "\nCall Stack:\n" . $callStackMsg;
         }
@@ -4127,8 +4167,11 @@ public function throwError($msg)
     }
 
     /**
-     * @param bool $all
-     * @param null $limit
+     * Beautify call stack for output
+     *
+     * @param boolean $all
+     * @param null    $limit
+     *
      * @return string
      */
     protected function callStackMessage($all = false, $limit = null)
@@ -4145,7 +4188,8 @@ protected function callStackMessage($all = false, $limit = null)
                           : '(unknown file)');
                     $msg .= " on line " . $call[Parser::SOURCE_LINE];
                     $callStackMsg[] = $msg;
-                    if (!is_null($limit) && $ncall>$limit) {
+
+                    if (! is_null($limit) && $ncall>$limit) {
                         break;
                     }
                 }
diff --git a/src/Formatter/Compressed.php b/src/Formatter/Compressed.php
index 52410b6c..ab38529d 100644
--- a/src/Formatter/Compressed.php
+++ b/src/Formatter/Compressed.php
@@ -69,8 +69,13 @@ protected function blockSelectors(OutputBlock $block)
     {
         $inner = $this->indentStr();
 
-        $this->write($inner
-            . implode($this->tagSeparator, str_replace(array(' > ', ' + ', ' ~ '), array('>', '+', '~'), $block->selectors))
-            . $this->open . $this->break);
+        $this->write(
+            $inner
+            . implode(
+                $this->tagSeparator,
+                str_replace([' > ', ' + ', ' ~ '], ['>', '+', '~'], $block->selectors)
+            )
+            . $this->open . $this->break
+        );
     }
 }
diff --git a/src/Formatter/Crunched.php b/src/Formatter/Crunched.php
index 31970255..da740ccd 100644
--- a/src/Formatter/Crunched.php
+++ b/src/Formatter/Crunched.php
@@ -67,8 +67,13 @@ protected function blockSelectors(OutputBlock $block)
     {
         $inner = $this->indentStr();
 
-        $this->write($inner
-            . implode($this->tagSeparator, str_replace(array(' > ', ' + ', ' ~ '), array('>', '+', '~'), $block->selectors))
-            . $this->open . $this->break);
+        $this->write(
+            $inner
+            . implode(
+                $this->tagSeparator,
+                str_replace([' > ', ' + ', ' ~ '], ['>', '+', '~'], $block->selectors)
+            )
+            . $this->open . $this->break
+        );
     }
 }
diff --git a/src/Parser.php b/src/Parser.php
index 6732e937..9f8cb2e8 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -12,6 +12,7 @@
 namespace Leafo\ScssPhp;
 
 use Leafo\ScssPhp\Block;
+use Leafo\ScssPhp\Cache;
 use Leafo\ScssPhp\Compiler;
 use Leafo\ScssPhp\Exception\ParserException;
 use Leafo\ScssPhp\Node;
@@ -74,10 +75,10 @@ class Parser
      *
      * @api
      *
-     * @param string  $sourceName
-     * @param integer $sourceIndex
-     * @param string  $encoding
-     * @param Cache $cache
+     * @param string               $sourceName
+     * @param integer              $sourceIndex
+     * @param string               $encoding
+     * @param \Leafo\ScssPhp\Cache $cache
      */
     public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8', $cache = null)
     {
@@ -86,7 +87,7 @@ public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8',
         $this->charset          = null;
         $this->utf8             = ! $encoding || strtolower($encoding) === 'utf-8';
         $this->patternModifiers = $this->utf8 ? 'Aisu' : 'Ais';
-        $this->commentsSeen   = [];
+        $this->commentsSeen     = [];
 
         if (empty(static::$operatorPattern)) {
             static::$operatorPattern = '([*\/%+-]|[!=]\=|\>\=?|\<\=\>|\<\=?|and|or)';
@@ -151,15 +152,15 @@ public function throwParseError($msg = 'parse error')
      */
     public function parse($buffer)
     {
-
         if ($this->cache) {
-            $cache_key = $this->sourceName . ":" . md5($buffer);
-            $parse_options = array(
+            $cacheKey = $this->sourceName . ":" . md5($buffer);
+            $parseOptions = [
                 'charset' => $this->charset,
                 'utf8' => $this->utf8,
-            );
-            $v = $this->cache->getCache("parse", $cache_key, $parse_options);
-            if (!is_null($v)) {
+            ];
+            $v = $this->cache->getCache("parse", $cacheKey, $parseOptions);
+
+            if (! is_null($v)) {
                 return $v;
             }
         }
@@ -204,7 +205,7 @@ public function parse($buffer)
         $this->restoreEncoding();
 
         if ($this->cache) {
-            $this->cache->setCache("parse", $cache_key, $this->env, $parse_options);
+            $this->cache->setCache("parse", $cacheKey, $this->env, $parseOptions);
         }
 
         return $this->env;
@@ -932,6 +933,7 @@ protected function matchChar($char, $eatWhitespace = null)
         if ($eatWhitespace) {
             $this->whitespace();
         }
+
         return true;
     }
 
@@ -946,7 +948,6 @@ protected function matchChar($char, $eatWhitespace = null)
      */
     protected function literal($what, $len, $eatWhitespace = null)
     {
-
         if (strcasecmp(substr($this->buffer, $this->count, $len), $what) !== 0) {
             return false;
         }
@@ -960,6 +961,7 @@ protected function literal($what, $len, $eatWhitespace = null)
         if ($eatWhitespace) {
             $this->whitespace();
         }
+
         return true;
     }
 
@@ -1235,7 +1237,7 @@ protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
             }
         }
 
-        if (!$items) {
+        if (! $items) {
             $this->seek($s);
 
             return false;
@@ -1274,6 +1276,7 @@ protected function expression(&$out)
                 if ($out[0] !== Type::T_LIST && $out[0] !== Type::T_MAP) {
                     $out = [Type::T_STRING, '', [ '[', $out, ']' ]];
                 }
+
                 return true;
             }
 
@@ -1388,7 +1391,11 @@ protected function value(&$out)
         $char = $this->buffer[$this->count];
 
         if ($this->literal('url(', 4) && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
-            $len = strspn($this->buffer, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=', $this->count);
+            $len = strspn(
+                $this->buffer,
+                'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=',
+                $this->count
+            );
 
             $this->count += $len;
 
@@ -1427,6 +1434,7 @@ protected function value(&$out)
 
             if ($this->value($inner)) {
                 $out = [Type::T_UNARY, '+', $inner, $this->inParens];
+
                 return true;
             }
 
@@ -1441,8 +1449,10 @@ protected function value(&$out)
 
             if ($this->variable($inner) || $this->unit($inner) || $this->parenValue($inner)) {
                 $out = [Type::T_UNARY, '-', $inner, $this->inParens];
+
                 return true;
             }
+
             $this->count--;
         }
 
@@ -1459,6 +1469,7 @@ protected function value(&$out)
 
         if ($this->matchChar('&', true)) {
             $out = [Type::T_SELF];
+
             return true;
         }
 
@@ -1646,7 +1657,7 @@ protected function argumentList(&$out)
             $args[] = [Type::T_STRING, '', [', ']];
         }
 
-        if (! $this->matchChar(')') || !$args) {
+        if (! $this->matchChar(')') || ! $args) {
             $this->seek($s);
 
             return false;
@@ -1744,7 +1755,7 @@ protected function map(&$out)
             }
         }
 
-        if (!$keys || ! $this->matchChar(')')) {
+        if (! $keys || ! $this->matchChar(')')) {
             $this->seek($s);
 
             return false;
@@ -1782,6 +1793,7 @@ protected function color(&$out)
                         $color[$i] = $t << 4 | $t;
                         $num >>= 4;
                     }
+
                     break;
 
                 case 6:
@@ -1792,6 +1804,7 @@ protected function color(&$out)
                         $color[$i] = $num & 0xff;
                         $num >>= 8;
                     }
+
                     break;
 
                 default:
@@ -1954,7 +1967,7 @@ protected function mixedKeyword(&$out)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (!$parts) {
+        if (! $parts) {
             return false;
         }
 
@@ -2020,7 +2033,7 @@ protected function openString($end, &$out, $nestingOpen = null)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (!$content) {
+        if (! $content) {
             return false;
         }
 
@@ -2062,6 +2075,7 @@ protected function interpolation(&$out, $lookWhite = true)
 
                 $out = [Type::T_INTERPOLATE, $value, $left, $right];
             }
+
             $this->eatWhiteDefault = $oldWhite;
 
             if ($this->eatWhiteDefault) {
@@ -2103,7 +2117,7 @@ protected function propertyName(&$out)
                 continue;
             }
 
-            if (!$parts && $this->match('[:.#]', $m, false)) {
+            if (! $parts && $this->match('[:.#]', $m, false)) {
                 // css hacks
                 $parts[] = $m[0];
                 continue;
@@ -2114,7 +2128,7 @@ protected function propertyName(&$out)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (!$parts) {
+        if (! $parts) {
             return false;
         }
 
@@ -2163,7 +2177,7 @@ protected function selectors(&$out, $subSelector = false)
             }
         }
 
-        if (!$selectors) {
+        if (! $selectors) {
             $this->seek($s);
 
             return false;
@@ -2205,11 +2219,12 @@ protected function selector(&$out, $subSelector = false)
             break;
         }
 
-        if (!$selector) {
+        if (! $selector) {
             return false;
         }
 
         $out = $selector;
+
         return true;
     }
 
@@ -2259,10 +2274,12 @@ protected function selectorSingle(&$out, $subSelector = false)
                     $parts[] = Compiler::$selfSelector;
                     $this->count++;
                     continue 2;
+
                 case '.':
                     $parts[] = '.';
                     $this->count++;
                     continue 2;
+
                 case '|':
                     $parts[] = '|';
                     $this->count++;
@@ -2316,7 +2333,9 @@ protected function selectorSingle(&$out, $subSelector = false)
 
                     $ss = $this->count;
 
-                    if ($nameParts === ['not'] || $nameParts === ['is'] || $nameParts === ['has'] || $nameParts === ['where']) {
+                    if ($nameParts === ['not'] || $nameParts === ['is'] ||
+                        $nameParts === ['has'] || $nameParts === ['where']
+                    ) {
                         if ($this->matchChar('(') &&
                           ($this->selectors($subs, true) || true) &&
                           $this->matchChar(')')
@@ -2336,6 +2355,7 @@ protected function selectorSingle(&$out, $subSelector = false)
                                     $parts[] = ', ';
                                 }
                             }
+
                             $parts[] = ')';
                         } else {
                             $this->seek($ss);
@@ -2356,6 +2376,7 @@ protected function selectorSingle(&$out, $subSelector = false)
                             $this->seek($ss);
                         }
                     }
+
                     continue;
                 }
             }
@@ -2364,9 +2385,9 @@ protected function selectorSingle(&$out, $subSelector = false)
 
             // attribute selector
             if ($char === '[' &&
-              $this->matchChar('[') &&
-              ($this->openString(']', $str, '[') || true) &&
-              $this->matchChar(']')
+                $this->matchChar('[') &&
+                ($this->openString(']', $str, '[') || true) &&
+                $this->matchChar(']')
             ) {
                 $parts[] = '[';
 
@@ -2375,7 +2396,6 @@ protected function selectorSingle(&$out, $subSelector = false)
                 }
 
                 $parts[] = ']';
-
                 continue;
             }
 
@@ -2397,7 +2417,7 @@ protected function selectorSingle(&$out, $subSelector = false)
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (!$parts) {
+        if (! $parts) {
             return false;
         }
 
diff --git a/src/SourceMap/SourceMapGenerator.php b/src/SourceMap/SourceMapGenerator.php
index d2001462..fb11a0bf 100644
--- a/src/SourceMap/SourceMapGenerator.php
+++ b/src/SourceMap/SourceMapGenerator.php
@@ -137,7 +137,9 @@ public function saveMap($content)
         // directory does not exist
         if (! is_dir($dir)) {
             // FIXME: create the dir automatically?
-            throw new CompilerException(sprintf('The directory "%s" does not exist. Cannot save the source map.', $dir));
+            throw new CompilerException(
+                sprintf('The directory "%s" does not exist. Cannot save the source map.', $dir)
+            );
         }
 
         // FIXME: proper saving, with dir write check!

From 2f88bb86b67883b2cb4598a9793679326dc1d3f2 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 31 May 2019 11:48:09 -0400
Subject: [PATCH 212/254] Bump version to v0.8.3

---
 src/Version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Version.php b/src/Version.php
index 19a6a02c..46ffedf2 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.8.2';
+    const VERSION = 'v0.8.3';
 }

From ce644ca417214b7b96e11f099abcc4b2ebb15c03 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 31 May 2019 12:30:54 -0400
Subject: [PATCH 213/254] Fixes #588 - invalid CSS outside of selector

---
 src/Parser.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 9f8cb2e8..3afc2ffe 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -200,8 +200,6 @@ public function parse($buffer)
             array_unshift($this->env->children, $this->charset);
         }
 
-        $this->env->isRoot    = true;
-
         $this->restoreEncoding();
 
         if ($this->cache) {
@@ -675,6 +673,10 @@ protected function parseChunk()
             $foundSomething = false;
 
             if ($this->valueList($value)) {
+                if (empty($this->env->parent)) {
+                    $this->throwParseError('expected "{"');
+                }
+
                 $this->append([Type::T_ASSIGN, $name, $value], $s);
                 $foundSomething = true;
             }

From eea4938784e572e7723480d062ce2b192b1af4d3 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 31 May 2019 12:39:47 -0400
Subject: [PATCH 214/254] Fix #698 add source column to thrown error message

---
 src/Compiler.php | 11 +++++++----
 src/Parser.php   |  6 ++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 782799d1..e3f51d7c 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -4147,14 +4147,17 @@ public function throwError($msg)
             return;
         }
 
+        $line   = $this->sourceLine;
+        $column = $this->sourceColumn;
+
+        $loc = isset($this->sourceNames[$this->sourceIndex])
+             ? $this->sourceNames[$this->sourceIndex] . " on line $line, at column $column"
+             : "line: $line, column: $column";
+
         if (func_num_args() > 1) {
             $msg = call_user_func_array('sprintf', func_get_args());
         }
 
-        $line = $this->sourceLine;
-        $loc = isset($this->sourceNames[$this->sourceIndex])
-             ? $this->sourceNames[$this->sourceIndex] . " on line $line"
-             : "line: $line";
         $msg = "$msg: $loc";
 
         $callStackMsg = $this->callStackMessage();
diff --git a/src/Parser.php b/src/Parser.php
index 3afc2ffe..ebc8155e 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -130,9 +130,11 @@ public function getSourceName()
      */
     public function throwParseError($msg = 'parse error')
     {
-        list($line, /* $column */) = $this->getSourcePosition($this->count);
+        list($line, $column) = $this->getSourcePosition($this->count);
 
-        $loc = empty($this->sourceName) ? "line: $line" : "$this->sourceName on line $line";
+        $loc = empty($this->sourceName)
+             ? "line: $line, column: $column"
+             : "$this->sourceName on line $line, at column $column";
 
         if ($this->peek("(.*?)(\n|$)", $m, $this->count)) {
             throw new ParserException("$msg: failed at `$m[1]` $loc");

From eb5e624b7c8c9260b802ab649d57ed74c87a1968 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 31 May 2019 13:29:30 -0400
Subject: [PATCH 215/254] Fix #491 missing http(s) protocol from url()

---
 src/Parser.php                    | 13 +++++++++++++
 tests/inputs/values.scss          |  2 ++
 tests/outputs/values.css          |  1 +
 tests/outputs_numbered/values.css |  9 +++++----
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index ebc8155e..076f1620 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1413,6 +1413,19 @@ protected function value(&$out)
 
         $this->seek($s);
 
+        if ($this->literal('url(', 4, false) && $this->match('\s*(\/\/\S+)\s*', $m)) {
+            $content = 'url(' . $m[1];
+
+            if ($this->matchChar(')')) {
+                $content .= ')';
+                $out = [Type::T_KEYWORD, $content];
+
+                return true;
+            }
+        }
+
+        $this->seek($s);
+
         // not
         if ($char === 'n' && $this->literal('not', 3, false)) {
             if ($this->whitespace() && $this->value($inner)) {
diff --git a/tests/inputs/values.scss b/tests/inputs/values.scss
index 8b35bbd0..d2e9a06d 100644
--- a/tests/inputs/values.scss
+++ b/tests/inputs/values.scss
@@ -6,6 +6,8 @@
     width: 80%;
     color: "hello world";
     height: url("http://google.com");
+    background-image: url(//host/image.png
+);
     dads: url(http://leafo.net);
     padding: 10px 10px 10px 10px, 3px 3px 3px;
     textblock: "This is a \
diff --git a/tests/outputs/values.css b/tests/outputs/values.css
index 419412f2..ee227112 100644
--- a/tests/outputs/values.css
+++ b/tests/outputs/values.css
@@ -5,6 +5,7 @@
   width: 80%;
   color: "hello world";
   height: url("http://google.com");
+  background-image: url(//host/image.png);
   dads: url(http://leafo.net);
   padding: 10px 10px 10px 10px, 3px 3px 3px;
   textblock: "This is a \
diff --git a/tests/outputs_numbered/values.css b/tests/outputs_numbered/values.css
index 24a961eb..cc4d591a 100644
--- a/tests/outputs_numbered/values.css
+++ b/tests/outputs_numbered/values.css
@@ -6,6 +6,7 @@
   width: 80%;
   color: "hello world";
   height: url("http://google.com");
+  background-image: url(//host/image.png);
   dads: url(http://leafo.net);
   padding: 10px 10px 10px 10px, 3px 3px 3px;
   textblock: "This is a \
@@ -16,7 +17,7 @@ multiline block \
 multiline string.";
   border-radius: -1px -1px -1px black;
   grid-template-columns: [avatar] 2fr [body] 6fr; }
-/* line 21, inputs/values.scss */
+/* line 23, inputs/values.scss */
 #subtraction {
   lit: 10 -11;
   lit: -1;
@@ -26,14 +27,14 @@ multiline string.";
   var: -90;
   var: -90;
   var: -90; }
-/* line 35, inputs/values.scss */
+/* line 37, inputs/values.scss */
 #special {
   a: 12px expression(1 + (3 / Foo.bar("baz" + "bang") + function() {return 12;}) % 12); }
-/* line 39, inputs/values.scss */
+/* line 41, inputs/values.scss */
 #unary {
   b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
-/* line 45, inputs/values.scss */
+/* line 47, inputs/values.scss */
 #self {
   content: "#self"; }

From 986957e227fe0b19774d479ea250f859a739776a Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 31 May 2019 13:40:17 -0400
Subject: [PATCH 216/254] Remove tests that no longer fail

---
 tests/FailingTest.php | 50 -------------------------------------------
 1 file changed, 50 deletions(-)

diff --git a/tests/FailingTest.php b/tests/FailingTest.php
index 86865049..95f693b2 100644
--- a/tests/FailingTest.php
+++ b/tests/FailingTest.php
@@ -62,56 +62,6 @@ public function provideFailing()
     {
         // @codingStandardsIgnoreStart
         return array(
-            array(
-                '#67 - weird @extend behavior', <<<'END_OF_SCSS'
-.nav-bar {
-    background: #eee;
-    > .item {
-        margin: 0 10px;
-    }
-}
-
-
-header ul {
-    @extend .nav-bar;
-    > li {
-        @extend .item;
-    }
-}
-END_OF_SCSS
-                , <<<END_OF_EXPECTED
-.nav-bar, header ul {
-  background: #eee; }
-  .nav-bar > .item, header ul > .item, header ul > li {
-    margin: 0 10px; }
-END_OF_EXPECTED
-            ),
-            array(
-                '#368 - self in selector', <<<'END_OF_SCSS'
-.test {
-    &:last-child:not(+ &:first-child) {
-      padding-left: 10px;
-    }
-}
-END_OF_SCSS
-                , <<<END_OF_EXPECTED
-.test:last-child:not(+ .test:first-child) {
-  padding-left: 10px; }
-END_OF_EXPECTED
-            ),
-            array(
-                '#371 - nested self selector', <<<'END_OF_SCSS'
-ul, ol {
-    & & {
-      display: block;
-    }
-  }
-END_OF_SCSS
-                , <<<END_OF_EXPECTED
-ul ul, ol ul, ul ol, ol ol {
-  display: block; }
-END_OF_EXPECTED
-            ),
 /*************************************************************
             array(
                 '', <<<'END_OF_SCSS'

From 8a7f63059887715940b72f51cef5783c601c50d5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 11:07:35 +0200
Subject: [PATCH 217/254] Unit tests for unicode range syntax with wildcards

---
 tests/inputs/values.scss          | 8 ++++++++
 tests/outputs/values.css          | 7 +++++++
 tests/outputs_numbered/values.css | 7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/tests/inputs/values.scss b/tests/inputs/values.scss
index d2e9a06d..b4111ddb 100644
--- a/tests/inputs/values.scss
+++ b/tests/inputs/values.scss
@@ -49,3 +49,11 @@ multiline string.";
     $self2: &;
     content:'#{$self2}';
 }
+
+@font-face {
+    unicode-range: U+26;
+    unicode-range: U+0-7F;
+    unicode-range: U+0025-00FF;
+    unicode-range: U+4??;
+    unicode-range: U+0025-00FF, U+4??;
+}
diff --git a/tests/outputs/values.css b/tests/outputs/values.css
index ee227112..1550bc73 100644
--- a/tests/outputs/values.css
+++ b/tests/outputs/values.css
@@ -37,3 +37,10 @@ multiline string.";
 
 #self {
   content: "#self"; }
+
+@font-face {
+  unicode-range: U+26;
+  unicode-range: U+0-7F;
+  unicode-range: U+0025-00FF;
+  unicode-range: U+4??;
+  unicode-range: U+0025-00FF, U+4??; }
diff --git a/tests/outputs_numbered/values.css b/tests/outputs_numbered/values.css
index cc4d591a..29187ed7 100644
--- a/tests/outputs_numbered/values.css
+++ b/tests/outputs_numbered/values.css
@@ -38,3 +38,10 @@ multiline string.";
 /* line 47, inputs/values.scss */
 #self {
   content: "#self"; }
+
+@font-face {
+  unicode-range: U+26;
+  unicode-range: U+0-7F;
+  unicode-range: U+0025-00FF;
+  unicode-range: U+4??;
+  unicode-range: U+0025-00FF, U+4??; }

From 149f57267c3b5b2491c4ddad3bb367b09908b599 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 11:07:17 +0200
Subject: [PATCH 218/254] Fix https://github.com/leafo/scssphp/issues/507 :
 support for unicode range syntax with wildcards

---
 src/Parser.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Parser.php b/src/Parser.php
index 076f1620..9c1129b6 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1506,6 +1506,12 @@ protected function value(&$out)
             return true;
         }
 
+        // unicode range with wildcards
+        if ($this->literal('U+', 2) && $this->match('([0-9A-F]+\?*)(-([0-9A-F]+))?', $m, false)) {
+            $out = [Type::T_KEYWORD, 'U+' . $m[0]];
+            return true;
+        }
+
         if ($this->keyword($keyword, false)) {
             if ($this->func($keyword, $out)) {
                 return true;

From 0f8238ec90cb561867e3eba3803f847e0ae3ed8a Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 14:28:34 +0200
Subject: [PATCH 219/254] Unit test for supporting unicode high range chars in
 selector name (https://github.com/leafo/scssphp/issues/531)

---
 tests/inputs/selectors.scss          | 10 ++++++++++
 tests/outputs/selectors.css          |  7 +++++++
 tests/outputs_numbered/selectors.css |  7 +++++++
 3 files changed, 24 insertions(+)

diff --git a/tests/inputs/selectors.scss b/tests/inputs/selectors.scss
index 36ae5a2b..0b9092c2 100644
--- a/tests/inputs/selectors.scss
+++ b/tests/inputs/selectors.scss
@@ -287,3 +287,13 @@ ul, ol {
         display: block;
     }
 }
+
+// unicode
+.👤  {
+  display: inline-block;
+}
+
+.❮ {
+  display:inline;
+  content:'↦';
+}
diff --git a/tests/outputs/selectors.css b/tests/outputs/selectors.css
index 64d55926..66a6ab15 100644
--- a/tests/outputs/selectors.css
+++ b/tests/outputs/selectors.css
@@ -370,3 +370,10 @@ span a, p a, div a {
 
 ul ul, ul ol, ol ul, ol ol {
   display: block; }
+
+.👤 {
+  display: inline-block; }
+
+.❮ {
+  display: inline;
+  content: '↦'; }
diff --git a/tests/outputs_numbered/selectors.css b/tests/outputs_numbered/selectors.css
index d2572233..7b6a8571 100644
--- a/tests/outputs_numbered/selectors.css
+++ b/tests/outputs_numbered/selectors.css
@@ -407,3 +407,10 @@ span a, p a, div a {
 
 ul ul, ul ol, ol ul, ol ol {
   display: block; }
+/* line 292, inputs/selectors.scss */
+.👤 {
+  display: inline-block; }
+/* line 296, inputs/selectors.scss */
+.❮ {
+  display: inline;
+  content: '↦'; }

From 65a799584fb1812d8d97a90a9b228ee5bbdbb206 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 12:22:31 +0200
Subject: [PATCH 220/254] Fix https://github.com/leafo/scssphp/issues/531 : In
 CSS, identifiers (including element names, classes, and IDs in selectors) can
 contain only the characters [a-zA-Z0-9] and ISO 10646 characters U+00A0 and
 higher, plus the hyphen (-) and the underscore (_); they cannot start with a
 digit, two hyphens, or a hyphen followed by a digit. Identifiers can also
 contain escaped characters and any ISO 10646 character as a numeric code (see
 next item).

---
 src/Parser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index 076f1620..78f30475 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -2477,7 +2477,7 @@ protected function keyword(&$word, $eatWhitespace = null)
     {
         if ($this->match(
             $this->utf8
-                ? '(([\pL\w_\-\*!"\']|[\\\\].)([\pL\w\-_"\']|[\\\\].)*)'
+                ? '(([\pL\w\x{00A0}-\x{10FFFF}_\-\*!"\']|[\\\\].)([\pL\w\x{00A0}-\x{10FFFF}\-_"\']|[\\\\].)*)'
                 : '(([\w_\-\*!"\']|[\\\\].)([\w\-_"\']|[\\\\].)*)',
             $m,
             $eatWhitespace

From 7e547154fe5864ed04e9e07655317384df082281 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 15:57:04 +0200
Subject: [PATCH 221/254] Unit test for
 https://github.com/leafo/scssphp/issues/565 : interpolation in comments

---
 tests/inputs/comments.scss          | 8 ++++++++
 tests/outputs/comments.css          | 4 ++++
 tests/outputs_numbered/comments.css | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/tests/inputs/comments.scss b/tests/inputs/comments.scss
index 3e641cc1..65cf8791 100644
--- a/tests/inputs/comments.scss
+++ b/tests/inputs/comments.scss
@@ -45,4 +45,12 @@ a {
 
 // коммент
 
+$color:red;
+$radius:2px;
+
+/* This is a comment with vars references:
+color:#{$color}
+radius:#{$radius}
+ */
+
 // end
diff --git a/tests/outputs/comments.css b/tests/outputs/comments.css
index f6f8d184..51088288 100644
--- a/tests/outputs/comments.css
+++ b/tests/outputs/comments.css
@@ -30,3 +30,7 @@ a {
   /* comment 6 */ }
 /* comment 7 */
 /* коммент */
+/* This is a comment with vars references:
+color:red
+radius:2px
+ */
diff --git a/tests/outputs_numbered/comments.css b/tests/outputs_numbered/comments.css
index 3669d1d8..874ae9f9 100644
--- a/tests/outputs_numbered/comments.css
+++ b/tests/outputs_numbered/comments.css
@@ -32,3 +32,7 @@ a {
   /* comment 6 */ }
 /* comment 7 */
 /* коммент */
+/* This is a comment with vars references:
+color:red
+radius:2px
+ */

From b91f01d87d0fe17dfd873855b3c4ba439408761a Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 15:58:41 +0200
Subject: [PATCH 222/254] Fix https://github.com/leafo/scssphp/issues/565 :
 parse and evaluate interpolation in comments

---
 src/Compiler.php |  6 +++++-
 src/Parser.php   | 45 +++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index e3f51d7c..bf269676 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1349,7 +1349,11 @@ protected function compileBlock(Block $block)
     protected function compileComment($block)
     {
         $out = $this->makeOutputBlock(Type::T_COMMENT);
-        $out->lines[] = $block[1];
+        if (is_string($block[1])) {
+            $out->lines[] = $block[1];
+        } else {
+            $out->lines[] = $this->compileValue($block[1]);
+        }
 
         $this->scope->children[] = $out;
     }
diff --git a/src/Parser.php b/src/Parser.php
index 076f1620..9c286d49 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -980,12 +980,47 @@ protected function whitespace()
 
         while (preg_match(static::$whitePattern, $this->buffer, $m, null, $this->count)) {
             if (isset($m[1]) && empty($this->commentsSeen[$this->count])) {
-                $this->appendComment([Type::T_COMMENT, $m[1]]);
+                // comment that are kept in the output CSS
+                $comment = [];
+                $endCommentCount = $this->count + strlen($m[1]);
+                // find interpolations in comment
+                $p = strpos($this->buffer, '#{', $this->count);
+                while ($p !== false && $p < $endCommentCount) {
+                    $c = substr($this->buffer, $this->count, $p - $this->count);
+                    $comment[] = $c;
+                    $this->count = $p;
+
+                    $out = null;
+                    if ($this->interpolation($out)) {
+                        // keep right spaces in the following string part
+                        if ($out[3]) {
+                            while($this->buffer[$this->count-1] !== '}') {
+                                $this->count--;
+                            }
+                            $out[3] = '';
+                        }
+                        $comment[] = $out;
+                    }
 
+                    $p = strpos($this->buffer, '#{', $this->count);
+                }
+                // remaining part
+                $c = substr($this->buffer, $this->count, $endCommentCount - $this->count);
+
+                if (!$comment) {
+                    // single part static comment
+                    $this->appendComment([Type::T_COMMENT, $c]);
+                } else {
+                    $comment[] = $c;
+                    var_dump($comment);
+                    $this->appendComment([Type::T_COMMENT, [Type::T_STRING, '', $comment]]);
+                }
                 $this->commentsSeen[$this->count] = true;
+                $this->count = $endCommentCount;
+            } else {
+                // comment that are ignored and not kept in the output css
+                $this->count += strlen($m[0]);
             }
-
-            $this->count += strlen($m[0]);
             $gotWhite = true;
         }
 
@@ -999,7 +1034,9 @@ protected function whitespace()
      */
     protected function appendComment($comment)
     {
-        $comment[1] = substr(preg_replace(['/^\s+/m', '/^(.)/m'], ['', ' \1'], $comment[1]), 1);
+        if ($comment[0] === Type::T_COMMENT && is_string($comment[1])) {
+            $comment[1] = substr(preg_replace(['/^\s+/m', '/^(.)/m'], ['', ' \1'], $comment[1]), 1);
+        }
 
         $this->env->comments[] = $comment;
     }

From fc89a5f4272066753b93ed1db8f884255f3488f2 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Mon, 3 Jun 2019 17:37:02 +0200
Subject: [PATCH 223/254] Fix https://github.com/leafo/scssphp/issues/586 :
 ignore the backslash-newline sequence in strings as it is a continuation mark

---
 src/Parser.php                           |  5 +++++
 tests/inputs/interpolation.scss          | 13 ++++++++++++-
 tests/outputs/interpolation.css          |  3 +++
 tests/outputs/values.css                 |  7 ++-----
 tests/outputs_numbered/interpolation.css |  5 +++++
 tests/outputs_numbered/values.css        |  7 ++-----
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 076f1620..8346d5f8 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1918,6 +1918,11 @@ protected function string(&$out)
                     $content[] = $m[2] . "'";
                 } elseif ($this->literal("\\", 1, false)) {
                     $content[] = $m[2] . "\\";
+                } elseif ($this->literal("\r\n", 2, false)
+                  || $this->matchChar("\r", false)
+                  || $this->matchChar("\n", false)
+                  || $this->matchChar("\f", false)) {
+                    // this is a continuation escaping, to be ignored
                 } else {
                     $content[] = $m[2];
                 }
diff --git a/tests/inputs/interpolation.scss b/tests/inputs/interpolation.scss
index 45a5133b..a9419dd6 100644
--- a/tests/inputs/interpolation.scss
+++ b/tests/inputs/interpolation.scss
@@ -139,4 +139,15 @@ div {
 }
 .element {
     @include set-border(#{2px}); // compiles to "2px solid #000"
-}
\ No newline at end of file
+}
+
+$foo: "\
+div > p, \
+div > h1 \
+";
+
+#{$foo} {
+  & > strong {
+    color: red;
+  }
+}
diff --git a/tests/outputs/interpolation.css b/tests/outputs/interpolation.css
index d9fd10e5..1b61ba1f 100644
--- a/tests/outputs/interpolation.css
+++ b/tests/outputs/interpolation.css
@@ -77,3 +77,6 @@ a.badge {
 
 .element {
   border: 2px solid #000; }
+
+div > p > strong, div > h1 > strong {
+  color: red; }
diff --git a/tests/outputs/values.css b/tests/outputs/values.css
index ee227112..ac6375ce 100644
--- a/tests/outputs/values.css
+++ b/tests/outputs/values.css
@@ -8,12 +8,9 @@
   background-image: url(//host/image.png);
   dads: url(http://leafo.net);
   padding: 10px 10px 10px 10px, 3px 3px 3px;
-  textblock: "This is a \
-multiline block \
-#not { color: #eee;}";
+  textblock: "This is a multiline block #not { color: #eee;}";
   margin: 4, 3, 1;
-  content: "This is a \
-multiline string.";
+  content: "This is a multiline string.";
   border-radius: -1px -1px -1px black;
   grid-template-columns: [avatar] 2fr [body] 6fr; }
 
diff --git a/tests/outputs_numbered/interpolation.css b/tests/outputs_numbered/interpolation.css
index da509491..256dde01 100644
--- a/tests/outputs_numbered/interpolation.css
+++ b/tests/outputs_numbered/interpolation.css
@@ -96,3 +96,8 @@ a.badge {
 /* line 140, inputs/interpolation.scss */
 .element {
   border: 2px solid #000; }
+/* line 149, inputs/interpolation.scss */
+/* line 150, inputs/interpolation.scss */
+
+div > p > strong, div > h1 > strong {
+  color: red; }
diff --git a/tests/outputs_numbered/values.css b/tests/outputs_numbered/values.css
index cc4d591a..980d0f06 100644
--- a/tests/outputs_numbered/values.css
+++ b/tests/outputs_numbered/values.css
@@ -9,12 +9,9 @@
   background-image: url(//host/image.png);
   dads: url(http://leafo.net);
   padding: 10px 10px 10px 10px, 3px 3px 3px;
-  textblock: "This is a \
-multiline block \
-#not { color: #eee;}";
+  textblock: "This is a multiline block #not { color: #eee;}";
   margin: 4, 3, 1;
-  content: "This is a \
-multiline string.";
+  content: "This is a multiline string.";
   border-radius: -1px -1px -1px black;
   grid-template-columns: [avatar] 2fr [body] 6fr; }
 /* line 23, inputs/values.scss */

From 0ca337762d7a123c1f5cab245a532f9db78de428 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 09:19:37 +0200
Subject: [PATCH 224/254] Fix for infinite loop with a non interpolation #{
 sequence, add this to the test case and a forgotten var_dump

---
 src/Parser.php                      | 5 ++++-
 tests/inputs/comments.scss          | 1 +
 tests/outputs/comments.css          | 1 +
 tests/outputs_numbered/comments.css | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Parser.php b/src/Parser.php
index 9c286d49..db96cfa4 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1001,6 +1001,10 @@ protected function whitespace()
                         }
                         $comment[] = $out;
                     }
+                    else {
+                        $comment[] = substr($this->buffer, $this->count, 2);
+                        $this->count += 2;
+                    }
 
                     $p = strpos($this->buffer, '#{', $this->count);
                 }
@@ -1012,7 +1016,6 @@ protected function whitespace()
                     $this->appendComment([Type::T_COMMENT, $c]);
                 } else {
                     $comment[] = $c;
-                    var_dump($comment);
                     $this->appendComment([Type::T_COMMENT, [Type::T_STRING, '', $comment]]);
                 }
                 $this->commentsSeen[$this->count] = true;
diff --git a/tests/inputs/comments.scss b/tests/inputs/comments.scss
index 65cf8791..10ff670e 100644
--- a/tests/inputs/comments.scss
+++ b/tests/inputs/comments.scss
@@ -50,6 +50,7 @@ $radius:2px;
 
 /* This is a comment with vars references:
 color:#{$color}
+and a fake #{ doing nothing
 radius:#{$radius}
  */
 
diff --git a/tests/outputs/comments.css b/tests/outputs/comments.css
index 51088288..6cafd02e 100644
--- a/tests/outputs/comments.css
+++ b/tests/outputs/comments.css
@@ -32,5 +32,6 @@ a {
 /* коммент */
 /* This is a comment with vars references:
 color:red
+and a fake #{ doing nothing
 radius:2px
  */
diff --git a/tests/outputs_numbered/comments.css b/tests/outputs_numbered/comments.css
index 874ae9f9..7d751889 100644
--- a/tests/outputs_numbered/comments.css
+++ b/tests/outputs_numbered/comments.css
@@ -34,5 +34,6 @@ a {
 /* коммент */
 /* This is a comment with vars references:
 color:red
+and a fake #{ doing nothing
 radius:2px
  */

From 6b0d45fa738e527b1f2a6662621ff2ab22de7902 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 10:59:50 +0200
Subject: [PATCH 225/254] Test case for at-root variable scoping

---
 tests/inputs/at_root.scss          | 12 ++++++++++++
 tests/outputs/at_root.css          |  4 ++++
 tests/outputs_numbered/at_root.css |  6 ++++++
 3 files changed, 22 insertions(+)

diff --git a/tests/inputs/at_root.scss b/tests/inputs/at_root.scss
index 86d3f559..7e4dbc0b 100644
--- a/tests/inputs/at_root.scss
+++ b/tests/inputs/at_root.scss
@@ -220,3 +220,15 @@ $table-padding: 10px !default;
     text-decoration: none;
   }
 }
+
+// variable scoping
+$test1: 'foo';
+.any {
+  $test2: 'bar';
+  @at-root {
+    .other {
+      content: "#{$test2}";
+      content: "#{$test1}";
+    }
+  }
+}
diff --git a/tests/outputs/at_root.css b/tests/outputs/at_root.css
index c80f3594..6fe091bf 100644
--- a/tests/outputs/at_root.css
+++ b/tests/outputs/at_root.css
@@ -107,3 +107,7 @@ a.badge {
 
 .btn:hover, .btn:focus {
   text-decoration: none; }
+
+.other {
+  content: "bar";
+  content: "foo"; }
diff --git a/tests/outputs_numbered/at_root.css b/tests/outputs_numbered/at_root.css
index d57926ab..84d79764 100644
--- a/tests/outputs_numbered/at_root.css
+++ b/tests/outputs_numbered/at_root.css
@@ -160,3 +160,9 @@ a.badge:hover, a.badge:focus {
 
 .btn:hover, .btn:focus {
   text-decoration: none; }
+/* line 226, inputs/at_root.scss */
+/* line 229, inputs/at_root.scss */
+
+.other {
+  content: "bar";
+  content: "foo"; }

From f4444fcc357f4c8250c0cc3fa393f25f9b0712b7 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 11:03:23 +0200
Subject: [PATCH 226/254] Fix at-root vars scoping and
 https://github.com/leafo/scssphp/issues/380 : you should keep the full store
 env in at-root env, not removing parents but only their block and selectors
 when they are not matching the with condition

---
 src/Compiler.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index e3f51d7c..6ae4d18d 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1147,10 +1147,14 @@ protected function filterWithout($envs, $without)
 
         foreach ($envs as $e) {
             if ($e->block && $this->isWithout($without, $e->block)) {
-                continue;
+                $ec = clone $e;
+                $ec->block = null;
+                $ec->selectors = [];
+                $filtered[] = $ec;
+            }
+            else {
+                $filtered[] = $e;
             }
-
-            $filtered[] = $e;
         }
 
         return $this->extractEnv($filtered);

From b69e8802b7a9e5c883db01eb7cb66cc40af07c08 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 11:38:05 +0200
Subject: [PATCH 227/254] PSR2

---
 src/Parser.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index db96cfa4..15a3d719 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -994,14 +994,13 @@ protected function whitespace()
                     if ($this->interpolation($out)) {
                         // keep right spaces in the following string part
                         if ($out[3]) {
-                            while($this->buffer[$this->count-1] !== '}') {
+                            while ($this->buffer[$this->count-1] !== '}') {
                                 $this->count--;
                             }
                             $out[3] = '';
                         }
                         $comment[] = $out;
-                    }
-                    else {
+                    } else {
                         $comment[] = substr($this->buffer, $this->count, 2);
                         $this->count += 2;
                     }

From abb02a443a04d3ce62f17d02a5fa662a8182a874 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 11:40:52 +0200
Subject: [PATCH 228/254] Test case for
 https://github.com/leafo/scssphp/issues/479

---
 tests/inputs/comments.scss          | 10 ++++++++++
 tests/outputs/comments.css          |  5 +++++
 tests/outputs_numbered/comments.css |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/tests/inputs/comments.scss b/tests/inputs/comments.scss
index 10ff670e..31712ac7 100644
--- a/tests/inputs/comments.scss
+++ b/tests/inputs/comments.scss
@@ -55,3 +55,13 @@ radius:#{$radius}
  */
 
 // end
+
+// comment position in blocks
+.textimage-background-fullheight {
+  .background {
+    /* @noflip */
+    display: block;
+    /* hop */
+    width: 100%;
+  }
+}
diff --git a/tests/outputs/comments.css b/tests/outputs/comments.css
index 6cafd02e..c66b30bf 100644
--- a/tests/outputs/comments.css
+++ b/tests/outputs/comments.css
@@ -35,3 +35,8 @@ color:red
 and a fake #{ doing nothing
 radius:2px
  */
+.textimage-background-fullheight .background {
+  /* @noflip */
+  display: block;
+  /* hop */
+  width: 100%; }
diff --git a/tests/outputs_numbered/comments.css b/tests/outputs_numbered/comments.css
index 7d751889..f7256abb 100644
--- a/tests/outputs_numbered/comments.css
+++ b/tests/outputs_numbered/comments.css
@@ -37,3 +37,10 @@ color:red
 and a fake #{ doing nothing
 radius:2px
  */
+/* line 60, inputs/comments.scss */
+/* line 61, inputs/comments.scss */
+  .textimage-background-fullheight .background {
+    /* @noflip */
+    display: block;
+    /* hop */
+    width: 100%; }

From 8020c8128c83bd2d8ae65b0a4709d9fa9cb89420 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 11:37:38 +0200
Subject: [PATCH 229/254] Fix https://github.com/leafo/scssphp/issues/479:
 ensure comments starting a block will be in this block even if previous is
 empty

---
 src/Parser.php | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Parser.php b/src/Parser.php
index 15a3d719..f99e231e 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -662,9 +662,12 @@ protected function parseChunk()
         }
 
         // opening css block
-        if ($this->selectors($selectors) && $this->matchChar('{')) {
+        if ($this->selectors($selectors) && $this->matchChar('{', false)) {
             $this->pushBlock($selectors, $s);
-
+            if ($this->eatWhiteDefault) {
+                $this->whitespace();
+                $this->append(null); // collect comments at the begining if needed
+            }
             return true;
         }
 
@@ -1051,15 +1054,17 @@ protected function appendComment($comment)
      */
     protected function append($statement, $pos = null)
     {
-        if ($pos !== null) {
-            list($line, $column) = $this->getSourcePosition($pos);
+        if (! is_null($statement)) {
+            if ($pos !== null) {
+                list($line, $column) = $this->getSourcePosition($pos);
 
-            $statement[static::SOURCE_LINE]   = $line;
-            $statement[static::SOURCE_COLUMN] = $column;
-            $statement[static::SOURCE_INDEX]  = $this->sourceIndex;
-        }
+                $statement[static::SOURCE_LINE]   = $line;
+                $statement[static::SOURCE_COLUMN] = $column;
+                $statement[static::SOURCE_INDEX]  = $this->sourceIndex;
+            }
 
-        $this->env->children[] = $statement;
+            $this->env->children[] = $statement;
+        }
 
         $comments = $this->env->comments;
 

From b787f45e4ecf9b6d7e13344801531d46e2ed7e5f Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 16:18:20 +0200
Subject: [PATCH 230/254] Test case for is-superselector() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 35 ++++++++++++++++
 tests/outputs/selector_functions.css          | 40 +++++++++++++++++++
 tests/outputs_numbered/selector_functions.css | 40 +++++++++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index e97336e2..854c6b77 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -12,3 +12,38 @@
 	}
 }
 
+.is-superselector {
+  content: is-superselector(".is-superselector", ".selector"); /* false */
+}
+.is-superselector1 {
+  content: is-superselector("a", "a.disabled"); /*true*/
+}
+.is-superselector2 {
+  content: is-superselector("a", "a:not(:visited)"); /*true*/
+}
+
+.is-superselector3 {
+  content: is-superselector("a", "a[href]"); /*true*/
+}
+
+.is-superselector4 {
+  content: is-superselector("a.disabled", "a"); /*false*/
+}
+
+.is-superselector5 {
+  content: is-superselector("a.disabled", "a.foo.disabled"); /* true*/
+}
+
+.is-superselector6 {
+  content: is-superselector("a.disabled", "a.foo#disabled"); /* false*/
+}
+
+.is-superselector7 {
+  content: is-superselector("a", "sidebar a"); /* true*/
+}
+.is-superselector8 {
+  content: is-superselector("sidebar a", "a"); /* false*/
+}
+.is-superselector9 {
+  content: is-superselector("a", "a"); /* true*/
+}
\ No newline at end of file
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index d608dc9d..842e5d58 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -7,3 +7,43 @@
 .main aside:hover, .sidebar p {
   content: ".main aside:hover";
   content: ".sidebar p"; }
+
+.is-superselector {
+  content: false;
+  /* false */ }
+
+.is-superselector1 {
+  content: true;
+  /*true*/ }
+
+.is-superselector2 {
+  content: true;
+  /*true*/ }
+
+.is-superselector3 {
+  content: true;
+  /*true*/ }
+
+.is-superselector4 {
+  content: false;
+  /*false*/ }
+
+.is-superselector5 {
+  content: true;
+  /* true*/ }
+
+.is-superselector6 {
+  content: false;
+  /* false*/ }
+
+.is-superselector7 {
+  content: true;
+  /* true*/ }
+
+.is-superselector8 {
+  content: false;
+  /* false*/ }
+
+.is-superselector9 {
+  content: true;
+  /* true*/ }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index 7bd5f1b4..1bcefb3e 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -8,3 +8,43 @@
 .main aside:hover, .sidebar p {
   content: ".main aside:hover";
   content: ".sidebar p"; }
+/* line 15, inputs/selector_functions.scss */
+.is-superselector {
+  content: false;
+  /* false */ }
+/* line 18, inputs/selector_functions.scss */
+.is-superselector1 {
+  content: true;
+  /*true*/ }
+/* line 21, inputs/selector_functions.scss */
+.is-superselector2 {
+  content: true;
+  /*true*/ }
+/* line 25, inputs/selector_functions.scss */
+.is-superselector3 {
+  content: true;
+  /*true*/ }
+/* line 29, inputs/selector_functions.scss */
+.is-superselector4 {
+  content: false;
+  /*false*/ }
+/* line 33, inputs/selector_functions.scss */
+.is-superselector5 {
+  content: true;
+  /* true*/ }
+/* line 37, inputs/selector_functions.scss */
+.is-superselector6 {
+  content: false;
+  /* false*/ }
+/* line 41, inputs/selector_functions.scss */
+.is-superselector7 {
+  content: true;
+  /* true*/ }
+/* line 44, inputs/selector_functions.scss */
+.is-superselector8 {
+  content: false;
+  /* false*/ }
+/* line 47, inputs/selector_functions.scss */
+.is-superselector9 {
+  content: true;
+  /* true*/ }

From a5f6c08db73275f8bddce7b8b864d09b51bfc3b6 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 16:18:46 +0200
Subject: [PATCH 231/254] is-superselector() implementation
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 110 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 4b801256..6ff768b8 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6029,4 +6029,114 @@ protected function libInspect($args)
 
         return $args[0];
     }
+
+    /**
+     * Preprocess selector args
+     * @param $arg
+     * @return array|bool
+     */
+    protected function getSelectorArg($arg)
+    {
+        static $parser = null;
+        if (is_null($parser)) {
+            $parser = $this->parserFactory(__METHOD__);
+        }
+        $arg = $this->libUnquote([$arg]);
+        $arg = $this->compileValue($arg);
+        $parsedSelector = [];
+        if ($parser->parseSelector($arg, $parsedSelector)) {
+            $selector = $this->evalSelectors($parsedSelector);
+
+            return $selector;
+        }
+
+        return false;
+    }
+
+    protected static $libIsSuperselector = ['super', 'sub'];
+    protected function libIsSuperselector($args)
+    {
+        list($super, $sub) = $args;
+        $super = $this->getSelectorArg($super);
+        $sub = $this->getSelectorArg($sub);
+
+        return $this->isSuperSelector($super, $sub);
+    }
+
+    /**
+     * Test a $super selector again $sub
+     * @param array $super
+     * @param array $sub
+     * @return bool
+     */
+    protected function isSuperSelector($super, $sub) {
+        // one and only one selector for each arg
+        if (! $super || count($super) !== 1) {
+            return false;
+        }
+        if (! $sub || count($sub) !== 1) {
+            return false;
+        }
+        $super = $this->glueFunctionSelectors($super);
+        $sub = $this->glueFunctionSelectors($sub);
+        $super = reset($super);
+        $sub = reset($sub);
+
+
+        $i = 0;
+        $nextMustMatch = false;
+        foreach ($super as $node) {
+            $compound = '';
+
+            array_walk_recursive(
+              $node,
+              function ($value, $key) use (&$compound) {
+                  $compound .= $value;
+              }
+            );
+
+            if ($this->isImmediateRelationshipCombinator($compound)) {
+                if ($node !== $sub[$i]) {
+                    return false;
+                }
+                $nextMustMatch = true;
+                $i++;
+            }
+            else {
+                while($i<count($sub) && !$this->isSuperPart($node, $sub[$i])) {
+                    if ($nextMustMatch) {
+                        return false;
+                    }
+                    $i++;
+                }
+                if ($i >= count($sub)) {
+                    return false;
+                }
+                $i++;
+                $nextMustMatch = false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Test a part of super selector again a part of sub selector
+     * @param array $superParts
+     * @param array $subParts
+     * @return bool
+     */
+    protected function isSuperPart($superParts, $subParts) {
+        $i = 0;
+        foreach ($superParts as $superPart) {
+            while($i<count($subParts) && $subParts[$i] !== $superPart) {
+                $i++;
+            }
+            if ($i >= count($subParts)) {
+                return false;
+            }
+            $i++;
+        }
+        return true;
+    }
+
 }

From fbcbb283a64b42ac521e0b15e055364bb2bd95b7 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 16:26:58 +0200
Subject: [PATCH 232/254] PSR2

---
 src/Compiler.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 6ff768b8..fce46ec5 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1151,8 +1151,7 @@ protected function filterWithout($envs, $without)
                 $ec->block = null;
                 $ec->selectors = [];
                 $filtered[] = $ec;
-            }
-            else {
+            } else {
                 $filtered[] = $e;
             }
         }
@@ -6069,7 +6068,8 @@ protected function libIsSuperselector($args)
      * @param array $sub
      * @return bool
      */
-    protected function isSuperSelector($super, $sub) {
+    protected function isSuperSelector($super, $sub)
+    {
         // one and only one selector for each arg
         if (! $super || count($super) !== 1) {
             return false;
@@ -6089,10 +6089,10 @@ protected function isSuperSelector($super, $sub) {
             $compound = '';
 
             array_walk_recursive(
-              $node,
-              function ($value, $key) use (&$compound) {
-                  $compound .= $value;
-              }
+                $node,
+                function ($value, $key) use (&$compound) {
+                    $compound .= $value;
+                }
             );
 
             if ($this->isImmediateRelationshipCombinator($compound)) {
@@ -6101,9 +6101,8 @@ function ($value, $key) use (&$compound) {
                 }
                 $nextMustMatch = true;
                 $i++;
-            }
-            else {
-                while($i<count($sub) && !$this->isSuperPart($node, $sub[$i])) {
+            } else {
+                while ($i < count($sub) && ! $this->isSuperPart($node, $sub[$i])) {
                     if ($nextMustMatch) {
                         return false;
                     }
@@ -6116,6 +6115,7 @@ function ($value, $key) use (&$compound) {
                 $nextMustMatch = false;
             }
         }
+
         return true;
     }
 
@@ -6125,10 +6125,11 @@ function ($value, $key) use (&$compound) {
      * @param array $subParts
      * @return bool
      */
-    protected function isSuperPart($superParts, $subParts) {
+    protected function isSuperPart($superParts, $subParts)
+    {
         $i = 0;
         foreach ($superParts as $superPart) {
-            while($i<count($subParts) && $subParts[$i] !== $superPart) {
+            while ($i < count($subParts) && $subParts[$i] !== $superPart) {
                 $i++;
             }
             if ($i >= count($subParts)) {
@@ -6136,6 +6137,7 @@ protected function isSuperPart($superParts, $subParts) {
             }
             $i++;
         }
+
         return true;
     }
 

From 2da918461f95fbde090790ea4b0f6db64bd39ca3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 16:45:05 +0200
Subject: [PATCH 233/254] Throw errors in case of invalid input selectors

---
 src/Compiler.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index fce46ec5..f4e6f8a1 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6072,10 +6072,10 @@ protected function isSuperSelector($super, $sub)
     {
         // one and only one selector for each arg
         if (! $super || count($super) !== 1) {
-            return false;
+            $this->throwError("Invalid super selector for isSuperSelector()");
         }
         if (! $sub || count($sub) !== 1) {
-            return false;
+            $this->throwError("Invalid sub selector for isSuperSelector()");
         }
         $super = $this->glueFunctionSelectors($super);
         $sub = $this->glueFunctionSelectors($sub);

From d5517d083bc77a951e5da6eeecd9244f1f853bf3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 17:16:34 +0200
Subject: [PATCH 234/254] Test case for selector-append() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 18 +++++++++++++++++-
 tests/outputs/selector_functions.css          | 12 ++++++++++++
 tests/outputs_numbered/selector_functions.css | 12 ++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index 854c6b77..d96e5bf1 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -46,4 +46,20 @@
 }
 .is-superselector9 {
   content: is-superselector("a", "a"); /* true*/
-}
\ No newline at end of file
+}
+
+#{selector-append("a", ".disabled")} {
+	content:'a.disabled';
+}
+
+#{selector-append(".accordion", "__copy")} {
+	content:'.accordion__copy';
+}
+
+#{selector-append(".accordion", "__copy, __image")} {
+	content:'.accordion__copy, .accordion__image';
+}
+
+#{selector-append(".accordion, .slider", "__copy, __image")} {
+	content:'.accordion__copy, .slider__copy, .accordion__image, .slider__image';
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index 842e5d58..0e95e838 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -47,3 +47,15 @@
 .is-superselector9 {
   content: true;
   /* true*/ }
+
+a.disabled {
+  content: 'a.disabled'; }
+
+.accordion__copy {
+  content: '.accordion__copy'; }
+
+.accordion__copy, .accordion__image {
+  content: '.accordion__copy, .accordion__image'; }
+
+.accordion__copy, .slider__copy, .accordion__image, .slider__image {
+  content: '.accordion__copy, .slider__copy, .accordion__image, .slider__image'; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index 1bcefb3e..d29f439e 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -48,3 +48,15 @@
 .is-superselector9 {
   content: true;
   /* true*/ }
+/* line 51, inputs/selector_functions.scss */
+a.disabled {
+  content: 'a.disabled'; }
+/* line 55, inputs/selector_functions.scss */
+.accordion__copy {
+  content: '.accordion__copy'; }
+/* line 59, inputs/selector_functions.scss */
+.accordion__copy, .accordion__image {
+  content: '.accordion__copy, .accordion__image'; }
+/* line 63, inputs/selector_functions.scss */
+.accordion__copy, .slider__copy, .accordion__image, .slider__image {
+  content: '.accordion__copy, .slider__copy, .accordion__image, .slider__image'; }

From 3e85bd096b363609090b76e292868cd6a2712ea6 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 17:19:26 +0200
Subject: [PATCH 235/254] Implementation of selector-append() function
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 68 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index f4e6f8a1..05be51a2 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6045,13 +6045,25 @@ protected function getSelectorArg($arg)
         $parsedSelector = [];
         if ($parser->parseSelector($arg, $parsedSelector)) {
             $selector = $this->evalSelectors($parsedSelector);
+            $gluedSelector = $this->glueFunctionSelectors($selector);
 
-            return $selector;
+            return $gluedSelector;
         }
 
         return false;
     }
 
+    /**
+     * Postprocess selector to output in right format
+     * @param $selectors
+     * @return string
+     */
+    protected function formatOutputSelector($selectors)
+    {
+        $selectors = $this->collapseSelectors($selectors, true);
+        return $selectors;
+    }
+
     protected static $libIsSuperselector = ['super', 'sub'];
     protected function libIsSuperselector($args)
     {
@@ -6077,8 +6089,6 @@ protected function isSuperSelector($super, $sub)
         if (! $sub || count($sub) !== 1) {
             $this->throwError("Invalid sub selector for isSuperSelector()");
         }
-        $super = $this->glueFunctionSelectors($super);
-        $sub = $this->glueFunctionSelectors($sub);
         $super = reset($super);
         $sub = reset($sub);
 
@@ -6141,4 +6151,56 @@ protected function isSuperPart($superParts, $subParts)
         return true;
     }
 
+    protected static $libSelectorAppend = ['selector...'];
+    protected function libSelectorAppend($args)
+    {
+        if (count($args) < 1) {
+            $this->throwError("selector-append() needs at least 1 argument");
+        }
+
+        $selectors = array_map([$this, 'getSelectorArg'], $args);
+        return $this->formatOutputSelector($this->selectorAppend($selectors));
+    }
+
+    /**
+     * Append parts of the last selector in the list to the previous, recursively
+     * @param array $selectors
+     * @return array
+     * @throws CompilerException
+     */
+    protected function selectorAppend($selectors)
+    {
+        $lastSelectors = array_pop($selectors);
+        if (!$lastSelectors) {
+            $this->throwError("Invalid selector list in selector-append()");
+        }
+
+        while (count($selectors)) {
+            $previousSelectors = array_pop($selectors);
+            if (!$previousSelectors) {
+                $this->throwError("Invalid selector list in selector-append()");
+            }
+
+            // do the trick, happening $lastSelector to $previousSelector
+            $appended = [];
+            foreach ($lastSelectors as $lastSelector) {
+                $previous = $previousSelectors;
+                foreach ($lastSelector as $lastSelectorParts) {
+                    foreach ($lastSelectorParts as $lastSelectorPart) {
+                        foreach ($previous as $i => $previousSelector) {
+                            foreach ($previousSelector as $j => $previousSelectorParts) {
+                                $previous[$i][$j][] = $lastSelectorPart;
+                            }
+                        }
+                    }
+                }
+                foreach ($previous as $ps) {
+                    $appended[] = $ps;
+                }
+            }
+            $lastSelectors = $appended;
+        }
+
+        return $lastSelectors;
+    }
 }

From 12f5c1c1416710537a5be38a6129a8d6cae00a47 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 19:21:52 +0200
Subject: [PATCH 236/254] Test case for selector-extend() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 11 +++++++++++
 tests/outputs/selector_functions.css          |  9 +++++++++
 tests/outputs_numbered/selector_functions.css |  9 +++++++++
 3 files changed, 29 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index d96e5bf1..7d120055 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -63,3 +63,14 @@
 #{selector-append(".accordion, .slider", "__copy, __image")} {
 	content:'.accordion__copy, .slider__copy, .accordion__image, .slider__image';
 }
+
+#{selector-extend("a.disabled", "a", ".link")} {
+	content: "a.disabled, .link.disabled";
+}
+#{selector-extend("a.disabled", "h1", "h2")} {
+	content: "a.disabled";
+}
+
+#{selector-extend(".guide .info", ".info", ".content nav.sidebar")} {
+	content: ".guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar";
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index 0e95e838..b3f7fc8b 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -59,3 +59,12 @@ a.disabled {
 
 .accordion__copy, .slider__copy, .accordion__image, .slider__image {
   content: '.accordion__copy, .slider__copy, .accordion__image, .slider__image'; }
+
+a.disabled, .link.disabled {
+  content: "a.disabled, .link.disabled"; }
+
+a.disabled {
+  content: "a.disabled"; }
+
+.guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar {
+  content: ".guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index d29f439e..edf19ca9 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -60,3 +60,12 @@ a.disabled {
 /* line 63, inputs/selector_functions.scss */
 .accordion__copy, .slider__copy, .accordion__image, .slider__image {
   content: '.accordion__copy, .slider__copy, .accordion__image, .slider__image'; }
+/* line 67, inputs/selector_functions.scss */
+a.disabled, .link.disabled {
+  content: "a.disabled, .link.disabled"; }
+/* line 70, inputs/selector_functions.scss */
+a.disabled {
+  content: "a.disabled"; }
+/* line 74, inputs/selector_functions.scss */
+.guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar {
+  content: ".guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar"; }

From 2ae6d09ec015b5934c750bce1bf4d5351e97e48a Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 19:23:25 +0200
Subject: [PATCH 237/254] Implementation of selector-extend() reusing the
 internal functions used for @extend
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 05be51a2..46878f4e 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6203,4 +6203,38 @@ protected function selectorAppend($selectors)
 
         return $lastSelectors;
     }
+
+    protected static $libSelectorExtend = ['selectors', 'extendee', 'extender'];
+    protected function libSelectorExtend($args)
+    {
+        list($selectors, $extendee, $extender) = $args;
+        $selectors = $this->getSelectorArg($selectors);
+        $extendee = $this->getSelectorArg($extendee);
+        $extender = $this->getSelectorArg($extender);
+        if (! $selectors || ! $extendee || ! $extender) {
+            $this->throwError("selector-extend() invalid arguments");
+        }
+
+        $saveExtends = $this->extends;
+        $saveExtendsMap = $this->extendsMap;
+
+        $this->extends = [];
+        $this->extendsMap = [];
+
+        foreach ($extendee as $es) {
+            // only use the first one
+            $this->pushExtends(reset($es), $extender, null);
+        }
+
+        $extended = [];
+        foreach ($selectors as $selector) {
+            $extended[] = $selector;
+            $this->matchExtends($selector, $extended);
+        }
+
+        $this->extends = $saveExtends;
+        $this->extendsMap = $saveExtendsMap;
+
+        return $this->formatOutputSelector($extended);
+    }
 }

From f97040c84887ca89d6d5f3f97fae0ae7479b27c3 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 19:34:08 +0200
Subject: [PATCH 238/254] Test case for selector-nest() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 16 ++++++++++++++++
 tests/outputs/selector_functions.css          | 12 ++++++++++++
 tests/outputs_numbered/selector_functions.css | 12 ++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index 7d120055..e2476e3b 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -74,3 +74,19 @@
 #{selector-extend(".guide .info", ".info", ".content nav.sidebar")} {
 	content: ".guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar";
 }
+
+#{selector-nest("ul", "li")} {
+	content: "ul li";
+}
+
+#{selector-nest(".alert, .warning", "p")} {
+	content: ".alert p, .warning p";
+}
+
+#{selector-nest(".alert", "&:hover")} {
+	content: ".alert:hover";
+}
+
+#{selector-nest(".accordion", "&__copy")} {
+	content: ".accordion__copy";
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index b3f7fc8b..daf4c91f 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -68,3 +68,15 @@ a.disabled {
 
 .guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar {
   content: ".guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar"; }
+
+ul li {
+  content: "ul li"; }
+
+.alert p, .warning p {
+  content: ".alert p, .warning p"; }
+
+.alert:hover {
+  content: ".alert:hover"; }
+
+.accordion__copy {
+  content: ".accordion__copy"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index edf19ca9..e5b5f390 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -69,3 +69,15 @@ a.disabled {
 /* line 74, inputs/selector_functions.scss */
 .guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar {
   content: ".guide .info, .guide .content nav.sidebar, .content .guide nav.sidebar"; }
+/* line 78, inputs/selector_functions.scss */
+ul li {
+  content: "ul li"; }
+/* line 82, inputs/selector_functions.scss */
+.alert p, .warning p {
+  content: ".alert p, .warning p"; }
+/* line 86, inputs/selector_functions.scss */
+.alert:hover {
+  content: ".alert:hover"; }
+/* line 90, inputs/selector_functions.scss */
+.accordion__copy {
+  content: ".accordion__copy"; }

From 5a4e328cb563adf9fb9a61a59e086897649ef7b5 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 19:35:16 +0200
Subject: [PATCH 239/254] Implement selector-nest() using the internal compiler
 functions https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 46878f4e..6919606a 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6151,7 +6151,7 @@ protected function isSuperPart($superParts, $subParts)
         return true;
     }
 
-    protected static $libSelectorAppend = ['selector...'];
+    //protected static $libSelectorAppend = ['selector...'];
     protected function libSelectorAppend($args)
     {
         if (count($args) < 1) {
@@ -6237,4 +6237,27 @@ protected function libSelectorExtend($args)
 
         return $this->formatOutputSelector($extended);
     }
+
+    //protected static $libSelectorNest = ['selector...'];
+    protected function libSelectorNest($args)
+    {
+        if (count($args) < 1) {
+            $this->throwError("selector-nest() needs at least 1 argument");
+        }
+
+        $selectorss = array_map([$this, 'getSelectorArg'], $args);
+
+        $envs = [];
+        foreach ($selectorss as $selectors) {
+            $env = new Environment();
+            $env->selectors = $selectors;
+            $envs[] = $env;
+        }
+
+        $envs = array_reverse($envs);
+        $env = $this->extractEnv($envs);
+        $outputSelectors = $this->multiplySelectors($env);
+
+        return $this->formatOutputSelector($outputSelectors);
+    }
 }

From 5eba5b28dbc5e1180ecd80a86c88105f9eb0a9b6 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 19:44:18 +0200
Subject: [PATCH 240/254] Test case for selector-parse() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 8 ++++++++
 tests/outputs/selector_functions.css          | 6 ++++++
 tests/outputs_numbered/selector_functions.css | 8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index e2476e3b..b9a0ebf4 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -90,3 +90,11 @@
 #{selector-nest(".accordion", "&__copy")} {
 	content: ".accordion__copy";
 }
+
+@each $selector in selector-parse(".main aside:hover, .sidebar p") {
+  #{$selector} {
+    @each $part in $selector {
+      content: "#{$part}";
+    }
+  }
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index daf4c91f..e07c918e 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -80,3 +80,9 @@ ul li {
 
 .accordion__copy {
   content: ".accordion__copy"; }
+  .main aside:hover {
+    content: ".main";
+    content: "aside:hover"; }
+  .sidebar p {
+    content: ".sidebar";
+    content: "p"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index e5b5f390..87674525 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -81,3 +81,11 @@ ul li {
 /* line 90, inputs/selector_functions.scss */
 .accordion__copy {
   content: ".accordion__copy"; }
+/* line 95, inputs/selector_functions.scss */
+.main aside:hover {
+  content: ".main";
+  content: "aside:hover"; }
+/* line 95, inputs/selector_functions.scss */
+.sidebar p {
+  content: ".sidebar";
+  content: "p"; }

From e8d7c1dfbf53e1ae4850f36c62365dbc953721ae Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 19:44:53 +0200
Subject: [PATCH 241/254] Implementation of selector-parse() function
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 6919606a..8e876677 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6260,4 +6260,13 @@ protected function libSelectorNest($args)
 
         return $this->formatOutputSelector($outputSelectors);
     }
+
+    protected static $libSelectorParse = ['selectors'];
+    protected function libSelectorParse($args)
+    {
+        $selectors = reset($args);
+        $selectors = $this->getSelectorArg($selectors);
+
+        return $this->formatOutputSelector($selectors);
+    }
 }

From 191f794542ec98a0c983e2be35782579076d86be Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 20:00:19 +0200
Subject: [PATCH 242/254] Test case for selector-replace() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 11 +++++++++++
 tests/outputs/selector_functions.css          |  9 +++++++++
 tests/outputs_numbered/selector_functions.css |  9 +++++++++
 3 files changed, 29 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index b9a0ebf4..c8da4a6a 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -98,3 +98,14 @@
     }
   }
 }
+
+#{selector-replace("a.disabled", "a", ".link")} {
+	content: ".link.disabled";
+}
+#{selector-replace("a.disabled", "h1", "h2")} {
+	content: "a.disabled";
+}
+
+#{selector-replace(".guide .info", ".info", ".content nav.sidebar")} {
+	content: ".guide .content nav.sidebar, .content .guide nav.sidebar";
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index e07c918e..7cfe510d 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -86,3 +86,12 @@ ul li {
   .sidebar p {
     content: ".sidebar";
     content: "p"; }
+
+.link.disabled {
+  content: ".link.disabled"; }
+
+a.disabled {
+  content: "a.disabled"; }
+
+.guide .content nav.sidebar, .content .guide nav.sidebar {
+  content: ".guide .content nav.sidebar, .content .guide nav.sidebar"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index 87674525..e5b9a56e 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -89,3 +89,12 @@ ul li {
 .sidebar p {
   content: ".sidebar";
   content: "p"; }
+/* line 102, inputs/selector_functions.scss */
+.link.disabled {
+  content: ".link.disabled"; }
+/* line 105, inputs/selector_functions.scss */
+a.disabled {
+  content: "a.disabled"; }
+/* line 109, inputs/selector_functions.scss */
+.guide .content nav.sidebar, .content .guide nav.sidebar {
+  content: ".guide .content nav.sidebar, .content .guide nav.sidebar"; }

From dfcfd6837123a4835a0462b32556beb454959e68 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 20:01:29 +0200
Subject: [PATCH 243/254] Implementation of selector-replace() that use a
 common function with selector-extend() as the logic is the same
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 8e876677..88972c36 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6215,6 +6215,38 @@ protected function libSelectorExtend($args)
             $this->throwError("selector-extend() invalid arguments");
         }
 
+        $extended = $this->extendOrReplaceSelectors($selectors, $extendee, $extender);
+        return $this->formatOutputSelector($extended);
+    }
+
+    protected static $libSelectorReplace = ['selectors', 'original', 'replacement'];
+    protected function libSelectorReplace($args)
+    {
+        list($selectors, $original, $replacement) = $args;
+        $selectors = $this->getSelectorArg($selectors);
+        $original = $this->getSelectorArg($original);
+        $replacement = $this->getSelectorArg($replacement);
+
+        if (! $selectors || ! $original || ! $replacement) {
+            $this->throwError("selector-replace() invalid arguments");
+        }
+
+        $replaced = $this->extendOrReplaceSelectors($selectors, $original, $replacement, true);
+        return $this->formatOutputSelector($replaced);
+    }
+
+    /**
+     * Extend/replace in selectors
+     * used by selector-extend and selector-replace that use the same logic
+     *
+     * @param $selectors
+     * @param $extendee
+     * @param $extender
+     * @param bool $replace
+     * @return array
+     */
+    protected function extendOrReplaceSelectors($selectors, $extendee, $extender, $replace = false)
+    {
         $saveExtends = $this->extends;
         $saveExtendsMap = $this->extendsMap;
 
@@ -6228,14 +6260,21 @@ protected function libSelectorExtend($args)
 
         $extended = [];
         foreach ($selectors as $selector) {
-            $extended[] = $selector;
+            if (!$replace) {
+                $extended[] = $selector;
+            }
+            $n = count($extended);
             $this->matchExtends($selector, $extended);
+            // if didnt match, keep the original selector if we are in a replace operation
+            if ($replace and count($extended) === $n) {
+                $extended[] = $selector;
+            }
         }
 
         $this->extends = $saveExtends;
         $this->extendsMap = $saveExtendsMap;
 
-        return $this->formatOutputSelector($extended);
+        return $extended;
     }
 
     //protected static $libSelectorNest = ['selector...'];

From e84f40faa9a466137970d2147946c29726a843ae Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 20:34:35 +0200
Subject: [PATCH 244/254] Test case for simple-selectors() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 13 +++++++++++++
 tests/outputs/selector_functions.css          | 11 +++++++++++
 tests/outputs_numbered/selector_functions.css | 11 +++++++++++
 3 files changed, 35 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index c8da4a6a..d4f39502 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -109,3 +109,16 @@
 #{selector-replace(".guide .info", ".info", ".content nav.sidebar")} {
 	content: ".guide .content nav.sidebar, .content .guide nav.sidebar";
 }
+
+#{simple-selectors("a.disabled")} {
+	/* a, .disabled */
+	@each $part in simple-selectors("a.disabled") {
+		content:"#{$part}";
+	}
+}
+#{simple-selectors("main.blog:after")} {
+	/* main, .blog, :after */
+	@each $part in simple-selectors("main.blog:after") {
+		content:"#{$part}";
+	}
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index 7cfe510d..dff37089 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -95,3 +95,14 @@ a.disabled {
 
 .guide .content nav.sidebar, .content .guide nav.sidebar {
   content: ".guide .content nav.sidebar, .content .guide nav.sidebar"; }
+
+a, .disabled {
+  /* a, .disabled */
+  content: "a";
+  content: ".disabled"; }
+
+main, .blog, :after {
+  /* main, .blog, :after */
+  content: "main";
+  content: ".blog";
+  content: ":after"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index e5b9a56e..d6564e62 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -98,3 +98,14 @@ a.disabled {
 /* line 109, inputs/selector_functions.scss */
 .guide .content nav.sidebar, .content .guide nav.sidebar {
   content: ".guide .content nav.sidebar, .content .guide nav.sidebar"; }
+/* line 113, inputs/selector_functions.scss */
+a, .disabled {
+  /* a, .disabled */
+  content: "a";
+  content: ".disabled"; }
+/* line 119, inputs/selector_functions.scss */
+main, .blog, :after {
+  /* main, .blog, :after */
+  content: "main";
+  content: ".blog";
+  content: ":after"; }

From ccf99512dc2a8286e6fea0db3326faa34faf5a04 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 20:35:06 +0200
Subject: [PATCH 245/254] Implementation of simple-selectors() function
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index 88972c36..aed31dcd 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6308,4 +6308,23 @@ protected function libSelectorParse($args)
 
         return $this->formatOutputSelector($selectors);
     }
+
+    protected static $libSimpleSelectors = ['selector'];
+    protected function libSimpleSelectors($args)
+    {
+        $selector = reset($args);
+        $selector = $this->getSelectorArg($selector);
+
+        // remove selectors list layer, keeping the first one
+        $selector = reset($selector);
+        // remove parts list layer, keeping the first part
+        $part = reset($selector);
+
+        $listParts = [];
+        foreach ($part as $p) {
+            $listParts[] = [Type::T_STRING, '', [$p]];
+        }
+
+        return [Type::T_LIST, ',', $listParts];
+    }
 }

From f12e4b753f53f5d30a184030dd0eee6cf18a8fd3 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 4 Jun 2019 17:13:48 -0400
Subject: [PATCH 246/254] Improve "and"/"or" compatibility with reference
 implementation

---
 src/Compiler.php                     | 19 ++++++++++++----
 tests/inputs/operators.scss          | 34 ++++++++++++++++++++++++++++
 tests/outputs/operators.css          | 10 ++++++++
 tests/outputs_numbered/operators.css | 10 ++++++++
 4 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index 4b801256..ba6c8462 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1151,8 +1151,7 @@ protected function filterWithout($envs, $without)
                 $ec->block = null;
                 $ec->selectors = [];
                 $filtered[] = $ec;
-            }
-            else {
+            } else {
                 $filtered[] = $e;
             }
         }
@@ -2937,8 +2936,14 @@ protected function opAdd($left, $right)
      */
     protected function opAnd($left, $right, $shouldEval)
     {
+        $truthy = ($left === static::$null || $right === static::$null) ||
+                  ($left === static::$false || $left === static::$true) &&
+                  ($right === static::$false || $right === static::$true);
+
         if (! $shouldEval) {
-            return null;
+            if (! $truthy) {
+                return null;
+            }
         }
 
         if ($left !== static::$false && $left !== static::$null) {
@@ -2959,8 +2964,14 @@ protected function opAnd($left, $right, $shouldEval)
      */
     protected function opOr($left, $right, $shouldEval)
     {
+        $truthy = ($left === static::$null || $right === static::$null) ||
+                  ($left === static::$false || $left === static::$true) &&
+                  ($right === static::$false || $right === static::$true);
+
         if (! $shouldEval) {
-            return null;
+            if (! $truthy) {
+                return null;
+            }
         }
 
         if ($left !== static::$false && $left !== static::$null) {
diff --git a/tests/inputs/operators.scss b/tests/inputs/operators.scss
index 31e65b17..096aeb37 100644
--- a/tests/inputs/operators.scss
+++ b/tests/inputs/operators.scss
@@ -191,3 +191,37 @@ $gridRowWidth: 20px;
 {
 width: (2.5 / $gridRowWidth * 100px * 1% );
 }
+
+$and: true and false;
+$or: false or true;
+
+$and1: null and true;  // (null)
+$and2: true and null;  // (null)
+$and3: null and false; // (null)
+$and4: false and null; // false
+$and5: one and null;   // (null)
+$and6: null and one;   // (null)
+
+$or1: null or true;    // true
+$or2: true or null;    // true
+$or3: null or false;   // false
+$or4: false or null;   // (null)
+$or5: one or null;     // one
+$or6: null or one;     // one
+
+#bools-test {
+  a: $and;
+  b: $or;
+  c: $and1;
+  d: $and2;
+  e: $and3;
+  f: $and4;
+  g: $and5;
+  h: $and6;
+  n: $or1;
+  o: $or2;
+  p: $or3;
+  q: $or4;
+  r: $or5;
+  s: $or6;
+}
diff --git a/tests/outputs/operators.css b/tests/outputs/operators.css
index 50aaa8c0..1ec77ea0 100644
--- a/tests/outputs/operators.css
+++ b/tests/outputs/operators.css
@@ -173,3 +173,13 @@ div {
 
 .foo {
   width: 12.5%; }
+
+#bools-test {
+  a: false;
+  b: true;
+  f: false;
+  n: true;
+  o: true;
+  p: false;
+  r: one;
+  s: one; }
diff --git a/tests/outputs_numbered/operators.css b/tests/outputs_numbered/operators.css
index ad4d678e..9a956a2c 100644
--- a/tests/outputs_numbered/operators.css
+++ b/tests/outputs_numbered/operators.css
@@ -174,3 +174,13 @@ div {
 /* line 190, inputs/operators.scss */
 .foo {
   width: 12.5%; }
+/* line 212, inputs/operators.scss */
+#bools-test {
+  a: false;
+  b: true;
+  f: false;
+  n: true;
+  o: true;
+  p: false;
+  r: one;
+  s: one; }

From ae7d9f69bb6107fc4e991b00b6246ea77670dfca Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 23:33:11 +0200
Subject: [PATCH 247/254] Test case for selector-unify() function
 https://github.com/leafo/scssphp/issues/310

---
 tests/inputs/selector_functions.scss          | 24 +++++++++++++++++++
 tests/outputs/selector_functions.css          | 18 ++++++++++++++
 tests/outputs_numbered/selector_functions.css | 18 ++++++++++++++
 3 files changed, 60 insertions(+)

diff --git a/tests/inputs/selector_functions.scss b/tests/inputs/selector_functions.scss
index d4f39502..258aa8f9 100644
--- a/tests/inputs/selector_functions.scss
+++ b/tests/inputs/selector_functions.scss
@@ -122,3 +122,27 @@
 		content:"#{$part}";
 	}
 }
+
+#{selector-unify("a", ".disabled")} {
+	content:"a.disabled";
+}
+
+#{selector-unify("a.disabled", "a.outgoing")} {
+	content: "a.disabled.outgoing";
+}
+
+#{selector-unify("a", "h1")} {
+	content: "null";
+}
+
+#{selector-unify(".warning a", "main a")} {
+	content: ".warning main a, main .warning a";
+}
+
+#{selector-unify("main.warning a", "main a.disabled")} {
+	content: "main.warning a.disabled";
+}
+
+#{selector-unify("main .warning a", "main a")} {
+	content: "main .warning a";
+}
diff --git a/tests/outputs/selector_functions.css b/tests/outputs/selector_functions.css
index dff37089..b071ef6b 100644
--- a/tests/outputs/selector_functions.css
+++ b/tests/outputs/selector_functions.css
@@ -106,3 +106,21 @@ main, .blog, :after {
   content: "main";
   content: ".blog";
   content: ":after"; }
+
+a.disabled {
+  content: "a.disabled"; }
+
+a.disabled.outgoing {
+  content: "a.disabled.outgoing"; }
+
+ {
+  content: "null"; }
+
+.warning main a, main .warning a {
+  content: ".warning main a, main .warning a"; }
+
+main.warning a.disabled {
+  content: "main.warning a.disabled"; }
+
+main .warning a {
+  content: "main .warning a"; }
diff --git a/tests/outputs_numbered/selector_functions.css b/tests/outputs_numbered/selector_functions.css
index d6564e62..c036813c 100644
--- a/tests/outputs_numbered/selector_functions.css
+++ b/tests/outputs_numbered/selector_functions.css
@@ -109,3 +109,21 @@ main, .blog, :after {
   content: "main";
   content: ".blog";
   content: ":after"; }
+/* line 126, inputs/selector_functions.scss */
+a.disabled {
+  content: "a.disabled"; }
+/* line 130, inputs/selector_functions.scss */
+a.disabled.outgoing {
+  content: "a.disabled.outgoing"; }
+/* line 134, inputs/selector_functions.scss */
+ {
+  content: "null"; }
+/* line 138, inputs/selector_functions.scss */
+.warning main a, main .warning a {
+  content: ".warning main a, main .warning a"; }
+/* line 142, inputs/selector_functions.scss */
+main.warning a.disabled {
+  content: "main.warning a.disabled"; }
+/* line 146, inputs/selector_functions.scss */
+main .warning a {
+  content: "main .warning a"; }

From 9591bdc28c4d482caf1e0bcfdb053f16752ebde1 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Tue, 4 Jun 2019 23:42:10 +0200
Subject: [PATCH 248/254] selector-unify() implementation trying to get the
 spirit of the reference implementation
 https://github.com/leafo/scssphp/issues/310

---
 src/Compiler.php | 230 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 230 insertions(+)

diff --git a/src/Compiler.php b/src/Compiler.php
index aed31dcd..d56f9181 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -6309,6 +6309,236 @@ protected function libSelectorParse($args)
         return $this->formatOutputSelector($selectors);
     }
 
+    protected static $libSelectorUnify = ['selectors1', 'selectors2'];
+    protected function libSelectorUnify($args)
+    {
+        list($selectors1, $selectors2) = $args;
+        $selectors1 = $this->getSelectorArg($selectors1);
+        $selectors2 = $this->getSelectorArg($selectors2);
+
+        if (! $selectors1 || ! $selectors2) {
+            $this->throwError("selector-unify() invalid arguments");
+        }
+
+        // only consider the first compound of each
+        $compound1 = reset($selectors1);
+        $compound2 = reset($selectors2);
+
+        // unify them and that's it
+        $unified = $this->unifyCompoundSelectors($compound1, $compound2);
+
+        return $this->formatOutputSelector($unified);
+    }
+
+    /**
+     * The selector-unify magic as its best
+     * (at least works as expected on test cases)
+     *
+     * @param array $compound1
+     * @param array $compound2
+     * @return array|mixed
+     */
+    protected function unifyCompoundSelectors($compound1, $compound2)
+    {
+
+        if (!count($compound1)) {
+            return $compound2;
+        }
+        if (!count($compound2)) {
+            return $compound1;
+        }
+
+        // check that last part are compatible
+        $lastPart1 = array_pop($compound1);
+        $lastPart2 = array_pop($compound2);
+        $last = $this->mergeParts($lastPart1, $lastPart2);
+        if (!$last) {
+            return [[]];
+        }
+        $unifiedCompound = [$last];
+        $unifiedSelectors = [$unifiedCompound];
+
+        // do the rest
+        while (count($compound1) || count($compound2)) {
+            $part1 = end($compound1);
+            $part2 = end($compound2);
+            if ($part1 && ($match2 = $this->matchPartInCompound($part1, $compound2))) {
+                list($compound2, $part2, $after2) = $match2;
+                if ($after2) {
+                    $unifiedSelectors = $this->prependSelectors($unifiedSelectors, $after2);
+                }
+                $c = $this->mergeParts($part1, $part2);
+                $unifiedSelectors = $this->prependSelectors($unifiedSelectors, [$c]);
+                $part1 = $part2 = null;
+                array_pop($compound1);
+            }
+            if ($part2 && ($match1 = $this->matchPartInCompound($part2, $compound1))) {
+                list($compound1, $part1, $after1) = $match1;
+                if ($after1) {
+                    $unifiedSelectors = $this->prependSelectors($unifiedSelectors, $after1);
+                }
+                $c = $this->mergeParts($part2, $part1);
+                $unifiedSelectors = $this->prependSelectors($unifiedSelectors, [$c]);
+                $part1 = $part2 = null;
+                array_pop($compound2);
+            }
+            $new = [];
+            if ($part1 && $part2) {
+                array_pop($compound1);
+                array_pop($compound2);
+                $s = $this->prependSelectors($unifiedSelectors, [$part2]);
+                $new = array_merge($new, $this->prependSelectors($s, [$part1]));
+                $s = $this->prependSelectors($unifiedSelectors, [$part1]);
+                $new = array_merge($new, $this->prependSelectors($s, [$part2]));
+            } elseif ($part1) {
+                array_pop($compound1);
+                $new = array_merge($new, $this->prependSelectors($unifiedSelectors, [$part1]));
+            } elseif ($part2) {
+                array_pop($compound2);
+                $new = array_merge($new, $this->prependSelectors($unifiedSelectors, [$part2]));
+            }
+            if ($new) {
+                $unifiedSelectors = $new;
+            }
+        }
+
+        return $unifiedSelectors;
+    }
+
+    /**
+     * Prepend each selector from $selectors with $parts
+     * @param $selectors
+     * @param $parts
+     * @return array
+     */
+    protected function prependSelectors($selectors, $parts)
+    {
+        $new = [];
+        foreach ($selectors as $compoundSelector) {
+            array_unshift($compoundSelector, $parts);
+            $new[] = $compoundSelector;
+        }
+        return $new;
+    }
+
+    /**
+     * Try to find a matching part in a compound:
+     * - with same html tag name
+     * - with some class or id or something in common
+     * @param array $part
+     * @param array $compound
+     * @return array|bool
+     */
+    protected function matchPartInCompound($part, $compound)
+    {
+        $partTag = $this->findTagName($part);
+        $before = $compound;
+        $after = [];
+        // try to find a match by tag name first
+        while (count($before)) {
+            $p = array_pop($before);
+            if ($partTag && $partTag !== '*' && $partTag == $this->findTagName($p)) {
+                return [$before, $p, $after];
+            }
+            $after[] = $p;
+        }
+        // try again matching a non empty intersection and a compatible tagname
+        $before = $compound;
+        $after = [];
+        while (count($before)) {
+            $p = array_pop($before);
+            if ($this->checkCompatibleTags($partTag, $this->findTagName($p))) {
+                if (count(array_intersect($part, $p))) {
+                    return [$before, $p, $after];
+                }
+            }
+            $after[] = $p;
+        }
+
+        return false;
+    }
+
+    /**
+     * Merge two part list taking care that
+     * - the html tag is coming first - if any
+     * - the :something are coming last
+     *
+     * @param $parts1
+     * @param $parts2
+     * @return array
+     */
+    protected function mergeParts($parts1, $parts2)
+    {
+        $tag1 = $this->findTagName($parts1);
+        $tag2 = $this->findTagName($parts2);
+        $tag = $this->checkCompatibleTags($tag1, $tag2);
+        // not compatible tags
+        if ($tag === false) {
+            return [];
+        }
+
+        if ($tag) {
+            if ($tag1) {
+                $parts1 = array_diff($parts1, [$tag1]);
+            }
+            if ($tag2) {
+                $parts2 = array_diff($parts2, [$tag2]);
+            }
+        }
+
+        $mergedParts = array_merge($parts1, $parts2);
+        $mergedOrderedParts = [];
+        foreach ($mergedParts as $part) {
+            if (strpos($part, ':') === 0) {
+                $mergedOrderedParts[] = $part;
+            }
+        }
+        $mergedParts = array_diff($mergedParts, $mergedOrderedParts);
+        $mergedParts = array_merge($mergedParts, $mergedOrderedParts);
+        if ($tag) {
+            array_unshift($mergedParts, $tag);
+        }
+        return $mergedParts;
+    }
+
+    /**
+     * Check the compatibility between two tag names:
+     * if both are defined they should be identical or one has to be '*'
+     *
+     * @param $tag1
+     * @param $tag2
+     * @return array|bool
+     */
+    protected function checkCompatibleTags($tag1, $tag2)
+    {
+        $tags = [$tag1, $tag2];
+        $tags = array_unique($tags);
+        $tags = array_filter($tags);
+        if (count($tags)>1) {
+            $tags = array_diff($tags, ['*']);
+        }
+        // not compatible nodes
+        if (count($tags)>1) {
+            return false;
+        }
+        return $tags;
+    }
+
+    /**
+     * Find the html tag name in a selector parts list
+     * @param array $parts
+     * @return mixed|string
+     */
+    protected function findTagName($parts)
+    {
+        foreach ($parts as $part) {
+            if (! preg_match('/^[\[.:#%_-]/', $part)) {
+                return $part;
+            }
+        }
+        return '';
+    }
+
     protected static $libSimpleSelectors = ['selector'];
     protected function libSimpleSelectors($args)
     {

From 0fb06259c3901fec20acbb86f88aed1f231eea44 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 4 Jun 2019 18:36:38 -0400
Subject: [PATCH 249/254] formatting

---
 src/Compiler.php | 155 ++++++++++++++++++++++++++++++++++++-----------
 src/Parser.php   |  14 ++++-
 2 files changed, 133 insertions(+), 36 deletions(-)

diff --git a/src/Compiler.php b/src/Compiler.php
index d15b8fd8..d22d0a35 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1352,11 +1352,7 @@ protected function compileBlock(Block $block)
     protected function compileComment($block)
     {
         $out = $this->makeOutputBlock(Type::T_COMMENT);
-        if (is_string($block[1])) {
-            $out->lines[] = $block[1];
-        } else {
-            $out->lines[] = $this->compileValue($block[1]);
-        }
+        $out->lines[] = is_string($block[1]) ? $block[1] : $this->compileValue($block[1]);
 
         $this->scope->children[] = $out;
     }
@@ -6043,18 +6039,24 @@ protected function libInspect($args)
 
     /**
      * Preprocess selector args
-     * @param $arg
-     * @return array|bool
+     *
+     * @param array $arg
+     *
+     * @return array|boolean
      */
     protected function getSelectorArg($arg)
     {
         static $parser = null;
+
         if (is_null($parser)) {
             $parser = $this->parserFactory(__METHOD__);
         }
+
         $arg = $this->libUnquote([$arg]);
         $arg = $this->compileValue($arg);
+
         $parsedSelector = [];
+
         if ($parser->parseSelector($arg, $parsedSelector)) {
             $selector = $this->evalSelectors($parsedSelector);
             $gluedSelector = $this->glueFunctionSelectors($selector);
@@ -6067,12 +6069,15 @@ protected function getSelectorArg($arg)
 
     /**
      * Postprocess selector to output in right format
-     * @param $selectors
+     *
+     * @param array $selectors
+     *
      * @return string
      */
     protected function formatOutputSelector($selectors)
     {
         $selectors = $this->collapseSelectors($selectors, true);
+
         return $selectors;
     }
 
@@ -6080,6 +6085,7 @@ protected function formatOutputSelector($selectors)
     protected function libIsSuperselector($args)
     {
         list($super, $sub) = $args;
+
         $super = $this->getSelectorArg($super);
         $sub = $this->getSelectorArg($sub);
 
@@ -6088,9 +6094,11 @@ protected function libIsSuperselector($args)
 
     /**
      * Test a $super selector again $sub
+     *
      * @param array $super
      * @param array $sub
-     * @return bool
+     *
+     * @return boolean
      */
     protected function isSuperSelector($super, $sub)
     {
@@ -6098,15 +6106,17 @@ protected function isSuperSelector($super, $sub)
         if (! $super || count($super) !== 1) {
             $this->throwError("Invalid super selector for isSuperSelector()");
         }
+
         if (! $sub || count($sub) !== 1) {
             $this->throwError("Invalid sub selector for isSuperSelector()");
         }
+
         $super = reset($super);
         $sub = reset($sub);
 
-
         $i = 0;
         $nextMustMatch = false;
+
         foreach ($super as $node) {
             $compound = '';
 
@@ -6121,6 +6131,7 @@ function ($value, $key) use (&$compound) {
                 if ($node !== $sub[$i]) {
                     return false;
                 }
+
                 $nextMustMatch = true;
                 $i++;
             } else {
@@ -6128,13 +6139,16 @@ function ($value, $key) use (&$compound) {
                     if ($nextMustMatch) {
                         return false;
                     }
+
                     $i++;
                 }
+
                 if ($i >= count($sub)) {
                     return false;
                 }
-                $i++;
+
                 $nextMustMatch = false;
+                $i++;
             }
         }
 
@@ -6143,20 +6157,25 @@ function ($value, $key) use (&$compound) {
 
     /**
      * Test a part of super selector again a part of sub selector
+     *
      * @param array $superParts
      * @param array $subParts
-     * @return bool
+     *
+     * @return boolean
      */
     protected function isSuperPart($superParts, $subParts)
     {
         $i = 0;
+
         foreach ($superParts as $superPart) {
             while ($i < count($subParts) && $subParts[$i] !== $superPart) {
                 $i++;
             }
+
             if ($i >= count($subParts)) {
                 return false;
             }
+
             $i++;
         }
 
@@ -6171,32 +6190,40 @@ protected function libSelectorAppend($args)
         }
 
         $selectors = array_map([$this, 'getSelectorArg'], $args);
+
         return $this->formatOutputSelector($this->selectorAppend($selectors));
     }
 
     /**
      * Append parts of the last selector in the list to the previous, recursively
+     *
      * @param array $selectors
+     *
      * @return array
-     * @throws CompilerException
+     *
+     * @throws \Leafo\ScssPhp\Exception\CompilerException
      */
     protected function selectorAppend($selectors)
     {
         $lastSelectors = array_pop($selectors);
-        if (!$lastSelectors) {
+
+        if (! $lastSelectors) {
             $this->throwError("Invalid selector list in selector-append()");
         }
 
         while (count($selectors)) {
             $previousSelectors = array_pop($selectors);
-            if (!$previousSelectors) {
+
+            if (! $previousSelectors) {
                 $this->throwError("Invalid selector list in selector-append()");
             }
 
             // do the trick, happening $lastSelector to $previousSelector
             $appended = [];
+
             foreach ($lastSelectors as $lastSelector) {
                 $previous = $previousSelectors;
+
                 foreach ($lastSelector as $lastSelectorParts) {
                     foreach ($lastSelectorParts as $lastSelectorPart) {
                         foreach ($previous as $i => $previousSelector) {
@@ -6206,10 +6233,12 @@ protected function selectorAppend($selectors)
                         }
                     }
                 }
+
                 foreach ($previous as $ps) {
                     $appended[] = $ps;
                 }
             }
+
             $lastSelectors = $appended;
         }
 
@@ -6220,14 +6249,17 @@ protected function selectorAppend($selectors)
     protected function libSelectorExtend($args)
     {
         list($selectors, $extendee, $extender) = $args;
+
         $selectors = $this->getSelectorArg($selectors);
         $extendee = $this->getSelectorArg($extendee);
         $extender = $this->getSelectorArg($extender);
+
         if (! $selectors || ! $extendee || ! $extender) {
             $this->throwError("selector-extend() invalid arguments");
         }
 
         $extended = $this->extendOrReplaceSelectors($selectors, $extendee, $extender);
+
         return $this->formatOutputSelector($extended);
     }
 
@@ -6235,6 +6267,7 @@ protected function libSelectorExtend($args)
     protected function libSelectorReplace($args)
     {
         list($selectors, $original, $replacement) = $args;
+
         $selectors = $this->getSelectorArg($selectors);
         $original = $this->getSelectorArg($original);
         $replacement = $this->getSelectorArg($replacement);
@@ -6244,6 +6277,7 @@ protected function libSelectorReplace($args)
         }
 
         $replaced = $this->extendOrReplaceSelectors($selectors, $original, $replacement, true);
+
         return $this->formatOutputSelector($replaced);
     }
 
@@ -6251,10 +6285,11 @@ protected function libSelectorReplace($args)
      * Extend/replace in selectors
      * used by selector-extend and selector-replace that use the same logic
      *
-     * @param $selectors
-     * @param $extendee
-     * @param $extender
-     * @param bool $replace
+     * @param array   $selectors
+     * @param array   $extendee
+     * @param array   $extender
+     * @param boolean $replace
+     *
      * @return array
      */
     protected function extendOrReplaceSelectors($selectors, $extendee, $extender, $replace = false)
@@ -6271,12 +6306,16 @@ protected function extendOrReplaceSelectors($selectors, $extendee, $extender, $r
         }
 
         $extended = [];
+
         foreach ($selectors as $selector) {
-            if (!$replace) {
+            if (! $replace) {
                 $extended[] = $selector;
             }
+
             $n = count($extended);
+
             $this->matchExtends($selector, $extended);
+
             // if didnt match, keep the original selector if we are in a replace operation
             if ($replace and count($extended) === $n) {
                 $extended[] = $selector;
@@ -6296,12 +6335,13 @@ protected function libSelectorNest($args)
             $this->throwError("selector-nest() needs at least 1 argument");
         }
 
-        $selectorss = array_map([$this, 'getSelectorArg'], $args);
+        $selectorsMap = array_map([$this, 'getSelectorArg'], $args);
 
         $envs = [];
-        foreach ($selectorss as $selectors) {
+        foreach ($selectorsMap as $selectors) {
             $env = new Environment();
             $env->selectors = $selectors;
+
             $envs[] = $env;
         }
 
@@ -6325,6 +6365,7 @@ protected function libSelectorParse($args)
     protected function libSelectorUnify($args)
     {
         list($selectors1, $selectors2) = $args;
+
         $selectors1 = $this->getSelectorArg($selectors1);
         $selectors2 = $this->getSelectorArg($selectors2);
 
@@ -6352,11 +6393,11 @@ protected function libSelectorUnify($args)
      */
     protected function unifyCompoundSelectors($compound1, $compound2)
     {
-
-        if (!count($compound1)) {
+        if (! count($compound1)) {
             return $compound2;
         }
-        if (!count($compound2)) {
+
+        if (! count($compound2)) {
             return $compound1;
         }
 
@@ -6364,9 +6405,11 @@ protected function unifyCompoundSelectors($compound1, $compound2)
         $lastPart1 = array_pop($compound1);
         $lastPart2 = array_pop($compound2);
         $last = $this->mergeParts($lastPart1, $lastPart2);
-        if (!$last) {
+
+        if (! $last) {
             return [[]];
         }
+
         $unifiedCompound = [$last];
         $unifiedSelectors = [$unifiedCompound];
 
@@ -6374,41 +6417,55 @@ protected function unifyCompoundSelectors($compound1, $compound2)
         while (count($compound1) || count($compound2)) {
             $part1 = end($compound1);
             $part2 = end($compound2);
+
             if ($part1 && ($match2 = $this->matchPartInCompound($part1, $compound2))) {
                 list($compound2, $part2, $after2) = $match2;
+
                 if ($after2) {
                     $unifiedSelectors = $this->prependSelectors($unifiedSelectors, $after2);
                 }
+
                 $c = $this->mergeParts($part1, $part2);
                 $unifiedSelectors = $this->prependSelectors($unifiedSelectors, [$c]);
                 $part1 = $part2 = null;
+
                 array_pop($compound1);
             }
+
             if ($part2 && ($match1 = $this->matchPartInCompound($part2, $compound1))) {
                 list($compound1, $part1, $after1) = $match1;
+
                 if ($after1) {
                     $unifiedSelectors = $this->prependSelectors($unifiedSelectors, $after1);
                 }
+
                 $c = $this->mergeParts($part2, $part1);
                 $unifiedSelectors = $this->prependSelectors($unifiedSelectors, [$c]);
                 $part1 = $part2 = null;
+
                 array_pop($compound2);
             }
+
             $new = [];
+
             if ($part1 && $part2) {
                 array_pop($compound1);
                 array_pop($compound2);
+
                 $s = $this->prependSelectors($unifiedSelectors, [$part2]);
                 $new = array_merge($new, $this->prependSelectors($s, [$part1]));
                 $s = $this->prependSelectors($unifiedSelectors, [$part1]);
                 $new = array_merge($new, $this->prependSelectors($s, [$part2]));
             } elseif ($part1) {
                 array_pop($compound1);
+
                 $new = array_merge($new, $this->prependSelectors($unifiedSelectors, [$part1]));
             } elseif ($part2) {
                 array_pop($compound2);
+
                 $new = array_merge($new, $this->prependSelectors($unifiedSelectors, [$part2]));
             }
+
             if ($new) {
                 $unifiedSelectors = $new;
             }
@@ -6419,17 +6476,22 @@ protected function unifyCompoundSelectors($compound1, $compound2)
 
     /**
      * Prepend each selector from $selectors with $parts
-     * @param $selectors
-     * @param $parts
+     *
+     * @param array $selectors
+     * @param array $parts
+     *
      * @return array
      */
     protected function prependSelectors($selectors, $parts)
     {
         $new = [];
+
         foreach ($selectors as $compoundSelector) {
             array_unshift($compoundSelector, $parts);
+
             $new[] = $compoundSelector;
         }
+
         return $new;
     }
 
@@ -6437,33 +6499,42 @@ protected function prependSelectors($selectors, $parts)
      * Try to find a matching part in a compound:
      * - with same html tag name
      * - with some class or id or something in common
+     *
      * @param array $part
      * @param array $compound
-     * @return array|bool
+     *
+     * @return array|boolean
      */
     protected function matchPartInCompound($part, $compound)
     {
         $partTag = $this->findTagName($part);
         $before = $compound;
         $after = [];
+
         // try to find a match by tag name first
         while (count($before)) {
             $p = array_pop($before);
+
             if ($partTag && $partTag !== '*' && $partTag == $this->findTagName($p)) {
                 return [$before, $p, $after];
             }
+
             $after[] = $p;
         }
+
         // try again matching a non empty intersection and a compatible tagname
         $before = $compound;
         $after = [];
+
         while (count($before)) {
             $p = array_pop($before);
+
             if ($this->checkCompatibleTags($partTag, $this->findTagName($p))) {
                 if (count(array_intersect($part, $p))) {
                     return [$before, $p, $after];
                 }
             }
+
             $after[] = $p;
         }
 
@@ -6475,8 +6546,9 @@ protected function matchPartInCompound($part, $compound)
      * - the html tag is coming first - if any
      * - the :something are coming last
      *
-     * @param $parts1
-     * @param $parts2
+     * @param array $parts1
+     * @param array $parts2
+     *
      * @return array
      */
     protected function mergeParts($parts1, $parts2)
@@ -6484,6 +6556,7 @@ protected function mergeParts($parts1, $parts2)
         $tag1 = $this->findTagName($parts1);
         $tag2 = $this->findTagName($parts2);
         $tag = $this->checkCompatibleTags($tag1, $tag2);
+
         // not compatible tags
         if ($tag === false) {
             return [];
@@ -6493,6 +6566,7 @@ protected function mergeParts($parts1, $parts2)
             if ($tag1) {
                 $parts1 = array_diff($parts1, [$tag1]);
             }
+
             if ($tag2) {
                 $parts2 = array_diff($parts2, [$tag2]);
             }
@@ -6500,16 +6574,20 @@ protected function mergeParts($parts1, $parts2)
 
         $mergedParts = array_merge($parts1, $parts2);
         $mergedOrderedParts = [];
+
         foreach ($mergedParts as $part) {
             if (strpos($part, ':') === 0) {
                 $mergedOrderedParts[] = $part;
             }
         }
+
         $mergedParts = array_diff($mergedParts, $mergedOrderedParts);
         $mergedParts = array_merge($mergedParts, $mergedOrderedParts);
+
         if ($tag) {
             array_unshift($mergedParts, $tag);
         }
+
         return $mergedParts;
     }
 
@@ -6517,28 +6595,34 @@ protected function mergeParts($parts1, $parts2)
      * Check the compatibility between two tag names:
      * if both are defined they should be identical or one has to be '*'
      *
-     * @param $tag1
-     * @param $tag2
-     * @return array|bool
+     * @param string $tag1
+     * @param string $tag2
+     *
+     * @return array|boolean
      */
     protected function checkCompatibleTags($tag1, $tag2)
     {
         $tags = [$tag1, $tag2];
         $tags = array_unique($tags);
         $tags = array_filter($tags);
+
         if (count($tags)>1) {
             $tags = array_diff($tags, ['*']);
         }
+
         // not compatible nodes
         if (count($tags)>1) {
             return false;
         }
+
         return $tags;
     }
 
     /**
      * Find the html tag name in a selector parts list
+     *
      * @param array $parts
+     *
      * @return mixed|string
      */
     protected function findTagName($parts)
@@ -6548,6 +6632,7 @@ protected function findTagName($parts)
                 return $part;
             }
         }
+
         return '';
     }
 
@@ -6559,10 +6644,12 @@ protected function libSimpleSelectors($args)
 
         // remove selectors list layer, keeping the first one
         $selector = reset($selector);
+
         // remove parts list layer, keeping the first part
         $part = reset($selector);
 
         $listParts = [];
+
         foreach ($part as $p) {
             $listParts[] = [Type::T_STRING, '', [$p]];
         }
diff --git a/src/Parser.php b/src/Parser.php
index d39ebcbd..c05e4ee8 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -664,10 +664,12 @@ protected function parseChunk()
         // opening css block
         if ($this->selectors($selectors) && $this->matchChar('{', false)) {
             $this->pushBlock($selectors, $s);
+
             if ($this->eatWhiteDefault) {
                 $this->whitespace();
                 $this->append(null); // collect comments at the begining if needed
             }
+
             return true;
         }
 
@@ -986,46 +988,54 @@ protected function whitespace()
                 // comment that are kept in the output CSS
                 $comment = [];
                 $endCommentCount = $this->count + strlen($m[1]);
+
                 // find interpolations in comment
                 $p = strpos($this->buffer, '#{', $this->count);
+
                 while ($p !== false && $p < $endCommentCount) {
                     $c = substr($this->buffer, $this->count, $p - $this->count);
                     $comment[] = $c;
                     $this->count = $p;
-
                     $out = null;
+
                     if ($this->interpolation($out)) {
                         // keep right spaces in the following string part
                         if ($out[3]) {
                             while ($this->buffer[$this->count-1] !== '}') {
                                 $this->count--;
                             }
+
                             $out[3] = '';
                         }
+
                         $comment[] = $out;
                     } else {
                         $comment[] = substr($this->buffer, $this->count, 2);
+
                         $this->count += 2;
                     }
 
                     $p = strpos($this->buffer, '#{', $this->count);
                 }
+
                 // remaining part
                 $c = substr($this->buffer, $this->count, $endCommentCount - $this->count);
 
-                if (!$comment) {
+                if (! $comment) {
                     // single part static comment
                     $this->appendComment([Type::T_COMMENT, $c]);
                 } else {
                     $comment[] = $c;
                     $this->appendComment([Type::T_COMMENT, [Type::T_STRING, '', $comment]]);
                 }
+
                 $this->commentsSeen[$this->count] = true;
                 $this->count = $endCommentCount;
             } else {
                 // comment that are ignored and not kept in the output css
                 $this->count += strlen($m[0]);
             }
+
             $gotWhite = true;
         }
 

From 2e5e474b0495fbd3b7e44781460cfdd53b3142f2 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 4 Jun 2019 18:44:35 -0400
Subject: [PATCH 250/254] Update ruby sass reference tests (from archived repo)

---
 tests/scss_test.rb | 151 ++++++++++++++++++++++++++++++++++++---------
 1 file changed, 121 insertions(+), 30 deletions(-)

diff --git a/tests/scss_test.rb b/tests/scss_test.rb
index 3d849d8a..41fa8e75 100644
--- a/tests/scss_test.rb
+++ b/tests/scss_test.rb
@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/test_helper'
 
@@ -1015,7 +1014,8 @@ def test_function_args
   end
 
   def test_disallowed_function_names
-    assert_warning(<<WARNING) {render(<<SCSS)}
+    Sass::Deprecation.allow_double_warnings do
+      assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "calc" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1023,7 +1023,7 @@ def test_disallowed_function_names
 @function calc() {}
 SCSS
 
-    assert_warning(<<WARNING) {render(<<SCSS)}
+      assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "-my-calc" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1031,7 +1031,7 @@ def test_disallowed_function_names
 @function -my-calc() {}
 SCSS
 
-    assert_warning(<<WARNING) {render(<<SCSS)}
+      assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "element" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1039,7 +1039,7 @@ def test_disallowed_function_names
 @function element() {}
 SCSS
 
-    assert_warning(<<WARNING) {render(<<SCSS)}
+      assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "-my-element" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1047,7 +1047,7 @@ def test_disallowed_function_names
 @function -my-element() {}
 SCSS
 
-    assert_warning(<<WARNING) {render(<<SCSS)}
+      assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "expression" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
@@ -1055,13 +1055,14 @@ def test_disallowed_function_names
 @function expression() {}
 SCSS
 
-    assert_warning(<<WARNING) {render(<<SCSS)}
+      assert_warning(<<WARNING) {render(<<SCSS)}
 DEPRECATION WARNING on line 1 of test_disallowed_function_names_inline.scss:
 Naming a function "url" is disallowed and will be an error in future versions of Sass.
 This name conflicts with an existing CSS function with special parse rules.
 WARNING
 @function url() {}
 SCSS
+    end
   end
 
   def test_allowed_function_names
@@ -2172,7 +2173,7 @@ def test_selector_interpolation_at_dashes
   end
 
   def test_selector_interpolation_in_reference_combinator
-    assert_equal <<CSS, render(<<SCSS)
+    silence_warnings {assert_equal <<CSS, render(<<SCSS)}
 .foo /a/ .bar /b|c/ .baz {
   a: b; }
 CSS
@@ -2286,16 +2287,16 @@ def test_media_interpolation_with_reparse
 
   def test_moz_document_interpolation
     assert_equal <<CSS, render(<<SCSS)
-@-moz-document url(http://sass-lang.com/),
-               url-prefix(http://sass-lang.com/docs),
+@-moz-document url(https://sass-lang.com/),
+               url-prefix(https://sass-lang.com/docs),
                domain(sass-lang.com),
                domain("sass-lang.com") {
   .foo {
     a: b; } }
 CSS
 $domain: "sass-lang.com";
-@-moz-document url(http://\#{$domain}/),
-               url-prefix(http://\#{$domain}/docs),
+@-moz-document url(https://\#{$domain}/),
+               url-prefix(https://\#{$domain}/docs),
                domain(\#{$domain}),
                \#{domain($domain)} {
   .foo {a: b}
@@ -2340,7 +2341,7 @@ def test_supports_bubbling
 
   def test_random_directive_interpolation
     assert_equal <<CSS, render(<<SCSS)
-@foo url(http://sass-lang.com/),
+@foo url(https://sass-lang.com/),
      domain("sass-lang.com"),
      "foobarbaz",
      foobarbaz {
@@ -2348,7 +2349,7 @@ def test_random_directive_interpolation
     a: b; } }
 CSS
 $domain: "sass-lang.com";
-@foo url(http://\#{$domain}/),
+@foo url(https://\#{$domain}/),
      \#{domain($domain)},
      "foo\#{'ba' + 'r'}baz",
      foo\#{'ba' + 'r'}baz {
@@ -3387,22 +3388,22 @@ def test_rules_beneath_properties
   def test_uses_property_exception_with_star_hack
     render <<SCSS
 foo {
-  *bar:baz [fail]; }
+  *bar:baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  *bar:baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  *bar:baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
   def test_uses_property_exception_with_colon_hack
     render <<SCSS
 foo {
-  :bar:baz [fail]; }
+  :bar:baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  :bar:baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  :bar:baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
@@ -3420,22 +3421,22 @@ def test_uses_rule_exception_with_dot_hack
   def test_uses_property_exception_with_space_after_name
     render <<SCSS
 foo {
-  bar: baz [fail]; }
+  bar: baz <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  bar: baz ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  bar: baz <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
   def test_uses_property_exception_with_non_identifier_after_name
     render <<SCSS
 foo {
-  bar:1px [fail]; }
+  bar:1px <fail>; }
 SCSS
     assert(false, "Expected syntax error")
   rescue Sass::SyntaxError => e
-    assert_equal 'Invalid CSS after "  bar:1px ": expected ";", was "[fail]; }"', e.message
+    assert_equal 'Invalid CSS after "  bar:1px <fail>": expected expression (e.g. 1px, bold), was "; }"', e.message
     assert_equal 2, e.sass_line
   end
 
@@ -3649,6 +3650,40 @@ def test_raw_newline_warning
 
   # Regression
 
+  # Regression test for #2031.
+  def test_no_interpolation_warning_in_nested_selector
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+z a:b(n+1) {
+  x: y; }
+CSS
+z {
+  a:b(n+\#{1}) {
+    x: y;
+  }
+}
+SCSS
+  end
+
+  # Ensures that the fix for #2031 doesn't hide legitimate warnings.
+  def test_interpolation_warning_in_selector_like_property
+    assert_warning(<<WARNING) {assert_equal(<<CSS, render(<<SCSS))}
+DEPRECATION WARNING on line 2 of #{filename_for_test :scss}:
+\#{} interpolation near operators will be simplified in a future version of Sass.
+To preserve the current behavior, use quotes:
+
+  unquote("n+1")
+
+You can use the sass-convert command to automatically fix most cases.
+WARNING
+z {
+  a: b(n+1); }
+CSS
+z {
+  a:b(n+\#{1});
+}
+SCSS
+  end
+
   def test_escape_in_selector
     assert_equal(<<CSS, render(".\\!foo {a: b}"))
 .\\!foo {
@@ -3791,7 +3826,7 @@ def test_loud_comment_in_compressed_mode
   def test_parsing_decimals_followed_by_comments_doesnt_take_forever
     assert_equal(<<CSS, render(<<SCSS))
 .foo {
-  padding: 4.21053% 4.21053% 5.63158%; }
+  padding: 4.2105263158% 4.2105263158% 5.6315789474%; }
 CSS
 .foo {
   padding: 4.21052631578947% 4.21052631578947% 5.631578947368421% /**/
@@ -3824,7 +3859,19 @@ def test_import_comments_in_imports
   end
 
   def test_reference_combinator_with_parent_ref
-    assert_equal <<CSS, render(<<SCSS)
+    silence_warnings {assert_equal <<CSS, render(<<SCSS)}
+a /foo/ b {
+  c: d; }
+CSS
+a {& /foo/ b {c: d}}
+SCSS
+  end
+
+  def test_reference_combinator_warning
+    assert_warning(<<WARNING) {assert_equal <<CSS, render(<<SCSS)}
+DEPRECATION WARNING on line 1, column 8 of test_reference_combinator_warning_inline.scss:
+The reference combinator /foo/ is deprecated and will be removed in a future release.
+WARNING
 a /foo/ b {
   c: d; }
 CSS
@@ -3894,12 +3941,13 @@ def test_interpolation_with_bracket_on_next_line
 SCSS
   end
 
-  def test_extra_comma_in_mixin_arglist_error
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
-Invalid CSS after "...clude foo(bar, ": expected mixin argument, was ");"
-MESSAGE
-@mixin foo($a1, $a2) {
-  baz: $a1 $a2;
+  def test_extra_comma_in_mixin_arglist
+    assert_equal <<CSS, render(<<SCSS)
+.bar {
+  baz: bar; }
+CSS
+@mixin foo($a1,) {
+  baz: $a1;
 }
 
 .bar {
@@ -3908,6 +3956,39 @@ def test_extra_comma_in_mixin_arglist_error
 SCSS
   end
 
+
+  def test_extra_comma_between_parameters_in_mixin_arglist
+    assert_raise_message(Sass::SyntaxError, "Invalid CSS after \"...nclude foo(bar,\": expected \")\", was \", baz );\"") {render <<SCSS}
+@mixin foo($a1, $a2) {
+  baz: $a1;
+  bef: $a2;
+}
+
+.bar {
+  @include foo(bar,, baz );
+}
+SCSS
+  end
+
+
+  def test_extra_comma_in_mixin_arglist_ending_needs_have_parentheses_after
+    assert_raise_message(Sass::SyntaxError, "Invalid CSS after \"    bri,\": expected \")\", was \"};\"") {render <<SCSS}
+@mixin foo($a1, $a2) {
+  baz: $a1;
+  bal: $a2;
+}
+
+.bar {
+  @include foo(
+    bar,
+    bri,
+  };
+}
+SCSS
+  end
+
+
+
   def test_interpolation
     assert_equal <<CSS, render(<<SCSS)
 ul li#foo a span.label {
@@ -4144,4 +4225,14 @@ def test_import_with_supports_clause
 SASS
   end
 
+  def test_crlf
+    # Attempt to reproduce https://github.com/sass/sass/issues/1985
+    assert_equal(<<CSS, render(<<SCSS))
+p {
+  margin: 0; }
+CSS
+p {\r\n   margin: 0;\r\n}
+SCSS
+  end
+
 end

From 3346c95ea71a96f85eef614a30af46677ff533de Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 4 Jun 2019 23:13:53 -0400
Subject: [PATCH 251/254] Abandoned

https://getcomposer.org/doc/04-schema.md#abandoned
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 62153e7b..a60e7a2c 100644
--- a/composer.json
+++ b/composer.json
@@ -39,5 +39,6 @@
             "/phpunit.xml.dist",
             "/tests"
         ]
-    }
+    },
+    "abandoned": "scssphp/scssphp"
 }

From 6cb8e1afd2c17d4a3cd849be3f56536b0e06a415 Mon Sep 17 00:00:00 2001
From: Cerdic <cedric@yterium.com>
Date: Wed, 5 Jun 2019 11:11:13 +0200
Subject: [PATCH 252/254] Archive information and giving the link to the new
 repo. (also removing travis and packagist linked that are outdated)

---
 README.md | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 53a4c7a4..f5b8be1b 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,20 @@
-# scssphp
-### <http://leafo.github.io/scssphp>
+# This repo has been archived
 
-[![Build](https://travis-ci.org/leafo/scssphp.svg?branch=master)](http://travis-ci.org/leafo/scssphp)
-[![License](https://poser.pugx.org/leafo/scssphp/license.svg)](https://packagist.org/packages/leafo/scssphp)
+
+#### Please go to https://github.com/scssphp/scssphp
+
+----
+
+## scssphp
+<http://leafo.github.io/scssphp>
+
+![License](https://poser.pugx.org/leafo/scssphp/license.svg)
 
 `scssphp` is a compiler for SCSS written in PHP.
 
 Checkout the homepage, <http://leafo.github.io/scssphp>, for directions on how to use.
 
-## Running Tests
+### Running Tests
 
 `scssphp` uses [PHPUnit](https://github.com/sebastianbergmann/phpunit) for testing.
 
@@ -38,7 +44,7 @@ To enable the `scss` compatibility tests:
 
     TEST_SCSS_COMPAT=1 vendor/bin/phpunit tests
 
-## Coding Standard
+### Coding Standard
 
 `scssphp` source conforms to [PSR2](http://www.php-fig.org/psr/psr-2/).
 

From b74bbdd5c58def0f9712694eee03bf6fe2d2f17d Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 18 Jun 2019 16:23:31 -0400
Subject: [PATCH 253/254] Remove links to the old github pages

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index f5b8be1b..d3fbf154 100644
--- a/README.md
+++ b/README.md
@@ -6,14 +6,11 @@
 ----
 
 ## scssphp
-<http://leafo.github.io/scssphp>
 
 ![License](https://poser.pugx.org/leafo/scssphp/license.svg)
 
 `scssphp` is a compiler for SCSS written in PHP.
 
-Checkout the homepage, <http://leafo.github.io/scssphp>, for directions on how to use.
-
 ### Running Tests
 
 `scssphp` uses [PHPUnit](https://github.com/sebastianbergmann/phpunit) for testing.

From b9cdea3e42c3bcb1a9faafd04ccce4e8ec860ad9 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Tue, 18 Jun 2019 16:46:17 -0400
Subject: [PATCH 254/254] Last php 5.4 compatible version

---
 composer.json   | 2 +-
 scss.inc.php    | 4 ++--
 src/Version.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index a60e7a2c..eaa8e87b 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "psr-4": { "Leafo\\ScssPhp\\Test\\": "tests/" }
     },
     "require": {
-        "php": "^5.6.0 || ^7"
+        "php": "^5.4.0 || ^7"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "~2.5",
diff --git a/scss.inc.php b/scss.inc.php
index 8a3cfb83..2a5f0774 100644
--- a/scss.inc.php
+++ b/scss.inc.php
@@ -1,6 +1,6 @@
 <?php
-if (version_compare(PHP_VERSION, '5.6') < 0) {
-    throw new \Exception('scssphp requires PHP 5.6 or above');
+if (version_compare(PHP_VERSION, '5.4') < 0) {
+    throw new \Exception('scssphp requires PHP 5.4 or above');
 }
 
 if (! class_exists('Leafo\ScssPhp\Version', false)) {
diff --git a/src/Version.php b/src/Version.php
index 46ffedf2..fe163a78 100644
--- a/src/Version.php
+++ b/src/Version.php
@@ -18,5 +18,5 @@
  */
 class Version
 {
-    const VERSION = 'v0.8.3';
+    const VERSION = 'v0.8.4';
 }