Revert "Introduce sub buffer"

This reverts commit f2259d9.

Author: soutaro

lib/rbs/buffer.rb

@@ -4,53 +4,39 @@ module RBS
   class Buffer
     attr_reader :name
     attr_reader :content
-    attr_reader :parent
 
-    def initialize(name: nil, content:, parent: nil)
-      case
-      when name && content
-        @name = name
-        @content = content
-        @parent = nil
-      when parent && content
-        @name = parent[0].name
-        @content = content
-        @parent = parent
-      end
+    def initialize(name:, content:)
+      @name = name
+      @content = content
     end
 
     def lines
-      ranges.map { self.content[_1] || raise } #$ String
-    end
-
-    def line_count
-      ranges.size
+      @lines ||= content.lines
     end
 
     def ranges
-      @ranges ||= begin
-        lines = content.lines
-        lines << "" if content.end_with?("\n")
-
-        ranges = [] #: Array[Range[Integer]]
-        offset = 0
-
-        lines.each do |line|
-          size0 = line.size
-          line = line.chomp
-          range = offset...(offset+line.size)
-          ranges << range
-
-          offset += size0
+      @ranges ||=
+        begin
+          @ranges = []
+          offset = 0
+          lines.each do |line|
+            size = line.size
+            range = offset...(offset+size)
+            @ranges << range
+            offset += size
+          end
+
+          if !content.end_with?("\n") && content.size > 0
+            @ranges[-1] = @ranges[-1].begin...(@ranges[-1].end+1)
+          end
+
+          @ranges
         end
-
-        ranges
-      end
     end
 
     def pos_to_loc(pos)
       index = ranges.bsearch_index do |range|
-        pos <= range.end ? true : false
+        pos < range.end ? true : false
       end
 
       if index
@@ -63,85 +49,19 @@ def pos_to_loc(pos)
     def loc_to_pos(loc)
       line, column = loc
 
-      if range = ranges.fetch(line - 1, nil)
+      if range = ranges[line - 1]
         range.begin + column
       else
         last_position
       end
     end
 
     def last_position
-      if ranges.empty?
-        0
-      else
-        ranges[-1].end
-      end
+      content.size
     end
 
     def inspect
-      "#<RBS::Buffer:#{__id__} @name=#{name}, @content=#{content.bytesize} bytes, @lines=#{ranges.size} lines,>"
-    end
-
-    def rbs_location(location, loc2=nil)
-      if loc2
-        Location.new(self, location.start_character_offset, loc2.end_character_offset)
-      else
-        Location.new(self, location.start_character_offset, location.end_character_offset)
-      end
-    end
-
-    def sub_buffer(lines:)
-      buf = +""
-      lines.each_with_index do |range, index|
-        start_pos = range.begin
-        end_pos = range.end
-        slice = content[start_pos...end_pos] or raise
-        if slice.include?("\n")
-          raise "Line #{index + 1} cannot contain newline character."
-        end
-        buf << slice
-        buf << "\n"
-      end
-
-      buf.chomp!
-
-      Buffer.new(content: buf, parent: [self, lines])
-    end
-
-    def parent_buffer
-      if parent
-        parent[0]
-      end
-    end
-
-    def parent_position(position)
-      parent or raise "#parent_position is unavailable with buffer without parent"
-      return nil unless position <= last_position
-
-      line, column = pos_to_loc(position)
-      parent_range = parent[1][line - 1]
-      parent_range.begin + column
-    end
-
-    def absolute_position(position)
-      if parent_buffer
-        pos = parent_position(position) or return
-        parent_buffer.absolute_position(pos)
-      else
-        position
-      end
-    end
-
-    def top_buffer
-      if parent_buffer
-        parent_buffer.top_buffer
-      else
-        self
-      end
-    end
-
-    def detach
-      Buffer.new(name: name, content: content)
+      "#<RBS::Buffer:#{__id__} @name=#{name}, @content=#{content.bytesize} bytes, @lines=#{lines.size} lines,>"
     end
   end
 end

sig/buffer.rbs

@@ -11,80 +11,22 @@ module RBS
     # The content of the buffer.
     attr_reader content: String
 
-    attr_reader parent: [Buffer, Array[Range[Integer]]]?
+    @lines: Array[String]
+
+    @ranges: Array[Range[Integer]]
 
     def initialize: (name: Pathname name, content: String content) -> void
-                  | (content: String content, parent: [Buffer, Array[Range[Integer]]] parent) -> void
 
-    # Array of lines of the content, without the EOL
-    #
-    # ```rb
-    # buffer = Buffer.new(name: name, content: "123\nabc")
-    # buffer.lines   # => ["123", "abc"]
-    # ```
-    #
-    # If the input has EOL at the end of the file, the `lines` has an empty string at the end.
-    #
-    # ```rb
-    # buffer = Buffer.new(name: name, content: "123\nabc\n")
-    # buffer.lines   # => ["123", "abc", ""]
-    # ```
-    #
     def lines: () -> Array[String]
 
