haml-edge 2.1.24 → 2.1.25

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.1.24
+2.1.25

data/VERSION

@@ -1 +1 @@
-2.1.24
+2.1.25

data/lib/sass/engine.rb

@@ -69,7 +69,11 @@ module Sass
     #
     # `children`: [{Array}<{Line}>]
     # : The lines nested below this one.
-    Line = Struct.new(:text, :tabs, :index, :offset, :filename, :children)
+    class Line < Struct.new(:text, :tabs, :index, :offset, :filename, :children)
+      def comment?
+        text[0] == COMMENT_CHAR && (text[1] == SASS_COMMENT_CHAR || text[1] == CSS_COMMENT_CHAR)
+      end
+    end
 
     # The character that begins a CSS attribute.
     ATTRIBUTE_CHAR  = ?:
@@ -156,7 +160,8 @@ module Sass
     def tabulate(string)
       tab_str = nil
       first = true
-      enum_with_index(string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/)).map do |line, index|
+      lines = []
+      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^.*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         next if line.strip.empty?
 
@@ -170,15 +175,24 @@ module Sass
           end
         end
         first &&= !tab_str.nil?
-        next Line.new(line.strip, 0, index, 0, @options[:filename], []) if tab_str.nil?
+        if tab_str.nil?
+          lines << Line.new(line.strip, 0, index, 0, @options[:filename], [])
+          next
+        end
+
+        if lines.last && lines.last.comment? && line =~ /^(?:#{tab_str}){#{lines.last.tabs + 1}}(.*)$/
+          lines.last.text << "\n" << $1
+          next
+        end
 
         line_tabs = line_tab_str.scan(tab_str).size
         raise SyntaxError.new(<<END.strip.gsub("\n", ' '), index) if tab_str * line_tabs != line_tab_str
 Inconsistent indentation: #{Haml::Shared.human_indentation line_tab_str, true} used for indentation,
 but the rest of the document was indented using #{Haml::Shared.human_indentation tab_str}.
 END
-        Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
-      end.compact
+        lines << Line.new(line.strip, line_tabs, index, tab_str.size, @options[:filename], [])
+      end
+      lines
     end
 
     def tree(arr, i = 0)

data/lib/sass/tree/comment_node.rb

@@ -51,7 +51,7 @@ module Sass::Tree
       return if invisible?
 
       spaces = '  ' * (tabs - 1)
-      spaces + "/* " + ([value] + lines.map {|l| l.text}).
+      spaces + "/* " + (value.split("\n") + lines.map {|l| l.text}).
         map{|l| l.sub(%r{ ?\*/ *$},'')}.join(style == :compact ? ' ' : "\n#{spaces} * ") + " */"
     end
 

data/test/sass/engine_test.rb

@@ -657,8 +657,7 @@ foo
   bar: baz
 SASS
 assert_equal(<<CSS, actual_css)
-/* 
- * This is a comment that
+/* This is a comment that
  * continues to the second line. */
 foo {
   bar: baz; }
@@ -742,6 +741,24 @@ RESULT
 SOURCE
   end
 
+  def test_comment_with_crazy_indentation
+    assert_equal(<<CSS, render(<<SASS))
+/* This is a loud comment:
+ *          Where the indentation is wonky. */
+.comment {
+  width: 1px; }
+CSS
+/*
+  This is a loud comment:
+           Where the indentation is wonky.
+//
+  This is a silent comment:
+           Where the indentation is wonky.
+.comment
+  width: 1px
+SASS
+  end
+
   private
   
   def render(sass, options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.1.24
+  version: 2.1.25
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-07 00:00:00 -04:00
+date: 2009-06-17 00:00:00 -04:00
 default_executable: 
 dependencies: []