rbs 3.9.4 → 4.2.0

data/lib/rbs/ast/type_param.rb

@@ -3,12 +3,13 @@
 module RBS
   module AST
     class TypeParam
-      attr_reader :name, :variance, :location, :upper_bound_type, :default_type
+      attr_reader :name, :variance, :location, :upper_bound_type, :lower_bound_type, :default_type
 
-      def initialize(name:, variance:, upper_bound:, location:, default_type: nil, unchecked: false)
+      def initialize(name:, variance:, upper_bound:, lower_bound:, location:, default_type: nil, unchecked: false)
         @name = name
         @variance = variance
         @upper_bound_type = upper_bound
+        @lower_bound_type = lower_bound
         @location = location
         @default_type = default_type
         @unchecked = unchecked
@@ -21,6 +22,13 @@ module RBS
         end
       end
 
+      def lower_bound
+        case lower_bound_type
+        when Types::ClassInstance, Types::ClassSingleton, Types::Interface
+          lower_bound_type
+        end
+      end
+
       def unchecked!(value = true)
         @unchecked = value ? true : false
         self
@@ -35,6 +43,7 @@ module RBS
           other.name == name &&
           other.variance == variance &&
           other.upper_bound_type == upper_bound_type &&
+          other.lower_bound_type == lower_bound_type &&
           other.default_type == default_type &&
           other.unchecked? == unchecked?
       end
@@ -42,7 +51,7 @@ module RBS
       alias eql? ==
 
       def hash
-        self.class.hash ^ name.hash ^ variance.hash ^ upper_bound_type.hash ^ unchecked?.hash ^ default_type.hash
+        self.class.hash ^ name.hash ^ variance.hash ^ upper_bound_type.hash ^ lower_bound_type.hash ^ unchecked?.hash ^ default_type.hash
       end
 
       def to_json(state = JSON::State.new)
@@ -52,6 +61,7 @@ module RBS
           unchecked: unchecked?,
           location: location,
           upper_bound: upper_bound_type,
+          lower_bound: lower_bound_type,
           default_type: default_type
         }.to_json(state)
       end
@@ -61,6 +71,10 @@ module RBS
           _upper_bound_type = yield(b)
         end
 
+        if b = lower_bound_type
+          _lower_bound_type = yield(b)
+        end
+
         if dt = default_type
           _default_type = yield(dt)
         end
@@ -69,6 +83,7 @@ module RBS
           name: name,
           variance: variance,
           upper_bound: _upper_bound_type,
+          lower_bound: _lower_bound_type,
           location: location,
           default_type: _default_type
         ).unchecked!(unchecked?)
@@ -99,7 +114,7 @@ module RBS
       def self.rename(params, new_names:)
         raise unless params.size == new_names.size
 
-        subst = Substitution.build(new_names, Types::Variable.build(new_names))
+        subst = Substitution.build(params.map(&:name), Types::Variable.build(new_names))
 
         params.map.with_index do |param, index|
           new_name = new_names[index]
@@ -108,6 +123,7 @@ module RBS
             name: new_name,
             variance: param.variance,
             upper_bound: param.upper_bound_type&.map_type {|type| type.sub(subst) },
+            lower_bound: param.lower_bound_type&.map_type {|type| type.sub(subst) },
             location: param.location,
             default_type: param.default_type&.map_type {|type| type.sub(subst) }
           ).unchecked!(param.unchecked?)
@@ -136,6 +152,10 @@ module RBS
           s << " < #{type}"
         end
 
+        if type = lower_bound_type
+          s << " > #{type}"
+        end
+
         if dt = default_type
           s << " = #{dt}"
         end
@@ -176,7 +196,7 @@ module RBS
       end
 
       def self.normalize_args(params, args)
-        app = application(params, args) or return []
+        app = application(params, args) or return args
 
         min_count = params.count { _1.default_type.nil? }
         unless min_count <= args.size && args.size <= params.size

data/lib/rbs/buffer.rb

@@ -4,39 +4,58 @@ module RBS
   class Buffer
     attr_reader :name
     attr_reader :content
+    attr_reader :parent
 
-    def initialize(name:, content:)
-      @name = name
-      @content = content
+    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
     end
 
     def lines
-      @lines ||= content.lines
+      ranges.map { self.content[_1] || raise } #$ String
+    end
+
+    def line_count
+      ranges.size
     end
 
     def ranges
-      @ranges ||=
-        begin
-          @ranges = []
+      @ranges ||= begin
+        if content.empty?
+          ranges = [0...0] #: Array[Range[Integer]]
+          lines = [""]
+        else
+          lines = content.lines
+          lines << "" if content.end_with?("\n")
+
+          ranges = [] #: Array[Range[Integer]]
           offset = 0
+
           lines.each do |line|
-            size = line.size
-            range = offset...(offset+size)
-            @ranges << range
-            offset += size
-          end
+            size0 = line.size
+            line = line.chomp
+            range = offset...(offset+line.size)
+            ranges << range
 
