Merge pull request #3340 from Earlopain/parser-translator-multiline-s…

…tring-folding
ruby · Dec 22, 2024 · f5ae6d2 · f5ae6d2
2 parents 7331089 + 076abc1
commit f5ae6d2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/lib/prism/translation/parser/lexer.rb b/lib/prism/translation/parser/lexer.rb
@@ -302,18 +302,25 @@ def to_a
               if token.type == :HEREDOC_START
                 heredoc_identifier_stack.push(value.match(/<<[-~]?["'`]?(?<heredoc_identifier>.*?)["'`]?\z/)[:heredoc_identifier])
               end
-              if ["\"", "'"].include?(value) && (next_token = lexed[index][0]) && next_token.type == :STRING_END
+              next_token = lexed[index][0]
+              next_next_token = lexed[index + 1][0]
+              basic_quotes = ["\"", "'"].include?(value)
+
+              if basic_quotes && next_token&.type == :STRING_END
                 next_location = token.location.join(next_token.location)
                 type = :tSTRING
                 value = ""
                 location = Range.new(source_buffer, offset_cache[next_location.start_offset], offset_cache[next_location.end_offset])
                 index += 1
-              elsif ["\"", "'"].include?(value) && (next_token = lexed[index][0]) && next_token.type == :STRING_CONTENT && next_token.value.lines.count <= 1 && (next_next_token = lexed[index + 1][0]) && next_next_token.type == :STRING_END
-                next_location = token.location.join(next_next_token.location)
-                type = :tSTRING
-                value = next_token.value.gsub("\\\\", "\\")
-                location = Range.new(source_buffer, offset_cache[next_location.start_offset], offset_cache[next_location.end_offset])
-                index += 2
+              elsif basic_quotes && next_token&.type == :STRING_CONTENT && next_token.value.lines.count <= 1 && next_next_token&.type == :STRING_END
+                # the parser gem doesn't simplify strings when its value ends in a newline
+                unless (string_value = next_token.value).end_with?("\n")
+                  next_location = token.location.join(next_next_token.location)
+                  value = string_value.gsub("\\\\", "\\")
+                  type = :tSTRING
+                  location = Range.new(source_buffer, offset_cache[next_location.start_offset], offset_cache[next_location.end_offset])
+                  index += 2
+                end
               elsif value.start_with?("<<")
                 quote = value[2] == "-" || value[2] == "~" ? value[3] : value[2]
                 if quote == "`"

diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb
@@ -104,7 +104,6 @@ class ParserTest < TestCase
       "seattlerb/dsym_esc_to_sym.txt",
       "seattlerb/heredoc__backslash_dos_format.txt",
       "seattlerb/heredoc_backslash_nl.txt",
-      "seattlerb/heredoc_comma_arg.txt",
       "seattlerb/heredoc_squiggly_blank_line_plus_interpolation.txt",
       "seattlerb/heredoc_squiggly_blank_lines.txt",
       "seattlerb/heredoc_squiggly_interp.txt",
@@ -119,7 +118,6 @@ class ParserTest < TestCase
       "seattlerb/heredoc_with_interpolation_and_carriage_return_escapes.txt",
       "seattlerb/interpolated_symbol_array_line_breaks.txt",
       "seattlerb/interpolated_word_array_line_breaks.txt",
-      "seattlerb/label_vs_string.txt",
       "seattlerb/module_comments.txt",
       "seattlerb/non_interpolated_symbol_array_line_breaks.txt",
       "seattlerb/non_interpolated_word_array_line_breaks.txt",
@@ -139,10 +137,8 @@ class ParserTest < TestCase
       "seattlerb/required_kwarg_no_value.txt",
       "seattlerb/slashy_newlines_within_string.txt",
       "seattlerb/str_double_escaped_newline.txt",
-      "seattlerb/str_double_newline.txt",
       "seattlerb/str_evstr_escape.txt",
       "seattlerb/str_newline_hash_line_number.txt",
-      "seattlerb/str_single_newline.txt",
       "seattlerb/symbols_empty_space.txt",
       "seattlerb/TestRubyParserShared.txt",
       "unparser/corpus/literal/assignment.txt",