CRuby currently returns the source_location columns in bytes and not characters

Author: eregon

lib/prism/parse_result.rb

@@ -942,8 +942,9 @@ def self.node_for(callable)
       raise ArgumentError, "#{file} has syntax errors: #{parse_result.errors_format}"
     end
     root = parse_result.value
-    start_offset = parse_result.source.line_and_character_column_to_byte_offset(start_line, start_column)
-    end_offset = parse_result.source.line_and_character_column_to_byte_offset(end_line, end_column)
+    # CRuby currently returns the source_location columns in bytes and not characters
+    start_offset = parse_result.source.line_to_byte_offset(start_line) + start_column
+    end_offset = parse_result.source.line_to_byte_offset(end_line) + end_column
     start_byte_column = start_offset - parse_result.source.line_start(start_offset)
 
     found = root.tunnel(start_line, start_byte_column).reverse.find do |node|

test/prism/ruby/node_for_test.rb

@@ -17,6 +17,9 @@ def m(foo)
     end
     M_LOCATION = [__LINE__-3, 4, __LINE__-1, 7]
 
+    def été; 42; end
+    UTF8_LOCATION = [__LINE__-1, 4, __LINE__-1, 22]
+
     define_method(:define_method_method) { 42 }
     DEFINE_METHOD_LOCATION = [__LINE__-1, 41, __LINE__-1, 47]
 
@@ -55,6 +58,12 @@ def test_def_method
       assert_equal "def m(foo)\n      42\n    end", node.slice
     end
 
+    def test_def_method_utf8
+      node = Prism.node_for(with_location(method(:été), UTF8_LOCATION))
+      assert_instance_of(Prism::DefNode, node)
+      assert_equal "def été; 42; end", node.slice
+    end
+
     def test_inline_method
       node = Prism.node_for(with_location(method(:inline_method), *INLINE_LOCATION_AND_FILE))
       assert_instance_of(Prism::DefNode, node)