rbi 0.3.2 → 0.3.5

data/lib/rbi/rbs_printer.rb

@@ -17,8 +17,17 @@ module RBI
     #: bool
     attr_accessor :positional_names
 
-    #: (?out: (IO | StringIO), ?indent: Integer, ?print_locs: bool, ?positional_names: bool) -> void
-    def initialize(out: $stdout, indent: 0, print_locs: false, positional_names: true)
+    #: Integer?
+    attr_reader :max_line_length
+
+    #: (
+    #|   ?out: (IO | StringIO),
+    #|   ?indent: Integer,
+    #|   ?print_locs: bool,
+    #|   ?positional_names: bool,
+    #|   ?max_line_length: Integer?
+    #| ) -> void
+    def initialize(out: $stdout, indent: 0, print_locs: false, positional_names: true, max_line_length: nil)
       super()
       @out = out
       @current_indent = indent
@@ -26,6 +35,7 @@ module RBI
       @in_visibility_group = false #: bool
       @previous_node = nil #: Node?
       @positional_names = positional_names #: bool
+      @max_line_length = max_line_length #: Integer?
     end
 
     # Printing
@@ -316,6 +326,10 @@ module RBI
       print_blank_line_before(node)
       visit_all(node.comments)
 
+      if node.sigs.any?(&:without_runtime)
+        printl("# @without_runtime")
+      end
+
       if node.sigs.any?(&:is_abstract)
         printl("# @abstract")
       end
@@ -382,6 +396,23 @@ module RBI
 
     #: (RBI::Method node, Sig sig) -> void
     def print_method_sig(node, sig)
+      old_out = @out
+      new_out = StringIO.new
+
+      @out = new_out
+      print_method_sig_inline(node, sig)
+      @out = old_out
+
+      max_line_length = @max_line_length
+      if max_line_length.nil? || new_out.string.size <= max_line_length
+        print(new_out.string)
+      else
+        print_method_sig_multiline(node, sig)
+      end
+    end
+
+    #: (RBI::Method node, Sig sig) -> void
+    def print_method_sig_inline(node, sig)
       unless sig.type_params.empty?
         print("[#{sig.type_params.join(", ")}] ")
       end
@@ -442,6 +473,72 @@ module RBI
       print(" # #{loc}") if loc && print_locs
     end
 
+    #: (RBI::Method node, Sig sig) -> void
+    def print_method_sig_multiline(node, sig)
+      unless sig.type_params.empty?
+        print("[#{sig.type_params.join(", ")}] ")
+      end
+
+      block_param = node.params.find { |param| param.is_a?(BlockParam) }
+      sig_block_param = sig.params.find { |param| param.name == block_param&.name }
+
+      sig_params = sig.params.dup
+      if block_param
+        sig_params.reject! do |param|
+          param.name == block_param.name
+        end
+      end
+
+      unless sig_params.empty?
+        printl("(")
+        indent
+        sig_params.each_with_index do |param, index|
+          printt
+          print_sig_param(node, param)
+          print(",") if index < sig_params.size - 1
+          printn
+        end
+        dedent
+        printt(") ")
+      end
+      if sig_block_param
+        block_type = sig_block_param.type
+        block_type = Type.parse_string(block_type) if block_type.is_a?(String)
+
+        block_is_nilable = false
+        if block_type.is_a?(Type::Nilable)
+          block_is_nilable = true
+          block_type = block_type.type
+        end
+
+        type_string = parse_type(block_type).rbs_string.delete_prefix("^")
+
+        skip = false
+        case block_type
+        when Type::Untyped
+          type_string = "(?) -> untyped"
+          block_is_nilable = true
+        when Type::Simple
+          type_string = "(?) -> untyped"
+          skip = true if block_type.name == "NilClass"
+        end
+
+        if skip
+          # no-op, we skip the block definition
+        elsif block_is_nilable
+          print("?{ #{type_string} } ")
+        else
+          print("{ #{type_string} } ")
+        end
+      end
+
+      type = parse_type(sig.return_type)
+      print("-> #{type.rbs_string}")
+
+      loc = sig.loc
+      print(" # #{loc}") if loc && print_locs
+    end
+
     #: (Sig node) -> void
     def visit_sig(node)
       if node.params
