From 1528d3c0196bfc5702d54b86dc1bb5f31033b9d9 Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Fri, 7 Jun 2024 15:27:21 -0400
Subject: [PATCH] Handle chomped bytesize with lines without newlines

---
 lib/prism/translation/parser/compiler.rb | 11 +++++++++--
 test/prism/ruby/parser_test.rb           |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/prism/translation/parser/compiler.rb b/lib/prism/translation/parser/compiler.rb
index cbec2bb062e..48f3d4db5cb 100644
--- a/lib/prism/translation/parser/compiler.rb
+++ b/lib/prism/translation/parser/compiler.rb
@@ -2040,6 +2040,13 @@ def visit_block(call, block)
           end
         end
 
+        # The parser gem automatically converts \r\n to \n, meaning our offsets
+        # need to be adjusted to always subtract 1 from the length.
+        def chomped_bytesize(line)
+          chomped = line.chomp
+          chomped.bytesize + (chomped == line ? 0 : 1)
+        end
+
         # Visit a heredoc that can be either a string or an xstring.
         def visit_heredoc(node)
           children = Array.new
@@ -2066,14 +2073,14 @@ def visit_heredoc(node)
                 if node.opening.end_with?("'")
                   escaped.each do |line|
                     escaped_lengths << line.bytesize
-                    normalized_lengths << (line.chomp.bytesize + 1)
+                    normalized_lengths << chomped_bytesize(line)
                   end
                 else
                   escaped
                     .chunk_while { |before, after| before.match?(/(?<!\\)\\\r?\n$/) }
                     .each do |lines|
                       escaped_lengths << lines.sum(&:bytesize)
-                      normalized_lengths << lines.sum { |line| line.chomp.bytesize + 1 }
+                      normalized_lengths << lines.sum { |line| chomped_bytesize(line) }
                     end
                 end
 
diff --git a/test/prism/ruby/parser_test.rb b/test/prism/ruby/parser_test.rb
index b3c0ef5fa6d..65535af0fdf 100644
--- a/test/prism/ruby/parser_test.rb
+++ b/test/prism/ruby/parser_test.rb
@@ -59,7 +59,6 @@ class ParserTest < TestCase
     # These files are either failing to parse or failing to translate, so we'll
     # skip them for now.
     skip_all = skip_incorrect | [
-      "dash_heredocs.txt",
       "regex.txt",
       "regex_char_width.txt",
       "unescaping.txt",
@@ -86,6 +85,7 @@ class ParserTest < TestCase
     # output expected by the parser gem, so we'll skip them for now.
     skip_tokens = [
       "comments.txt",
+      "dash_heredocs.txt",
       "dos_endings.txt",
       "embdoc_no_newline_at_end.txt",
       "heredoc_with_comment.txt",