Merge pull request #21 from ruby-syntax-tree/quoting

Use Syntax Tree for quoting strings

Author: kddnewton

lib/syntax_tree/haml/format.rb

@@ -123,6 +123,8 @@ def visit_silent_script(node)
 
       LiteralHashValue = Struct.new(:value)
 
+      StringHashValue = Struct.new(:value, :quote)
+
       # When formatting a tag, there are a lot of different kinds of things that
       # can be printed out. There's the tag name, the attributes, the content,
       # etc. This object is responsible for housing all of those parts.
@@ -220,19 +222,34 @@ def length
         private
 
         def format_value(q, hash, level = 0)
+          quote = SyntaxTree::Formatter::OPTIONS[:quote]
+
           q.group do
             q.text("{")
             q.indent do
               q.group do
                 q.breakable(level == 0 ? "" : " ")
                 q.seplist(hash, nil, :each_pair) do |key, value|
-                  q.text(Format.hash_key(key))
+                  if key.match?(/^@|[-:]/)
+                    q.text("#{quote}#{Quotes.normalize(key, quote)}#{quote}:")
+                  else
+                    q.text("#{key}:")
+                  end
+
                   q.text(" ")
 
-                  if value.is_a?(Hash)
+                  case value
+                  when Hash
                     format_value(q, value, level + 1)
+                  when LiteralHashValue
+                    q.text(value.value)
+                  when StringLiteral
+                    qq = Formatter.new("")
+                    qq.with_target(q.target) { value.format(qq) }
+                  when String
+                    q.text("#{quote}#{Quotes.normalize(value, quote)}#{quote}")
                   else
-                    q.text(Format.hash_value(value))
+                    q.text(value.to_s)
                   end
                 end
               end
@@ -244,27 +261,6 @@ def format_value(q, hash, level = 0)
         end
       end
 
-      def self.hash_key(key)
-        if key.match?(/^@|[-:]/)
-          quote = SyntaxTree::Formatter::OPTIONS[:quote]
-          "#{quote}#{Quotes.normalize(key, quote)}#{quote}:"
-        else
-          "#{key}:"
-        end
-      end
-
-      def self.hash_value(value)
-        case value
-        when LiteralHashValue
-          value.value
-        when String
-          quote = SyntaxTree::Formatter::OPTIONS[:quote]
-          "#{quote}#{Quotes.normalize(value, quote)}#{quote}"
-        else
-          value.to_s
-        end
-      end
-
       # Visit a tag node.
       def visit_tag(node)
         parts = PartList.new(node)
@@ -405,7 +401,7 @@ def parse_attributes(source)
              ::Haml::AttributeParser.parse(source)
           parsed.to_h { |key, value| [key, parse_attributes(value)] }
         in [:program, [[:string_literal, *], *]]
-          source[1...-1]
+          SyntaxTree.parse(source).statements.body[0]
         else
           LiteralHashValue.new(source)
         end

test/tag_test.rb

@@ -133,10 +133,15 @@ def test_long_declaration_before_text_without_parser
   end
 
   def test_quotes_in_strings
-    assert_format(
-      "%div{title: 'escape \" quotes'}",
-      "%div{title: \"escape \\\" quotes\"}"
-    )
+    assert_format("%div{title: 'escape \" quotes'}")
+  end
+
+  def test_interpolation_in_strings
+    with_single_quotes do
+      assert_format(<<~HAML)
+        %div{style: "background: center/cover url(\#{url_for(page.resource.file)})"}
+      HAML
+    end
   end
 
   def test_interpolation_in_value