[ruby/prism] Fix an AST and token incompatibility for Prism::Translation::Parser

Fixes https://github.com/ruby/prism/pull/2515.

This PR fixes an AST and token incompatibility between Parser gem and `Prism::Translation::Parser`
for string literal with line breaks.

https://github.com/ruby/prism/commit/c58466e5bf
This commit is contained in:
Koichi ITO 2024-03-02 00:43:15 +09:00 committed by git
parent 76bd586330
commit 2af6bc26c5
4 changed files with 29 additions and 2 deletions

View File

@ -1487,9 +1487,23 @@ module Prism
elsif node.opening == "?"
builder.character([node.unescaped, srange(node.location)])
else
parts = if node.unescaped.lines.count <= 1
[builder.string_internal([node.unescaped, srange(node.content_loc)])]
else
start_offset = node.content_loc.start_offset
node.unescaped.lines.map do |line|
end_offset = start_offset + line.length
offsets = srange_offsets(start_offset, end_offset)
start_offset = end_offset
builder.string_internal([line, offsets])
end
end
builder.string_compose(
token(node.opening_loc),
[builder.string_internal([node.unescaped, srange(node.content_loc)])],
parts,
token(node.closing_loc)
)
end

View File

@ -281,7 +281,7 @@ module Prism
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_next_token = lexed[index + 1][0]) && next_next_token.type == :STRING_END
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

View File

@ -0,0 +1,2 @@
"foo
bar"

View File

@ -0,0 +1,11 @@
@ ProgramNode (location: (1,0)-(2,6))
├── locals: []
└── statements:
@ StatementsNode (location: (1,0)-(2,6))
└── body: (length: 1)
└── @ StringNode (location: (1,0)-(2,6))
├── flags: ∅
├── opening_loc: (1,0)-(1,1) = "\""
├── content_loc: (1,1)-(2,5) = "foo\n bar"
├── closing_loc: (2,5)-(2,6) = "\""
└── unescaped: "foo\n bar"