[ruby/prism] Rebase against main

ruby/prism@813e20d449
ruby · Feb 24, 2024 · 804b2a3 · 804b2a3
1 parent aa88414
commit 804b2a3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 209 deletions.
diff --git a/lib/prism/parse_result.rb b/lib/prism/parse_result.rb
@@ -67,7 +67,7 @@ def character_column(byte_offset)
     # concept of code units that differs from the number of characters in other
     # encodings, it is not captured here.
     def code_units_offset(byte_offset, encoding)
-      byteslice = source.byteslice(0, byte_offset).encode(encoding)
+      byteslice = (source.byteslice(0, byte_offset) or raise).encode(encoding)
       (encoding == Encoding::UTF_16LE || encoding == Encoding::UTF_16BE) ? (byteslice.bytesize / 2) : byteslice.length
     end
 

diff --git a/lib/prism/ripper_compat.rb b/lib/prism/ripper_compat.rb