[Sass] [Convert] Convert comments to start with // or * in the indented syntax.

Closes gh-122

doc-src/SASS_CHANGELOG.md

@@ -58,6 +58,13 @@ Note that since underscores may still be used in place of hyphens
 when referring to mixins and variables,
 this won't cause any backwards-incompatibilities.
 
+#### Sass Comment Format
+
+When converting to the indented syntax,
+each line of comments past the first begins with either `//` (for Sass comments)
+or ` *` (for CSS comments).
+This prevents some whitespace errors.
+
 ### Minor Changes
 
 Indented-syntax `/*` comments may now include `*` on lines beyond the first,

lib/sass/tree/comment_node.rb

@@ -59,10 +59,11 @@ module Sass::Tree
         else
           content.gsub!(/\n( \*|\/\/)/, "\n  ")
           spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
+          sep = silent ? "\n//" : "\n *"
           if spaces >= 2
-            content
+            content.gsub(/\n  /, sep)
           else
-            content.gsub(/\n#{' ' * spaces}/, "\n  ")
+            content.gsub(/\n#{' ' * spaces}/, sep)
           end
         end
 

test/sass/conversion_test.rb

@@ -251,9 +251,9 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 // foo
-   bar
+// bar
-     baz
+//   baz
-   bang
+// bang
 
 foo bar
   a: b
@@ -309,9 +309,9 @@ SCSS
 
     assert_scss_to_sass <<SASS, <<SCSS
 /* foo
-   bar
+ * bar
-     baz
+ *   baz
-   bang
+ * bang
 
 foo bar
   a: b
@@ -337,9 +337,9 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 /* foo
-   bar
+ * bar
-     baz
+ *   baz
-   bang
+ * bang
 
 foo bar
   a: b
@@ -358,8 +358,8 @@ SCSS
     assert_scss_to_sass <<SASS, <<SCSS
 foo
   /*      foo
-     bar
+   * bar
-         baz
+   *     baz
   a: b
 SASS
 foo {
@@ -387,8 +387,8 @@ SASS
   def test_immediately_preceding_comments
     assert_renders <<SASS, <<SCSS
 /* Foo
-   Bar
+ * Bar
-   Baz
+ * Baz
 .foo#bar
   a: b
 SASS
@@ -401,8 +401,8 @@ SCSS
 
     assert_renders <<SASS, <<SCSS
 // Foo
-   Bar
+// Bar
-   Baz
+// Baz
 =foo
   a: b
 SASS

test/sass/css2sass_test.rb

@@ -105,20 +105,20 @@ elephant.rawr
   rampages: excessively
 
 /* actual multiline
-  comment
+ *comment
 
 span.turkey
   isdinner: true
 
 .turducken
   /* Sounds funny
-     doesn't it
+   * doesn't it
   chimera: not_really
 
 #overhere
   bored: sorta
   /*                  it's for a good
-     cause
+   * cause
   better_than: thread_pools
 
 #one_more