radiant 0.9.1 → 1.0.0.rc1

data/vendor/plugins/haml/lib/sass/tree/comment_node.rb

@@ -5,12 +5,7 @@ module Sass::Tree
   #
   # @see Sass::Tree
   class CommentNode < Node
-    # The lines of text nested beneath the comment.
-    #
-    # @return [Array<Sass::Engine::Line>]
-    attr_accessor :lines
-
-    # The text on the same line as the comment starter.
+    # The text of the comment, not including `/*` and `*/`.
     #
     # @return [String]
     attr_accessor :value
@@ -24,7 +19,7 @@ module Sass::Tree
     # @param silent [Boolean] See \{#silent}
     def initialize(value, silent)
       @lines = []
-      @value = value[2..-1].strip
+      @value = normalize_indentation value
       @silent = silent
       super()
     end
@@ -35,9 +30,60 @@ module Sass::Tree
     # @return [Boolean] Whether or not this node and the other object
     #   are the same
     def ==(other)
-      self.class == other.class && value == other.value && silent == other.silent && lines == other.lines
+      self.class == other.class && value == other.value && silent == other.silent
+    end
+
+    # Returns `true` if this is a silent comment
+    # or the current style doesn't render comments.
+    #
+    # @return [Boolean]
+    def invisible?
+      style == :compressed || @silent
+    end
+
+    # @see Node#to_sass
+    def to_sass(tabs, opts = {})
+      content = value.gsub(/\*\/$/, '').rstrip
+      if content =~ /\A[ \t]/
+        # Re-indent SCSS comments like this:
+        #     /* foo
+        #   bar
+        #       baz */
+        content.gsub!(/^/, '   ')
+        content.sub!(/\A([ \t]*)\/\*/, '/*\1')
+      end
+
+      content =
+        unless content.include?("\n")
+          content
+        else
+          content.gsub!(/\n( \*|\/\/)/, "\n  ")
+          spaces = content.scan(/\n( *)/).map {|s| s.first.size}.min
+          sep = silent ? "\n//" : "\n *"
+          if spaces >= 2
+            content.gsub(/\n  /, sep)
+          else
+            content.gsub(/\n#{' ' * spaces}/, sep)
+          end
+        end
+
+      content.gsub!(/\A\/\*/, '//') if silent
+      content.gsub!(/^/, '  ' * tabs)
+      content.rstrip + "\n"
+    end
+
+    # @see Node#to_scss
+    def to_scss(tabs, opts = {})
+      spaces = ('  ' * [tabs - value[/^ */].size, 0].max)
+      if silent
+        value.gsub(/^[\/ ]\*/, '//').gsub(/ *\*\/$/, '')
+      else
+        value
+      end.gsub(/^/, spaces) + "\n"
     end
 
+    protected
+
     # Computes the CSS for the comment.
     #
     # Returns `nil` if this is a silent comment
@@ -47,29 +93,15 @@ module Sass::Tree
     # @param tabs [Fixnum] The level of indentation for the CSS
     # @return [String, nil] The resulting CSS
     # @see #invisible?
-    def to_s(tabs = 0, _ = nil)
+    def _to_s(tabs = 0, _ = nil)
       return if invisible?
-      spaces = '  ' * (tabs - 1)
-
-      content = (value.split("\n") + lines.map {|l| l.text})
-      return spaces + "/* */" if content.empty?
-      content.map! {|l| (l.empty? ? "" : " ") + l}
-      content.first.gsub!(/^ /, '')
-      content.last.gsub!(%r{ ?\*/ *$}, '')
-
-      spaces + "/* " + content.join(style == :compact ? '' : "\n#{spaces} *") + " */"
-    end
+      spaces = ('  ' * [tabs - 1 - value[/^ */].size, 0].max)
 
-    # Returns `true` if this is a silent comment
-    # or the current style doesn't render comments.
-    #
-    # @return [Boolean]
-    def invisible?
-      style == :compressed || @silent
+      content = value.gsub(/^/, spaces)
+      content.gsub!(/\n +(\* *(?!\/))?/, ' ') if style == :compact
+      content
     end
 
-    protected
-
     # Removes this node from the tree if it's a silent comment.
     #
     # @param environment [Sass::Environment] The lexical environment containing
@@ -80,5 +112,17 @@ module Sass::Tree
       return [] if @silent
       self
     end
+
+    private
+
+    def normalize_indentation(str)
+      pre = str.split("\n").inject(str[/^[ \t]*/].split("")) do |pre, line|
+        line[/^[ \t]*/].split("").zip(pre).inject([]) do |arr, (a, b)|
+          break arr if a != b
+          arr + [a]
+        end
+      end.join
+      str.gsub(/^#{pre}/, '')
+    end
   end
 end

data/vendor/plugins/haml/lib/sass/tree/comment_node.rbc

@@ -0,0 +1,2397 @@
+!RBIX
+17831730954501249321
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+39
+5
+7
+0
+64
+47
+49
+1
+1
+15
+99
+7
+2
+45
+3
+4
+49
+5
+2
+13
+99
+12
+7
+6
+12
+7
+7
+12
+65
+12
+49
+8
+4
+15
+49
+6
+0
+15
+2
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+9
+s
+14
+sass/tree/node
+x
+7
+require
+x
+4
+Tree
+x
+4
+Sass
+n
+x
+17
+open_module_under
+x
+15
+__module_init__
+M
+1
+n
+n
+x
+4
+Tree
+i
+31
+5
+66
+99
+7
+0
+45
+1
+2
+65
+49
+3
+3
+13
+99
+12
+7
+4
+12
+7
+5
+12
+65
+12
+49
+6
+4
+15
+49
+4
+0
+11
+I
+6
+I
+0
+I
+0
+I
+0
+n
+p
+7
+x
+11
+CommentNode
+x
+4
+Node
+n
+x
+10
+open_class
+x
+14
+__class_init__
+M
+1
+n
+n
+x
+11
+CommentNode
+i
+138
+5
+66
+5
+7
+0
+47
+49
+1
+1
+15
+5
+7
+2
+47
+49
+1
+1
+15
+99
+7
+3
+7
+4
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+7
+7
+8
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+9
+7
+10
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+11
+7
+12
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+13
+7
+14
+65
+67
+49
+5
+0
+49
+6
+4
+15
+5
+48
+15
+15
+99
+7
+16
+7
+17
+65
+67
+49
+5
+0
+49
+6
+4
+15
+99
+7
+18
+7
+19
+65
+67
+49
+5
+0
+49
+6
+4
+15
+5
+48
+20
+15
+99
+7
+21
+7
+22
+65
+67
+49
+5
+0
+49
+6
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+23
+x
+5
+value
+x
+13
+attr_accessor
+x
+6
+silent
+x
+10
+initialize
+M
+1
+n
+n
+x
+10
+initialize
+i
+25
+35
+0
+38
+0
+15
+5
+20
+0
+47
+49
+1
+1
+38
+2
+15
+20
+1
+38
+3
+15
+54
+52
+4
+0
+11
+I
+4
+I
+2
+I
+2
+I
+2
+n
+p
+5
+x
+6
+@lines
+x
+21
+normalize_indentation
+x
+6
+@value
+x
+7
+@silent
+x
+10
+initialize
+p
+11
+I
+-1
+I
+14
+I
+0
+I
+15
+I
+5
+I
+16
+I
+f
+I
+17
+I
+14
+I
+18
+I
+19
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+2
+x
+5
+value
+x
+6
+silent
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
+2
+==
+M
+1
+n
+n
+x
+2
+==
+i
+40
+5
+49
+0
+0
+20
+0
+49
+0
+0
+83
+1
+13
+9
+39
+15
+5
+48
+2
+20
+0
+49
+2
+0
+83
+1
+13
+9
+39
+15
+5
+48
+3
+20
+0
+49
+3
+0
+83
+1
+11
+I
+3
+I
+1
+I
+1
+I
+1
+n
+p
+4
+x
+5
+class
+x
+2
+==
+x
+5
+value
+x
+6
+silent
+p
+5
+I
+-1
+I
+20
+I
+0
+I
+21
+I
+28
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+1
+x
+5
+other
+x
+10
+invisible?
+M
+1
+n
+n
+x
+10
+invisible?
+i
+14
+5
+48
+0
+7
+1
+83
+2
+13
+10
+13
+15
+39
+3
+11
+I
+2
+I
+0
+I
+0
+I
+0
+n
+p
+4
+x
+5
+style
+x
+10
+compressed
+x
+2
+==
+x
+7
+@silent
+p
+5
+I
+-1
+I
+28
+I
+0
+I
+29
+I
+e
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+0
+x
+7
+to_sass
+M
+1
+n
+n
+x
+7
+to_sass
+i
+365
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+5
+48
+2
+7
+3
+13
+70
+9
+35
+15
+44
+43
+4
+7
+5
+78
+49
+6
+2
+6
+3
+7
+7
+64
+49
+8
+2
+49
+9
+0
+19
+2
+15
+20
+2
+7
+10
+13
+70
+9
+67
+15
+44
+43
+4
+7
+11
+78
+49
+6
+2
+6
+10
+49
+12
+1
+9
+127
+20
+2
+7
+13
+13
+70
+9
+92
+15
+44
+43
+4
+7
+14
+78
+49
+6
+2
+6
+13
+7
+15
+64
+49
+16
+2
+15
+20
+2
+7
+17
+13
+70
+9
+119
+15
+44
+43
+4
+7
+18
+78
+49
+6
+2
+6
+17
+7
+19
+64
+49
+20
+2
+8
+128
+1
+15
+20
+2
+7
+21
+64
+49
+22
+1
+9
+282
+20
+2
+7
+23
+13
+70
+9
+159
+15
+44
+43
+4
+7
+24
+78
+49
+6
+2
+6
+23
+7
+25
+64
+49
+16
+2
+15
+20
+2
+7
+26
+13
+70
+9
+186
+15
+44
+43
+4
+7
+27
+78
+49
+6
+2
+6
+26
+49
+28
+1
+56
+29
+50
+30
+0
+49
+31
+0
+19
+3
+15
+5
+48
+32
+9
+210
+7
+33
+64
+8
+213
+7
+34
+64
+19
+4
+15
+20
+3
+80
+49
+35
+1
+9
+251
+20
+2
+7
+36
+13
+70
+9
+244
+15
+44
+43
+4
+7
+37
+78
+49
+6
+2
+6
+36
+20
+4
+49
+8
+2
+8
+280
+20
+2
+44
+43
+4
+7
+38
+7
+39
+64
+20
+3
+49
+40
+1
+47
+101
+41
+63
+2
+78
+49
+6
+2
+20
+4
+49
+8
+2
+8
+284
+20
+2
+19
+2
+15
+5
+48
+32
+9
+320
+20
+2
+7
+42
+13
+70
+9
+312
+15
+44
+43
+4
+7
+43
+78
+49
+6
+2
+6
+42
+7
+44
+64
+49
+16
+2
+8
+321
+1
+15
+20
+2
+7
+45
+13
+70
+9
+342
+15
+44
+43
+4
+7
+14
+78
+49
+6
+2
+6
+45
+7
+46
+64
+20
+0
+49
+40
+1
+49
+16
+2
+15
+20
+2
+49
+9
+0
+7
+21
+64
+81
+47
+11
+I
+a
+I
+5
+I
+1
+I
+2
+n
+p
+48
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+5
+value
+n
+x
+6
+Regexp
+s
+5
+\*\/$
+x
+3
+new
+s
+0
+
+x
+4
+gsub
+x
+6
+rstrip
+n
+s
+7
+\A[ \t]
+x
+2
+=~
+n
+s
+1
+^
+s
+3
+   
+x
+5
+gsub!
+n
+s
+14
+\A([ \t]*)\/\*
+s
+4
+/*\1
+x
+4
+sub!
+s
+1
+
+
+x
+8
+include?
+n
+s
+12
+\n( \*|\/\/)
+s
+3
+
+  
+n
+s
+6
+\n( *)
+x
+4
+scan
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+7
+to_sass
+i
+13
+57
+19
+0
+15
+20
+0
+49
+0
+0
+49
+1
+0
+11
+I
+3
+I
+1
+I
+1
+I
+1
+n
+p
+2
+x
+5
+first
+x
+4
+size
+p
+3
+I
+0
+I
+3d
+I
+d
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+1
+x
+1
+s
+x
+3
+map
+x
+3
+min
+x
+6
+silent
+s
+3
+
+//
+s
+3
+
+ *
+x
+2
+>=
+n
+s
+4
+\n  
+s
+2
+\n
+s
+1
+ 
+x
+1
+*
+x
+4
+to_s
+n
+s
+6
+\A\/\*
+s
+2
+//
+n
+s
+2
+  
+x
+1
++
+p
+45
+I
+-1
+I
+2d
+I
+e
+I
+2e
+I
+2f
+I
+2f
+I
+48
+I
+34
+I
+63
+I
+35
+I
+7f
+I
+2f
+I
+80
+I
+0
+I
+81
+I
+39
+I
+8b
+I
+3c
+I
+a6
+I
+3d
+I
+c8
+I
+3e
+I
+d5
+I
+3e
+I
+d8
+I
+3f
+I
+e0
+I
+40
+I
+fb
+I
+42
+I
+118
+I
+0
+I
+11a
+I
+3a
+I
+11c
+I
+38
+I
+11f
+I
+46
+I
+141
+I
+0
+I
+142
+I
+47
+I
+162
+I
+48
+I
+16d
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+5
+x
+4
+tabs
+x
+4
+opts
+x
+7
+content
+x
+6
+spaces
+x
+3
+sep
+x
+7
+to_scss
+M
+1
+n
+n
+x
+7
+to_scss
+i
+150
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
+7
+2
+64
+20
+0
+5
+48
+3
+7
+4
+13
+70
+9
+40
+15
+44
+43
+5
+7
+6
+78
+49
+7
+2
+6
+4
+49
+8
+1
+49
+9
+0
+82
+10
+78
+35
+2
+49
+11
+0
+49
+12
+1
+19
+2
+15
+5
+48
+13
+9
+118
+5
+48
+3
+7
+14
+13
+70
+9
+86
+15
+44
+43
+5
+7
+15
+78
+49
+7
+2
+6
+14
+7
+16
+64
+49
+17
+2
+7
+18
+13
+70
+9
+110
+15
+44
+43
+5
+7
+19
+78
+49
+7
+2
+6
+18
+7
+20
+64
+49
+17
+2
+8
+121
+5
+48
+3
+7
+21
+13
+70
+9
+139
+15
+44
+43
+5
+7
+22
+78
+49
+7
+2
+6
+21
+20
+2
+49
+17
+2
+7
+23
+64
+81
+24
+11
+I
+9
+I
+3
+I
+1
+I
+2
+n
+p
+25
+x
+4
+Hash
+x
+16
+new_from_literal
+s
+2
+  
+x
+5
+value
+n
+x
+6
+Regexp
+s
+3
+^ *
+x
+3
+new
+x
+2
+[]
+x
+4
+size
+x
+1
+-
+x
+3
+max
+x
+1
+*
+x
+6
+silent
+n
+s
+8
+^[\/ ]\*
+s
+2
+//
+x
+4
+gsub
+n
+s
+7
+ *\*\/$
+s
+0
+
+n
+s
+1
+^
+s
+1
+
+
+x
+1
++
+p
+17
+I
+-1
+I
+4c
+I
+e
+I
+4d
+I
+3c
+I
+4e
+I
+41
+I
+4f
+I
+76
+I
+51
+I
+79
+I
+52
+I
+8d
+I
+4e
+I
+90
+I
+52
+I
+96
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+3
+x
+4
+tabs
+x
+4
+opts
+x
+6
+spaces
+x
+9
+protected
+x
+5
+_to_s
+M
+1
+n
+n
+x
+5
+_to_s
+i
+149
+23
+0
+10
+8
+78
+19
+0
+15
+23
+1
+10
+16
+1
+19
+1
+15
+5
+47
+49
+0
+0
+9
+27
+1
+11
+8
+28
+1
+15
+7
+1
+64
+20
+0
+79
+82
+2
+5
+48
+3
+7
+4
+13
+70
+9
+58
+15
+44
+43
+5
+7
+6
+78
+49
+7
+2
+6
+4
+49
+8
+1
+49
+9
+0
+82
+2
+78
+35
+2
+49
+10
+0
+49
+11
+1
+19
+2
+15
+5
+48
+3
+7
+12
+13
+70
+9
+99
+15
+44
+43
+5
+7
+13
+78
+49
+7
+2
+6
+12
+20
+2
+49
+14
+2
+19
+3
+15
+5
+48
+15
+7
+16
+83
+17
+9
+144
+20
+3
+7
+18
+13
+70
+9
+136
+15
+44
+43
+5
+7
+19
+78
+49
+7
+2
+6
+18
+7
+20
+64
+49
+21
+2
+8
+145
+1
+15
+20
+3
+11
+I
+a
+I
+4
+I
+0
+I
+2
+n
+p
+22
+x
+10
+invisible?
+s
+2
+  
+x
+1
+-
+x
+5
+value
+n
+x
+6
+Regexp
+s
+3
+^ *
+x
+3
+new
+x
+2
+[]
+x
+4
+size
+x
+3
+max
+x
+1
+*
+n
+s
+1
+^
+x
+4
+gsub
+x
+5
+style
+x
+7
+compact
+x
+2
+==
+n
+s
+17
+\n +(\* *(?!\/))?
+s
+1
+ 
+x
+5
+gsub!
+p
+17
+I
+-1
+I
+60
+I
+10
+I
+61
+I
+1c
+I
+0
+I
+1d
+I
+62
+I
+4e
+I
+64
+I
+6b
+I
+65
+I
+91
+I
+0
+I
+92
+I
+66
+I
+95
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+4
+x
+4
+tabs
+x
+1
+_
+x
+6
+spaces
+x
+7
+content
+x
+8
+_perform
+M
+1
+n
+n
+x
+8
+_perform
+i
+13
+39
+0
+9
+9
+35
+0
+11
+8
+10
+1
+15
+5
+11
+I
+2
+I
+1
+I
+1
+I
+1
+n
+p
+1
+x
+7
+@silent
+p
+9
+I
+-1
+I
+6f
+I
+0
+I
+70
+I
+a
+I
+0
+I
+b
+I
+71
+I
+d
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+1
+x
+11
+environment
+x
+7
+private
+x
+21
+normalize_indentation
+M
+1
+n
+n
+x
+21
+normalize_indentation
+i
+73
+20
+0
+7
+0
+64
+49
+1
+1
+20
+0
+7
+2
+13
+70
+9
+28
+15
+44
+43
+3
+7
+4
+78
+49
+5
+2
+6
+2
+49
+6
+1
+7
+7
+64
+49
+1
+1
+56
+8
+50
+9
+1
+49
+10
+0
+19
+1
+15
+20
+0
+44
+43
+3
+7
+11
+20
+1
+47
+101
+12
+63
+2
+78
+49
+5
+2
+7
+7
+64
+49
+13
+2
+11
+I
+7
+I
+2
+I
+1
+I
+1
+n
+p
+14
+s
+1
+
+
+x
+5
+split
+n
+x
+6
+Regexp
+s
+7
+^[ \t]*
+x
+3
+new
+x
+2
+[]
+s
+0
+
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+21
+normalize_indentation
+i
+54
+58
+37
+22
+1
+1
+15
+37
+19
+0
+15
+15
+20
+0
+7
+0
+13
+70
+9
+31
+15
+44
+43
+1
+7
+2
+78
+49
+3
+2
+6
+0
+49
+4
+1
+7
+5
+64
+49
+6
+1
+21
+1
+1
+49
+7
+1
+35
+0
+56
+8
+50
+9
+1
+11
+I
+6
+I
+1
+I
+2
+I
+2
+n
+p
+10
+n
+x
+6
+Regexp
+s
+7
+^[ \t]*
+x
+3
+new
+x
+2
+[]
+s
+0
+
+x
+5
+split
+x
+3
+zip
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+21
+normalize_indentation
+i
+41
+58
+37
+19
+0
+15
+37
+36
+37
+19
+1
+15
+37
+19
+2
+15
+15
+15
+20
+1
+20
+2
+83
+0
+9
+28
+1
+8
+31
+20
+0
+33
+15
+20
+0
+20
+1
+35
+1
+81
+1
+11
+I
+7
+I
+3
+I
+2
+I
+2
+n
+p
+2
+x
+2
+==
+x
+1
++
+p
+9
+I
+0
+I
+78
+I
+11
+I
+79
+I
+1f
+I
+0
+I
+20
+I
+7a
+I
+29
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+3
+x
+3
+arr
+x
+1
+a
+x
+1
+b
+x
+6
+inject
+p
+5
+I
+0
+I
+77
+I
+b
+I
+78
+I
+36
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+1
+x
+4
+line
+x
+6
+inject
+x
+4
+join
+s
+1
+^
+x
+4
+to_s
+x
+4
+gsub
+p
+7
+I
+-1
+I
+76
+I
+0
+I
+77
+I
+30
+I
+7d
+I
+49
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+2
+x
+3
+str
+x
+3
+pre
+p
+25
+I
+2
+I
+b
+I
+a
+I
+10
+I
+12
+I
+14
+I
+20
+I
+20
+I
+2e
+I
+28
+I
+3c
+I
+2d
+I
+4a
+I
+4c
+I
+58
+I
+55
+I
+5c
+I
+60
+I
+6a
+I
+6f
+I
+78
+I
+74
+I
+7c
+I
+76
+I
+8a
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+0
+x
+13
+attach_method
+p
+3
+I
+2
+I
+7
+I
+1f
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+0
+x
+13
+attach_method
+p
+5
+I
+0
+I
+1
+I
+9
+I
+3
+I
+27
+x
+77
+/Users/jim/Projects/radiant/vendor/plugins/haml/lib/sass/tree/comment_node.rb
+p
+0