Merge pull request #87 from boris-petrov/fix-quotes-escaping

Fix converting to the other type of quotes when that would lead to escaping in the string

Author: kddnewton

lib/syntax_tree/node.rb

@@ -3879,9 +3879,9 @@ module Quotes
     # whichever quote the user chose. (If they chose single quotes, then double
     # quoting would activate the escape sequence, and if they chose double
     # quotes, then single quotes would deactivate it.)
-    def self.locked?(node)
+    def self.locked?(node, quote)
       node.parts.any? do |part|
-        !part.is_a?(TStringContent) || part.value.match?(/\\|#[@${]/)
+        !part.is_a?(TStringContent) || part.value.match?(/\\|#[@${]|#{quote}/)
       end
     end
 
@@ -3996,12 +3996,12 @@ def quotes(q)
 
         if matched
           [quote, matching]
-        elsif Quotes.locked?(self)
+        elsif Quotes.locked?(self, q.quote)
           ["#{":" unless hash_key}'", "'"]
         else
           ["#{":" unless hash_key}#{q.quote}", q.quote]
         end
-      elsif Quotes.locked?(self)
+      elsif Quotes.locked?(self, q.quote)
         if quote.start_with?(":")
           [hash_key ? quote[1..] : quote, quote[1..]]
         else
@@ -8429,7 +8429,7 @@ def format(q)
       end
 
       opening_quote, closing_quote =
-        if !Quotes.locked?(self)
+        if !Quotes.locked?(self, q.quote)
           [q.quote, q.quote]
         elsif quote.start_with?("%")
           [quote, Quotes.matching(quote[/%[qQ]?(.)/, 1])]

test/fixtures/string_literal.rb

@@ -41,4 +41,8 @@
 %
 '"foo"'
 -
-"\"foo\""
+'"foo"'
+%
+"'foo'"
+-
+"'foo'"

test/formatter/single_quotes_test.rb

@@ -26,6 +26,10 @@ def test_dyna_symbol
         assert_format(":'symbol'\n", ":\"symbol\"")
       end
 
+      def test_single_quote_in_string
+        assert_format("\"str'ing\"\n")
+      end
+
       def test_label
         assert_format(
           "{ foo => foo, :'bar' => bar }\n",