fixes #77

Author: robocoder

scss.inc.php

@@ -2741,7 +2741,10 @@ public function parse($buffer)
 		$this->buffer          = $buffer;
 
 		$this->pushBlock(null); // root block
+
 		$this->whitespace();
+		$this->pushBlock(null);
+		$this->popBlock();
 
 		while (false !== $this->parseChunk())
 			;
@@ -4328,6 +4331,23 @@ public function adjustAllChildren($block) {
 		}
 	}
 
+	protected function blockLines($inner, $block)
+	{
+		$glue = $this->break . $inner;
+
+		foreach ($block->lines as $index => $line) {
+			if (substr($line, 0, 2) === '/*') {
+				$block->lines[$index] = preg_replace('/(\r|\n)+/', $glue, $line);
+			}
+		}
+
+		echo $inner . implode($glue, $block->lines);
+
+		if (!empty($block->children)) {
+			echo $this->break;
+		}
+	}
+
 	protected function block($block) {
 		if ($block->type == 'root') {
 			$this->adjustAllChildren($block);

tests/inputs/parsing_comments.scss

@@ -0,0 +1,59 @@
+/* comment 1 */
+a {
+    /* comment 2 */
+    color: red; /* comment 3 */
+    /* comment 4 */
+}
+/* comment 5 */
+
+/*! comment 1 */
+b {
+    /*! comment 2 */
+    color: red; /*! comment 3 */
+    /*! comment 4 */
+}
+/*! comment 5 */
+
+/*
+ * multi-line comment 1
+ */
+c {
+    /*
+     * multi-line comment 2
+     */
+    color: red; /*
+                 * multi-line comment 3
+                 */
+    /*
+     * multi-line comment 4
+     */
+}
+/*
+ * multi-line comment 5
+ */
+
+/*!
+ * multi-line comment 1
+ */
+d {
+    /*!
+     * multi-line comment 2
+     */
+    color: red; /*!
+                 * multi-line comment 3
+                 */
+    /*!
+     * multi-line comment 4
+     */
+}
+/*!
+ * multi-line comment 5
+ */
+
+// comment 1
+e {
+    // comment 2
+    color: red; // comment 3
+    // comment 4
+}
+// comment 5

tests/outputs/comments.css

@@ -3,8 +3,8 @@
  Here is a block comment
  **/
 /*hello*/
-/*yeah*/
 div {
+  /*yeah*/
   border: 1px solid red;
   /* another property */
   color: url('http://mage-page.com');

tests/outputs/parsing_comments.css

@@ -0,0 +1,50 @@
+/* comment 1 */
+a {
+  /* comment 2 */
+  color: red;
+  /* comment 3 */
+  /* comment 4 */ }
+/* comment 5 */
+/*! comment 1 */
+b {
+  /*! comment 2 */
+  color: red;
+  /*! comment 3 */
+  /*! comment 4 */ }
+/*! comment 5 */
+/*
+ * multi-line comment 1
+ */
+c {
+  /*
+   * multi-line comment 2
+   */
+  color: red;
+  /*
+   * multi-line comment 3
+   */
+  /*
+   * multi-line comment 4
+   */ }
+/*
+ * multi-line comment 5
+ */
+/*!
+ * multi-line comment 1
+ */
+d {
+  /*!
+   * multi-line comment 2
+   */
+  color: red;
+  /*!
+   * multi-line comment 3
+   */
+  /*!
+   * multi-line comment 4
+   */ }
+/*!
+ * multi-line comment 5
+ */
+e {
+  color: red; }

tests/outputs/scss_css.css

@@ -39,25 +39,25 @@ sel {
 
 .foo {
   /* Foo
- Bar
- Baz */
+   Bar
+   Baz */
   a: b; }
 
 .foo {
   /* Foo
- Bar
- Baz */
+   Bar
+   Baz */
   a: b; }
 
 .foo {
   /* Foo
- Bar */
+   Bar */
   a: b; }
 
 .foo {
   /* Foo
- Bar
- Baz */
+   Bar
+   Baz */
   a: b; }
 
 @foo {
@@ -227,7 +227,7 @@ foo {
  * Bar */
 .foo {
   /* Foo
- * Bar */ }
+   * Bar */ }
 
 [foo] {
   a: b; }
@@ -400,9 +400,9 @@ foo {
 
 .foo {
   /* Foo
- * Bar */
+   * Bar */
   /* Baz
- * Bang */ }
+   * Bang */ }
 
 .foo {
   /* Foo Bar */
@@ -550,7 +550,7 @@ foo {
 
 .foo {
   /* Foo
- * Bar */
+   * Bar */
   a: b; }
 /* Foo */
 .foo {
@@ -599,8 +599,8 @@ E, F G, H {
 
 body {
   /*
- //comment here
- */ }
+   //comment here
+   */ }
 
 E > F {
   a: b; }