haml-edge 2.3.207 → 2.3.208

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.207
+2.3.208

data/VERSION

@@ -1 +1 @@
-2.3.207
+2.3.208

data/lib/sass/engine.rb

@@ -234,7 +234,7 @@ module Sass
         end
 
         comment_tab_str ||= line_tab_str
-        if try_comment(line, lines.last, tab_str * (lines.last.tabs + 1), comment_tab_str, index)
+        if try_comment(line, lines.last, tab_str * lines.last.tabs, comment_tab_str, index)
           next
         else
           comment_tab_str = nil
@@ -256,7 +256,9 @@ END
 
     def try_comment(line, last, tab_str, comment_tab_str, index)
       return unless last && last.comment?
-      return unless line =~ /^#{tab_str}/
+      # Nested comment stuff must be at least one whitespace char deeper
+      # than the normal indentation
+      return unless line =~ /^#{tab_str}\s/
       unless line =~ /^(?:#{comment_tab_str})(.*)$/
         raise SyntaxError.new(<<MSG.strip.gsub("\n", " "), :line => index)
 Inconsistent indentation:

data/lib/sass/tree/comment_node.rb

@@ -67,8 +67,8 @@ module Sass::Tree
           end
         end
 
-      content.gsub!(/^/, '  ' * tabs)
       content.gsub!(/\A\/\*/, '//') if silent
+      content.gsub!(/^/, '  ' * tabs)
       content.rstrip + "\n"
     end
 

data/test/sass/conversion_test.rb

@@ -286,6 +286,50 @@ foo bar
 SASS
   end
 
+  def test_nested_silent_comments
+    assert_renders <<SASS, <<SCSS
+foo
+  bar: baz
+  // bip bop
+  // beep boop
+  bang: bizz
+  // bubble bubble
+  // toil trouble
+SASS
+foo {
+  bar: baz;
+  // bip bop
+  // beep boop
+  bang: bizz;
+  // bubble bubble
+  // toil trouble
+}
+SCSS
+
+    assert_sass_to_scss <<SCSS, <<SASS
+foo {
+  bar: baz;
+  // bip bop
+  // beep boop
+  //   bap blimp
+  bang: bizz;
+  // bubble bubble
+  // toil trouble
+  //    gorp
+}
+SCSS
+foo
+  bar: baz
+  // bip bop
+     beep boop
+       bap blimp
+  bang: bizz
+  // bubble bubble
+    toil trouble
+       gorp
+SASS
+  end
+
   def test_loud_comments
     assert_renders <<SASS, <<SCSS
 /* foo
@@ -354,6 +398,48 @@ foo bar {
 SCSS
   end
 
+  def test_nested_loud_comments
+    assert_renders <<SASS, <<SCSS
+foo
+  bar: baz
+  /* bip bop
+   * beep boop
+  bang: bizz
+  /* bubble bubble
+   * toil trouble
+SASS
+foo {
+  bar: baz;
+  /* bip bop
+   * beep boop */
+  bang: bizz;
+  /* bubble bubble
+   * toil trouble */ }
+SCSS
+
+    assert_sass_to_scss <<SCSS, <<SASS
+foo {
+  bar: baz;
+  /* bip bop
+   * beep boop
+   *   bap blimp */
+  bang: bizz;
+  /* bubble bubble
+   * toil trouble
+   *    gorp */ }
+SCSS
+foo
+  bar: baz
+  /* bip bop
+     beep boop
+       bap blimp
+  bang: bizz
+  /* bubble bubble
+    toil trouble
+       gorp
+SASS
+  end
+
   def test_loud_comments_with_weird_indentation
     assert_scss_to_sass <<SASS, <<SCSS
 foo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.207
+  version: 2.3.208
 platform: ruby
 authors: 
 - Nathan Weizenbaum