1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ruby/prism] Ensure inner heredoc nodes have the correct location

Browse Source 
https://github.com/ruby/prism/commit/100340bc6b
This commit is contained in:
Kevin Newton 2024-06-07 14:52:11 -04:00 committed by git
parent ce0a352e34
commit 79e9dea8de
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/prism/translation/parser/compiler.rb
View File

@ -2092,7 +2092,12 @@ module Prism
if child.type == :str && child.children.last == "" if child.type == :str && child.children.last == ""
# nothing # nothing
elsif child.type == :str && children.last && children.last.type == :str && !children.last.children.first.end_with?("\n") elsif child.type == :str && children.last && children.last.type == :str && !children.last.children.first.end_with?("\n")
children.last.children.first << child.children.first appendee = children[-1]
location = appendee.loc
location = location.with_expression(location.expression.join(child.loc.expression))
children[-1] = appendee.updated(:str, [appendee.children.first << child.children.first], location: location)
else else
children << child children << child
end end

8
test/prism/ruby/parser_test.rb
View File

@ -57,7 +57,6 @@ module Prism
# skip them for now. # skip them for now.
skip_all = skip_incorrect | [ skip_all = skip_incorrect | [
"dash_heredocs.txt", "dash_heredocs.txt",
# "heredocs_with_ignored_newlines.txt",
"regex.txt", "regex.txt",
"regex_char_width.txt", "regex_char_width.txt",
"unescaping.txt", "unescaping.txt",
@ -72,10 +71,8 @@ module Prism
"unparser/corpus/literal/literal.txt", "unparser/corpus/literal/literal.txt",
"unparser/corpus/semantic/dstr.txt", "unparser/corpus/semantic/dstr.txt",
"whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt", "whitequark/dedenting_interpolating_heredoc_fake_line_continuation.txt",
"whitequark/parser_bug_640.txt",
"whitequark/parser_slash_slash_n_escaping_in_literals.txt", "whitequark/parser_slash_slash_n_escaping_in_literals.txt",
"whitequark/ruby_bug_11989.txt", "whitequark/ruby_bug_11989.txt"
"whitequark/slash_newline_in_heredocs.txt"
] ]
# Not sure why these files are failing on JRuby, but skipping them for now. # Not sure why these files are failing on JRuby, but skipping them for now.
@ -90,6 +87,7 @@ module Prism
"dos_endings.txt", "dos_endings.txt",
"embdoc_no_newline_at_end.txt", "embdoc_no_newline_at_end.txt",
"heredoc_with_comment.txt", "heredoc_with_comment.txt",
"heredocs_with_ignored_newlines.txt",
"indented_file_end.txt", "indented_file_end.txt",
"methods.txt", "methods.txt",
"strings.txt", "strings.txt",
@ -163,10 +161,12 @@ module Prism
"whitequark/lbrace_arg_after_command_args.txt", "whitequark/lbrace_arg_after_command_args.txt",
"whitequark/multiple_pattern_matches.txt", "whitequark/multiple_pattern_matches.txt",
"whitequark/newline_in_hash_argument.txt", "whitequark/newline_in_hash_argument.txt",
"whitequark/parser_bug_640.txt",
"whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt", "whitequark/parser_drops_truncated_parts_of_squiggly_heredoc.txt",
"whitequark/ruby_bug_11990.txt", "whitequark/ruby_bug_11990.txt",
"whitequark/ruby_bug_14690.txt", "whitequark/ruby_bug_14690.txt",
"whitequark/ruby_bug_9669.txt", "whitequark/ruby_bug_9669.txt",
"whitequark/slash_newline_in_heredocs.txt",
"whitequark/space_args_arg_block.txt", "whitequark/space_args_arg_block.txt",
"whitequark/space_args_block.txt" "whitequark/space_args_block.txt"
] ]