-          if !content.end_with?("\n") && content.size > 0
-            @ranges[-1] = @ranges[-1].begin...(@ranges[-1].end+1)
+            offset += size0
           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
@@ -49,7 +68,7 @@ module RBS
     def loc_to_pos(loc)
       line, column = loc
 
-      if range = ranges[line - 1]
+      if range = ranges.fetch(line - 1, nil)
         range.begin + column
       else
         last_position
@@ -57,11 +76,114 @@ module RBS
     end
 
     def last_position
-      content.size
+      if ranges.empty?
+        0
+      else
+        ranges[-1].end
+      end
     end
 
     def inspect
-      "#<RBS::Buffer:#{__id__} @name=#{name}, @content=#{content.bytesize} bytes, @lines=#{lines.size} lines,>"
+      "#<RBS::Buffer:#{__id__} @name=#{name}, @content=#{content.bytesize} bytes, @lines=#{ranges.size} lines,>"
+    end
+
+    def character_offset(byte_offset)
+      top = top_buffer
+      return top.character_offset(byte_offset) unless top.equal?(self)
+
+      keys, vals = (@character_offset_cache ||= [[0], [0]])
+
+      idx = keys.bsearch_index { |k| k > byte_offset }
+      lo = idx ? idx - 1 : keys.size - 1
+
+      base_byte = keys[lo]
+      base_char = vals[lo]
+      delta = byte_offset - base_byte
+      return base_char if delta == 0
+
+      result = base_char + (content.byteslice(base_byte, delta) or raise).length
+
+      if base_byte == keys[-1]
+        keys << byte_offset
+        vals << result
+      end
+
+      result
+    end
+
+    def rbs_location(location, loc2=nil)
+      top = top_buffer
+      if loc2
+        Location.new(top, character_offset(location.start_offset), character_offset(loc2.end_offset))
+      else
+        Location.new(top, character_offset(location.start_offset), character_offset(location.end_offset))
+      end
+    end
+
+    def sub_buffer(lines:, byte_lines_hint: nil)
+      buf = +""
+
+      if byte_lines_hint
+        byte_lines_hint.each_with_index do |range, index|
+          slice = content.byteslice(range.begin, range.end - range.begin) or raise
+          if slice.include?("\n")
+            raise "Line #{index + 1} cannot contain newline character."
+          end
+          buf << slice
+          buf << "\n"
+        end
+      else
+        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
+      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)
     end
   end
 end

data/lib/rbs/cli/diff.rb

@@ -3,13 +3,14 @@
 module RBS
   class CLI
     class Diff
-      def initialize(argv:, library_options:, stdout: $stdout, stderr: $stderr)
-        @format = nil
+      def initialize(stdout: $stdout, stderr: $stderr)
         @stdout = stdout
         @stderr = stderr
+      end
 
-        # @type var type_name: String?
-        type_name = nil
+      def run(argv:, library_options:)
+        format = nil #: String?
+        type_name = nil #: String?
         library_options = library_options
         before_path = [] #: Array[String]
         after_path = [] #: Array[String]
@@ -32,7 +33,7 @@ module RBS
               # Confirmation of methods related to Time class added by including stdlib/time
               $ rbs diff --format diff --type-name Time --after stdlib/time
           HELP
-          o.on("--format NAME")    { |arg| @format = arg }
+          o.on("--format NAME")    { |arg| format = arg }
           o.on("--type-name NAME") { |arg| type_name = arg }
           o.on("--before DIR")     { |arg| before_path << arg }
           o.on("--after DIR")      { |arg| after_path << arg }
@@ -40,28 +41,28 @@ module RBS
         end
         opt.parse!(argv)
 
-        unless @format && type_name && ["markdown", "diff"].include?(@format)
+        unless format && type_name && ["markdown", "diff"].include?(format)
           @stderr.puts opt.banner
-          exit 1
+          return 1
         end
 
-        @diff = RBS::Diff.new(
+        diff = RBS::Diff.new(
           type_name: TypeName.parse(type_name).absolute!,
           library_options: library_options,
           after_path: after_path,
           before_path: before_path,
           detail: detail,
         )
-      end
 
-      def run
-        public_send("run_#{@format}")
+        public_send("run_#{format}", diff)
+
+        0
       end
 
-      def run_diff
+      def run_diff(diff)
         first = true
         io = RBS::CLI::ColoredIO.new(stdout: @stdout)
-        @diff.each_diff do |before, after|
+        diff.each_diff do |before, after|
           io.puts if !first
           io.puts_red   "- #{before}"
           io.puts_green "+ #{after}"
@@ -69,10 +70,10 @@ module RBS
         end
       end
 
-      def run_markdown
+      def run_markdown(diff)
         @stdout.puts "| before | after |"
         @stdout.puts "| --- | --- |"
-        @diff.each_diff do |before, after|
+        diff.each_diff do |before, after|
           before.gsub!("|", "\\|")
           after.gsub!("|", "\\|")
           @stdout.puts "| `#{before}` | `#{after}` |"