Merge pull request #12 from maxprokopiev/fix-multibyte-comments

Use offset_cache while building comments as well
kddnewton · Feb 13, 2024 · 8c2312e · 8c2312e
2 parents 3259598 + 780ce36
commit 8c2312e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/parser/prism.rb b/lib/parser/prism.rb
@@ -74,7 +74,7 @@ def tokenize(source_buffer, _recover = false)
 
       [
         build_ast(program, offset_cache),
-        build_comments(result.comments),
+        build_comments(result.comments, offset_cache),
         build_tokens(tokens, offset_cache)
       ]
     ensure
@@ -110,10 +110,10 @@ def build_ast(program, offset_cache)
     end
 
     # Build the parser gem comments from the prism comments.
-    def build_comments(comments)
+    def build_comments(comments, offset_cache)
       comments.map do |comment|
         location = comment.location
-        Source::Comment.new(Source::Range.new(source_buffer, location.start_offset, location.end_offset))
+        Source::Comment.new(Source::Range.new(source_buffer, offset_cache[location.start_offset], offset_cache[location.end_offset]))
       end
     end
 

diff --git a/test/fixtures/multibyte.rb b/test/fixtures/multibyte.rb
@@ -1,5 +1,7 @@
 # credits to https://github.com/minimaxir/big-list-of-naughty-strings/blob/master/blns.txt
 
+# 🥲
+
 a = "😍"
 b = "👩🏽"
 c = "👨‍🦰 👨🏿‍🦰 👨‍🦱 👨🏿‍🦱 🦹🏿‍♂️"