@@ -852,7 +949,7 @@ module RBI
     def parse_type(type)
       return type if type.is_a?(Type)
 
-      Type.parse_string(type)
+      Type.parse_string(type).simplify
     rescue Type::Error => e
       raise Error, "Failed to parse type `#{type}` (#{e.message})"
     end
@@ -886,9 +983,10 @@ module RBI
     #: String
     attr_reader :string
 
-    #: -> void
-    def initialize
+    #: (?max_line_length: Integer?) -> void
+    def initialize(max_line_length: nil)
       @string = String.new #: String
+      @max_line_length = max_line_length
     end
 
     #: (Type node) -> void

data/lib/rbi/rewriters/attr_to_methods.rb

@@ -54,7 +54,8 @@ module RBI
   end
 
   class Attr
-    sig { abstract.returns(T::Array[Method]) }
+    # @abstract
+    #: -> Array[Method]
     def convert_to_methods; end
 
     private

data/lib/rbi/rewriters/group_nodes.rb

@@ -91,22 +91,22 @@ module RBI
       @kind = kind
     end
 
-    class Kind < T::Enum
-      enums do
-        Mixins              = new
-        RequiredAncestors   = new
-        Helpers             = new
-        TypeMembers         = new
-        MixesInClassMethods = new
-        Sends               = new
-        Attrs               = new
-        TStructFields       = new
-        TEnums              = new
-        Inits               = new
-        Methods             = new
-        SingletonClasses    = new
-        Consts              = new
-      end
+    class Kind
+      Mixins              = new #: Kind
+      RequiredAncestors   = new #: Kind
+      Helpers             = new #: Kind
+      TypeMembers         = new #: Kind
+      MixesInClassMethods = new #: Kind
+      Sends               = new #: Kind
+      Attrs               = new #: Kind
+      TStructFields       = new #: Kind
+      TEnums              = new #: Kind
+      Inits               = new #: Kind
+      Methods             = new #: Kind
+      SingletonClasses    = new #: Kind
+      Consts              = new #: Kind
+
+      private_class_method(:new)
     end
   end
 end

data/lib/rbi/rewriters/merge_trees.rb

@@ -37,12 +37,12 @@ module RBI
     # end
     # ~~~
     class Merge
-      class Keep < ::T::Enum
-        enums do
-          NONE = new
-          LEFT = new
-          RIGHT = new
-        end
+      class Keep
+        NONE = new #: Keep
+        LEFT = new #: Keep
+        RIGHT = new #: Keep
+
+        private_class_method(:new)
       end
 
       class << self
@@ -79,11 +79,20 @@ module RBI
       end
 
       # Used for logging / error displaying purpose
-      class Conflict < T::Struct
-        const :left, Node
-        const :right, Node
-        const :left_name, String
-        const :right_name, String
+      class Conflict
+        #: Node
+        attr_reader :left, :right
+
+        #: String
+        attr_reader :left_name, :right_name
+
+        #: (left: Node, right: Node, left_name: String, right_name: String) -> void
+        def initialize(left:, right:, left_name:, right_name:)
+          @left = left
+          @right = right
+          @left_name = left_name
+          @right_name = right_name
+        end
 
         #: -> String
         def to_s

data/lib/rbi/rewriters/remove_known_definitions.rb

@@ -123,9 +123,15 @@ module RBI
         @operations << Operation.new(deleted_node: node, duplicate_of: previous)
       end
 
-      class Operation < T::Struct
-        const :deleted_node, Node
-        const :duplicate_of, Node
+      class Operation
+        #: Node
+        attr_reader :deleted_node, :duplicate_of
+
+        #: (deleted_node: Node, duplicate_of: Node) -> void
+        def initialize(deleted_node:, duplicate_of:)
+          @deleted_node = deleted_node
+          @duplicate_of = duplicate_of
+        end
 
         #: -> String
         def to_s

data/lib/rbi/rewriters/sort_nodes.rb

@@ -87,7 +87,7 @@ module RBI
         when Group::Kind::SingletonClasses    then 11
         when Group::Kind::Consts              then 12
         else
-          T.absurd(kind)
+          raise Error, "Unknown group kind: #{kind}"
         end
       end