Remove escaped forward slashes from regular expression literals when converting to %r.

Author: kddnewton

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - The ability to "check" formatting by formatting the output of the first format.
 - Comments can now be attached to the `case` keyword.
+- Remove escaped forward slashes from regular expression literals when converting to `%r`.
 
 ### Changed
 

lib/syntax_tree.rb

@@ -612,7 +612,7 @@ def on_END(statements)
   #     some other content that is not executed by the program
   #
   class EndContent
-    # [Array[ String ]] the content after the script
+    # [String] the content after the script
     attr_reader :value
 
     # [Location] the location of this node
@@ -635,25 +635,23 @@ def format(q)
       q.text("__END__")
       q.breakable(force: true)
 
-      q.seplist(value, -> { q.breakable(literal: true, force: true) }) do |line|
-        q.text(line)
-      end
+      separator = -> { q.breakable(indent: false, force: true) }
+      q.seplist(value.split(/\r?\n/, -1), separator) { |line| q.text(line) }
     end
 
     def pretty_print(q)
       q.group(2, "(", ")") do
         q.text("__end__")
 
         q.breakable
-        q.pp(value.join("\n"))
+        q.pp(value)
 
         q.pp(Comment::List.new(comments))
       end
     end
 
     def to_json(*opts)
-      { type: :__end__, value: value.join("\n"), loc: location, cmts: comments }
-        .to_json(*opts)
+      { type: :__end__, value: value, loc: location, cmts: comments }.to_json(*opts)
     end
   end
 
@@ -662,7 +660,7 @@ def to_json(*opts)
   def on___end__(value)
     @__end__ =
       EndContent.new(
-        value: lines[lineno..-1],
+        value: source[(char_pos + value.length)..-1],
         location: Location.token(line: lineno, char: char_pos, size: value.size)
       )
   end
@@ -9702,11 +9700,26 @@ def format(q)
           q.format_each(parts)
           q.text(ending)
         end
+      elsif braces
+        q.group do
+          q.text("%r{")
+
+          parts.each do |part|
+            if part.is_a?(TStringContent)
+              q.text(part.value.gsub("\\/", "/"))
+            else
+              q.format(part)
+            end
+          end
+
+          q.text("}")
+          q.text(ending[1..-1])
+        end
       else
         q.group do
-          q.text(braces ? "%r{" : "/")
+          q.text("/")
           q.format_each(parts)
-          q.text(braces ? "}" : "/")
+          q.text("/")
           q.text(ending[1..-1])
         end
       end

test/fixtures/regexp_literal.rb

@@ -49,3 +49,7 @@
 foo %r{= bar}
 %
 foo(/ bar/)
+%
+/foo\/bar/
+-
+%r{foo/bar}