-    @ranges: Array[Range[Integer]]?
-    # Array of ranges that stores the ranges of the each line, without the EOL
-    #
-    # ```rb
-    # buffer = Buffer.new(name: name, content: "123\nabc\n")
-    # buffer.ranges  # => [0...3, 4...7, 8...8]
-    # ```
-    #
     def ranges: () -> Array[Range[Integer]]
 
-    # Returns the number of the lines
-    def line_count: () -> Integer
-
     # Translate position to location.
     def pos_to_loc: (Integer pos) -> loc
 
     # Translate location to position.
     def loc_to_pos: (loc loc) -> Integer
 
     def last_position: () -> Integer
-
-    # Translate `Prism::Location` to `RBS::Location` attached to this buffer
-    #
-    # It assumes the `Prism::Location` has a source which is equivalent to `self`.
-    #
-    def rbs_location: (Prism::Location) -> Location
-                    | (Prism::Location, Prism::Location) -> Location
-
-    # Construct a buffer from substrings of this buffer.
-    #
-    # The returned buffer contains lines from given ranges.
-    #
-    # ```rb
-    # buffer = Buffer.new(name: name, content: <<TEXT)
-    # 12345
-    # abcde
-    # ABCDE
-    # TEXT
-    #
-    # buffer.sub_buffer(lines: [0...1, 2...3])  # => Buffer with content = 1\n34
-    # buffer.sub_buffer(lines: [5..7])          # => Raises an error because the range contains newline
-    # ```
-    #
-    %a{pure} def sub_buffer: (lines: Array[Range[Integer]]) -> Buffer
-
-    %a{pure} def parent_buffer: () -> Buffer?
-
-    %a{pure} def parent_position: (Integer) -> Integer?
-
-    %a{pure} def absolute_position: (Integer) -> Integer?
-
-    %a{pure} def top_buffer: () -> Buffer
-
-    %a{pure} def detach: () -> Buffer
   end
 end

test/rbs/buffer_test.rb

@@ -9,8 +9,8 @@ def test_buffer
 abc
     CONTENT
 
-    assert_equal ["123", "abc", ""], buffer.lines
-    assert_equal [0...3, 4...7, 8...8], buffer.ranges
+    assert_equal ["123\n", "abc\n"], buffer.lines
+    assert_equal [0...4, 4...8], buffer.ranges
 
     assert_equal [1, 0], buffer.pos_to_loc(0)
     assert_equal [1, 1], buffer.pos_to_loc(1)
@@ -41,8 +41,8 @@ def test_buffer
   def test_buffer_with_no_eol
     buffer = Buffer.new(name: Pathname("foo.rbs"), content: "123\nabc")
 
-    assert_equal ["123", "abc"], buffer.lines
-    assert_equal [0...3, 4...7], buffer.ranges
+    assert_equal ["123\n", "abc"], buffer.lines
+    assert_equal [0...4, 4...8], buffer.ranges
 
     assert_equal [1, 0], buffer.pos_to_loc(0)
     assert_equal [1, 1], buffer.pos_to_loc(1)
@@ -67,33 +67,4 @@ def test_buffer_with_no_eol
 
     assert_equal 7, buffer.last_position
   end
-
-  def test_sub_buffer
-    buffer = Buffer.new(name: Pathname("foo.rbs"), content: <<~CONTENT)
-      123
-      abc
-    CONTENT
-
-    buffer.sub_buffer(lines: [1...3, 5...7]).tap do |sub_buffer|
-      assert_equal <<~CONTENT.chomp, sub_buffer.content
-        23
-        bc
-      CONTENT
-
-      assert_equal 1, sub_buffer.parent_position(0)
-      assert_equal 2, sub_buffer.parent_position(1)
-      assert_equal 3, sub_buffer.parent_position(2)
-      assert_equal 5, sub_buffer.parent_position(3)
-      assert_equal 6, sub_buffer.parent_position(4)
-      assert_equal 7, sub_buffer.parent_position(5)
-
-      assert_equal [1, 0], sub_buffer.pos_to_loc(0)
-      assert_equal [1, 1], sub_buffer.pos_to_loc(1)
-      assert_equal [1, 2], sub_buffer.pos_to_loc(2)
-      assert_equal [2, 0], sub_buffer.pos_to_loc(3)
-      assert_equal [2, 1], sub_buffer.pos_to_loc(4)
-      assert_equal [2, 2], sub_buffer.pos_to_loc(5)
-      assert_equal [3, 0], sub_buffer.pos_to_loc(6)
-    end
-  end
 end

test/rbs/parser_test.rb

@@ -62,7 +62,7 @@ def test_interface_mixin
   end
 
   def test_type_error_for_content
-    buffer = RBS::Buffer.new(content: 1, name: Pathname("a.rbs"))
+    buffer = RBS::Buffer.new(content: 1, name: nil)
     assert_raises TypeError do
       RBS::Parser.parse_signature(buffer)
     end