haml-edge 3.1.53 → 3.1.54

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.53
+3.1.54

data/VERSION

@@ -1 +1 @@
-3.1.53
+3.1.54

data/lib/sass/engine.rb

@@ -667,13 +667,14 @@ WARNING
       end
 
       return silent ? "//" : "/* */" if content.empty?
+      content.last.gsub!(%r{ ?\*/ *$}, '')
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
       content.first.gsub!(/^ /, '') unless removed_first
-      content.last.gsub!(%r{ ?\*/ *$}, '')
       if silent
         "//" + content.join("\n//")
       else
-        "/*" + content.join("\n *") + " */"
+        # The #gsub fixes the case of a trailing */
+        "/*" + content.join("\n *").gsub(/ \*\Z/, '') + " */"
       end
     end
 

data/lib/sass/tree/comment_node.rb

@@ -98,7 +98,7 @@ module Sass::Tree
       spaces = ('  ' * [tabs - 1 - value[/^ */].size, 0].max)
 
       content = value.gsub(/^/, spaces)
-      content.gsub!(/\n +(\* *)?/, ' ') if style == :compact
+      content.gsub!(/\n +(\* *(?!\/))?/, ' ') if style == :compact
       content
     end
 

data/test/sass/engine_test.rb

@@ -1473,6 +1473,32 @@ foo
 SASS
   end
 
+  def test_loud_comment_with_close
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  /* foo
+   * bar */ }
+CSS
+foo
+  /* foo
+     bar */
+SASS
+  end
+
+  def test_loud_comment_with_separate_line_close
+    assert_equal <<CSS, render(<<SASS)
+foo {
+  /* foo
+   * bar
+   */ }
+CSS
+foo
+  /* foo
+   * bar
+   */
+SASS
+  end
+
   def test_attribute_selector_with_spaces
     assert_equal(<<CSS, render(<<SASS))
 a b[foo=bar] {

data/test/sass/scss/css_test.rb

@@ -393,7 +393,7 @@ SCSS
     assert_equal <<CSS, render(<<SCSS)
 foo {
   a: -0.5em;
-  b: +0.5em;
+  b: 0.5em;
   c: -foo(12px);
   d: +foo(12px); }
 CSS
@@ -866,6 +866,20 @@ SCSS
     assert_equal 1, e.sass_line
   end
 
+  ## Regressions
+
+  def test_closing_line_comment_end_with_compact_output
+    assert_equal(<<CSS, render(<<SCSS, :style => :compact))
+/* foo */
+bar { baz: bang; }
+CSS
+/*
+ * foo
+ */
+bar {baz: bang}
+SCSS
+  end
+
   private
 
   def assert_selector_parses(selector)

metadata

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