Revert "Let Location support sub buffers"

This reverts commit 83a683d.

Author: soutaro

ext/rbs_extension/location.c

@@ -314,8 +314,8 @@ void rbs__init_location(void) {
   rb_define_private_method(RBS_Location, "initialize", location_initialize, 3);
   rb_define_private_method(RBS_Location, "initialize_copy", location_initialize_copy, 1);
   rb_define_method(RBS_Location, "buffer", location_buffer, 0);
-  rb_define_method(RBS_Location, "_start_pos", location_start_pos, 0);
-  rb_define_method(RBS_Location, "_end_pos", location_end_pos, 0);
+  rb_define_method(RBS_Location, "start_pos", location_start_pos, 0);
+  rb_define_method(RBS_Location, "end_pos", location_end_pos, 0);
   rb_define_method(RBS_Location, "_add_required_child", location_add_required_child, 3);
   rb_define_method(RBS_Location, "_add_optional_child", location_add_optional_child, 3);
   rb_define_method(RBS_Location, "_add_optional_no_child", location_add_optional_no_child, 1);

lib/rbs/location_aux.rb

@@ -28,14 +28,6 @@ def self.new(buffer_ = nil, start_pos_ = nil, end_pos_ = nil, buffer: nil, start
 
     WithChildren = self
 
-    def start_pos
-      buffer.absolute_position(_start_pos) || raise
-    end
-
-    def end_pos
-      buffer.absolute_position(_end_pos) || raise
-    end
-
     def name
       buffer.name
     end
@@ -57,19 +49,19 @@ def end_column
     end
 
     def start_loc
-      @start_loc ||= buffer.top_buffer.pos_to_loc(start_pos)
+      @start_loc ||= buffer.pos_to_loc(start_pos)
     end
 
     def end_loc
-      @end_loc ||= buffer.top_buffer.pos_to_loc(end_pos)
+      @end_loc ||= buffer.pos_to_loc(end_pos)
     end
 
     def range
       @range ||= start_pos...end_pos
     end
 
     def source
-      @source ||= (buffer.top_buffer.content[range] || raise)
+      @source ||= (buffer.content[range] || raise)
     end
 
     def to_s
@@ -142,25 +134,5 @@ def optional_key?(name)
     def required_key?(name)
       _required_keys.include?(name)
     end
-
-    def local_location
-      loc = Location.new(buffer.detach, _start_pos, _end_pos)
-
-      each_optional_key do |key|
-        value = self[key]
-        if value
-          loc.add_optional_child(key, value._start_pos...value._end_pos)
-        else
-          loc.add_optional_child(key, nil)
-        end
-      end
-
-      each_required_key do |key|
-        value = self[key] or raise
-        loc.add_required_child(key, value._start_pos...value._end_pos)
-      end
-
-      loc #: self
-    end
   end
 end

sig/location.rbs

@@ -8,16 +8,10 @@ module RBS
     # The buffer this location points on.
     attr_reader buffer (): Buffer
 
-    # The absolute start index of character the range starts from
-    #
-    # It returns the index in the `buffer.top_buffer`.
-    #
+    # The index of character the range starts from.
     attr_reader start_pos (): Integer
 
-    # The absolute end index of character the range ends at
-    #
-    # It returns the index in the `buffer.top_buffer`.
-    #
+    # The index of character the range ends at.
     attr_reader end_pos (): Integer
 
     def initialize: (Buffer, Integer start_pos, Integer end_pos) -> void
@@ -30,37 +24,26 @@ module RBS
     # Returns the name of the buffer.
     def name: () -> untyped
 
-    # The *raw* index of character the range starts from.
-    attr_reader _start_pos (): Integer
-
-    # The *raw* index of character the range ends at.
-    attr_reader _end_pos (): Integer
-
-    # Line of the `start_pos` (1 origin, absolute)
+    # Line of the `start_pos` (1 origin)
     attr_reader start_line (): Integer
 
-    # Column of the `start_pos` (0 origin, absolute)
+    # Column of the `start_pos` (0 origin)
     attr_reader start_column (): Integer
 
-    # Line of the `end_pos` (1 origin, absolute)
+    # Line of the `end_pos` (1 origin)
     attr_reader end_line (): Integer
 
-    # Column of the `end_pos` (0 origin, absolute)
+    # Column of the `end_pos` (0 origin)
     attr_reader end_column (): Integer
 
-    # The absolute line-column pair of the start position
-    #
     attr_reader start_loc (): Buffer::loc
 
     @start_loc: Buffer::loc?
 
-    # The absolute line-column pair of the end position
-    #
     attr_reader end_loc (): Buffer::loc
 
     @end_loc: Buffer::loc?
 
-    # The absolute range of the start and end position
     attr_reader range (): Range[Integer]
 
     @range: Range[Integer]?
@@ -114,10 +97,6 @@ module RBS
 
     def key?: (Symbol) -> bool
 
-    # Returns the location of the buffer, but the buffer is detached from the parent buffer
-    #
-    def local_location: () -> self
-
     private
 
     def _add_required_child: (RequiredChildKeys name, Integer start_pos, Integer end_pos) -> void

test/rbs/location_test.rb

@@ -89,78 +89,6 @@ def test_location_inspect
     assert_include loc.inspect, "source=\"class Foo\""
   end
 
-  def test_sub_buffer_location
-    buffer = buffer()
-    # 01
-    # bc
-    buffer = buffer.sub_buffer(lines: [0...2, 5...7])
-
-    loc = Location.new(buffer, 0, 5)
-
-    # Raw positions
-    assert_equal 0, loc._start_pos
-    assert_equal 5, loc._end_pos
-
-    # Absolute positions
-    assert_equal 0, loc.start_pos
-    assert_equal 7, loc.end_pos
-    assert_equal [1, 0], loc.start_loc
-    assert_equal [2, 3], loc.end_loc
-
-    assert_equal "123\nabc", loc.source
-
-    loc.add_optional_child(:opt, 0...2)
-    loc[:opt].tap do |loc|
-      assert_equal 0, loc.start_pos
-      assert_equal 2, loc.end_pos
-      assert_equal "12", loc.source
-    end
-
-    loc.add_required_child(:req, 1...4)
-    loc[:req].tap do |loc|
-      assert_equal 1, loc.start_pos
-      assert_equal 6, loc.end_pos
-      assert_equal "23\nab", loc.source
-    end
-  end
-
-  def test_sub_buffer_local_location
-    buffer = buffer()
-    # 01
-    # bc
-    buffer = buffer.sub_buffer(lines: [0...2, 5...7])
-
-    loc = Location.new(buffer, 0, 5)
-    loc.add_optional_child(:opt, 0...2)
-    loc.add_required_child(:req, 1...4)
-
-    loc = loc.local_location
-
-    # Raw positions
-    assert_equal 0, loc._start_pos
-    assert_equal 5, loc._end_pos
-
-    # Absolute positions in sub buffer
-    assert_equal 0, loc.start_pos
-    assert_equal 5, loc.end_pos
-    assert_equal [1, 0], loc.start_loc
-    assert_equal [2, 2], loc.end_loc
-
-    assert_equal "12\nbc", loc.source
-
-    loc[:opt].tap do |loc|
-      assert_equal 0, loc.start_pos
-      assert_equal 2, loc.end_pos
-      assert_equal "12", loc.source
-    end
-
-    loc[:req].tap do |loc|
-      assert_equal 1, loc.start_pos
-      assert_equal 4, loc.end_pos
-      assert_equal "2\nb", loc.source
-    end
-  end
-
   private
 
   def buffer(content: nil)