Merge pull request #22 from ruby-syntax-tree/unescape

Add support for unescape plain and script

Author: kddnewton

lib/syntax_tree/haml.rb

@@ -34,7 +34,11 @@ def self.parse(source)
     # This is the main entrypoint for the formatter. It parses the source,
     # builds a formatter, then pretty prints the result.
     def self.format(source, maxwidth = 80)
-      PrettierPrint.format(+"", maxwidth) { |q| parse(source).format(q) }
+      formatter = Format::Formatter.new(source, +"", maxwidth)
+      parse(source).format(formatter)
+
+      formatter.flush
+      formatter.output
     end
 
     # This is a required API for syntax tree which just delegates to File.read.

lib/syntax_tree/haml/format.rb

@@ -3,6 +3,22 @@
 module SyntaxTree
   module Haml
     class Format < Visitor
+      class Formatter < ::SyntaxTree::Formatter
+        attr_reader :literal_lines, :quote
+
+        def initialize(source, ...)
+          @literal_lines = {}
+          source
+            .lines
+            .each
+            .with_index(1) do |line, index|
+              @literal_lines[index] = line.rstrip if line.start_with?("!")
+            end
+
+          super(source, ...)
+        end
+      end
+
       attr_reader :q
 
       def initialize(q)
@@ -62,12 +78,11 @@ def visit_haml_comment(node)
         text = node.value[:text].strip
 
         if text.include?("\n")
+          separator = -> { q.breakable(force: true) }
+
           q.indent do
-            q.breakable(force: true)
-            q.seplist(
-              text.split("\n"),
-              -> { q.breakable(force: true) }
-            ) { |segment| q.text(segment) }
+            separator.call
+            q.seplist(text.split("\n"), separator) { |segment| q.text(segment) }
           end
         else
           q.text(" #{text}")
@@ -76,9 +91,13 @@ def visit_haml_comment(node)
 
       # https://haml.info/docs/yardoc/file.REFERENCE.html#plain-text
       def visit_plain(node)
-        text = node.value[:text]
-        q.text("\\") if escaped?(text)
-        q.text(text)
+        if line = q.literal_lines[node.line]
+          q.text(line)
+        else
+          text = node.value[:text]
+          q.text("\\") if escaped?(text)
+          q.text(text)
+        end
       end
 
       # Visit the root node of the AST.
@@ -92,12 +111,14 @@ def visit_root(node)
       # https://haml.info/docs/yardoc/file.REFERENCE.html#inserting_ruby
       def visit_script(node)
         with_children(node) do
-          q.text("&") if node.value[:escape_html]
-
-          node.value[:preserve] ? q.text("~") : q.text("=")
-
-          q.text(" ")
-          q.text(node.value[:text].strip)
+          if line = q.literal_lines[node.line]
+            q.text(line)
+          else
+            q.text("&") if node.value[:escape_html]
+            q.text(node.value[:preserve] ? "~" : "=")
+            q.text(" ")
+            q.text(node.value[:text].strip)
+          end
         end
       end
 
@@ -222,7 +243,7 @@ def length
         private
 
         def format_value(q, hash, level = 0)
-          quote = SyntaxTree::Formatter::OPTIONS[:quote]
+          quote = q.quote
 
           q.group do
             q.text("{")
@@ -244,8 +265,7 @@ def format_value(q, hash, level = 0)
                   when LiteralHashValue
                     q.text(value.value)
                   when StringLiteral
-                    qq = Formatter.new("")
-                    qq.with_target(q.target) { value.format(qq) }
+                    value.format(q)
                   when String
                     q.text("#{quote}#{Quotes.normalize(value, quote)}#{quote}")
                   else

test/plain_test.rb

@@ -14,4 +14,8 @@ def test_escapes_percent
   def test_escapes_period
     assert_format("\\.")
   end
+
+  def test_unescapes
+    assert_format("! hello")
+  end
 end

test/script_test.rb

@@ -18,4 +18,8 @@ def test_escape_html
   def test_preserve_escape_html
     assert_format("&~ foo")
   end
+
+  def test_unescape
+    assert_format("!= hello")
+  end
 end

test/tag_test.rb

@@ -137,11 +137,9 @@ def test_quotes_in_strings
   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
+    with_single_quotes { assert_format(<<~HAML) }
+      %div{style: "background: center/cover url(\#{url_for(page.resource.file)})"}
+    HAML
   end
 
   def test_interpolation_in_value