rbi 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8f99c70643c9f05b1b7dda28cb2091654c1865b124b01a981fc4a3b6f59275f
-  data.tar.gz: 9d0b4626b14eced346dd4899cce76996137a84047f4b10142e01d0c35655b450
+  metadata.gz: 9a3e133057e9df490de9a0757b30f9b1f19ffa3afbca8f16c55c90e1562bffd7
+  data.tar.gz: 835d569c6d20336e4911ef660117cb03af2b5c312e04850058b34402ba94cc34
 SHA512:
-  metadata.gz: e02a6ffba6687475814388820be9ae352ec732fa288f2295af75959a0ad7b3032992fa6c17b4cb2b03cdcb26667c48b5038c7c4d04babe25be77e0404ff41880
-  data.tar.gz: 0dd7254c9b7ac5c204654bd71f1a26b6b8597e2c5b10a199c5e0ab40224d5444d38eaf4c1e1c4a2acb9c75e482464ef55b7419216dc2f02556d8c8b2317e0f84
+  metadata.gz: 6c7d07ae2efbeee1310c61d0fdf440408e755d38febc3ed30a194512df118845d36ea9315142b87239ff1f8856f045bc565ac975683a504c05b05792aed9c4f8
+  data.tar.gz: 9661b08e169d35d2f947e88de33360bd8ba6d5ee522a2b8beccd77c6589bd6ed1fd560c7a665201c8e8d5869f7a8dda872c58fc0009acf6eda86b3e1da0a1fd9

data/Gemfile

@@ -10,7 +10,7 @@ group(:development, :test) do
   gem("minitest")
   gem("minitest-reporters")
   gem("rake", "~> 13.2")
-  gem("rubocop", "~> 1.70", require: false)
+  gem("rubocop", "~> 1.73", require: false)
   gem("rubocop-shopify", require: false)
   gem("rubocop-sorbet", require: false)
   gem("sorbet", ">= 0.5.9204", require: false)

data/lib/rbi/formatter.rb

@@ -3,21 +3,10 @@
 
 module RBI
   class Formatter
-    extend T::Sig
-
-    sig { returns(T.nilable(Integer)) }
+    #: Integer?
     attr_accessor :max_line_length
 
-    sig do
-      params(
-        add_sig_templates: T::Boolean,
-        group_nodes: T::Boolean,
-        max_line_length: T.nilable(Integer),
-        nest_singleton_methods: T::Boolean,
-        nest_non_public_members: T::Boolean,
-        sort_nodes: T::Boolean,
-      ).void
-    end
+    #: (?add_sig_templates: bool, ?group_nodes: bool, ?max_line_length: Integer?, ?nest_singleton_methods: bool, ?nest_non_public_members: bool, ?sort_nodes: bool) -> void
     def initialize(
       add_sig_templates: false,
       group_nodes: false,
@@ -34,18 +23,18 @@ module RBI
       @sort_nodes = sort_nodes
     end
 
-    sig { params(file: RBI::File).returns(String) }
+    #: (RBI::File file) -> String
     def print_file(file)
       format_file(file)
       file.string(max_line_length: @max_line_length)
     end
 
-    sig { params(file: RBI::File).void }
+    #: (RBI::File file) -> void
     def format_file(file)
       format_tree(file.root)
     end
 
-    sig { params(tree: RBI::Tree).void }
+    #: (RBI::Tree tree) -> void
     def format_tree(tree)
       tree.add_sig_templates! if @add_sig_templates
       tree.nest_singleton_methods! if @nest_singleton_methods

data/lib/rbi/index.rb

@@ -3,13 +3,10 @@
 
 module RBI
   class Index < Visitor
-    extend T::Sig
     include T::Enumerable
 
     class << self
-      extend T::Sig
-
-      sig { params(node: Node).returns(Index) }
+      #: (*Node node) -> Index
       def index(*node)
         index = Index.new
         index.visit_all(node)
@@ -17,28 +14,29 @@ module RBI
       end
     end
 
-    sig { void }
+    #: -> void
     def initialize
       super
       @index = T.let({}, T::Hash[String, T::Array[Node]])
     end
 
-    sig { returns(T::Array[String]) }
+    #: -> Array[String]
     def keys
       @index.keys
     end
 
-    sig { params(id: String).returns(T::Array[Node]) }
+    #: (String id) -> Array[Node]
     def [](id)
       @index[id] ||= []
     end
 
-    sig { params(nodes: Node).void }
+    #: (*Node nodes) -> void
     def index(*nodes)
       nodes.each { |node| visit(node) }
     end
 
-    sig { override.params(node: T.nilable(Node)).void }
+    # @override
+    #: (Node? node) -> void
     def visit(node)
       return unless node
 
@@ -55,16 +53,14 @@ module RBI
 
     private
 
-    sig { params(node: T.all(Indexable, Node)).void }
+    #: ((Indexable & Node) node) -> void
     def index_node(node)
       node.index_ids.each { |id| self[id] << node }
     end
   end
 
   class Tree
-    extend T::Sig
-
-    sig { returns(Index) }
+    #: -> Index
     def index
       Index.index(self)
     end
@@ -86,140 +82,140 @@ module RBI
   end
 
   class Scope
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [fully_qualified_name]
     end
   end
 
   class Const
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [fully_qualified_name]
     end
   end
 
   class Attr
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       fully_qualified_names
     end
   end
 
   class Method
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [fully_qualified_name]
     end
   end
 
   class Include
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       names.map { |name| "#{parent_scope&.fully_qualified_name}.include(#{name})" }
     end
   end
 
   class Extend
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       names.map { |name| "#{parent_scope&.fully_qualified_name}.extend(#{name})" }
     end
   end
 
   class MixesInClassMethods
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       names.map { |name| "#{parent_scope&.fully_qualified_name}.mixes_in_class_method(#{name})" }
     end
   end
 
   class RequiresAncestor
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [to_s]
     end
   end
 
   class Helper
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [to_s]
     end
   end
 
   class TypeMember
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [to_s]
     end
   end
 
   class Send
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       ["#{parent_scope&.fully_qualified_name}.#{method}"]
     end
   end
 
   class TStructConst
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       fully_qualified_names
     end
   end
 
   class TStructProp
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       fully_qualified_names
     end
   end
 
   class TEnumBlock
-    extend T::Sig
     include Indexable
 
-    sig { override.returns(T::Array[String]) }
+    # @override
+    #: -> Array[String]
     def index_ids
       [to_s]
     end

data/lib/rbi/loc.rb

@@ -3,12 +3,8 @@
 
 module RBI
   class Loc
-    extend T::Sig
-
     class << self
-      extend T::Sig
-
-      sig { params(file: String, prism_location: Prism::Location).returns(Loc) }
+      #: (String file, Prism::Location prism_location) -> Loc
       def from_prism(file, prism_location)
         new(
           file: file,
@@ -20,21 +16,13 @@ module RBI
       end
     end
 
-    sig { returns(T.nilable(String)) }
+    #: String?
     attr_reader :file
 
-    sig { returns(T.nilable(Integer)) }
+    #: Integer?
     attr_reader :begin_line, :end_line, :begin_column, :end_column
 
-    sig do
-      params(
-        file: T.nilable(String),
-        begin_line: T.nilable(Integer),
-        end_line: T.nilable(Integer),
-        begin_column: T.nilable(Integer),
-        end_column: T.nilable(Integer),
-      ).void
-    end
+    #: (?file: String?, ?begin_line: Integer?, ?end_line: Integer?, ?begin_column: Integer?, ?end_column: Integer?) -> void
     def initialize(file: nil, begin_line: nil, end_line: nil, begin_column: nil, end_column: nil)
       @file = file
       @begin_line = begin_line
@@ -43,7 +31,7 @@ module RBI
       @end_column = end_column
     end
 
-    sig { returns(String) }
+    #: -> String
     def to_s
       if end_line && end_column
         "#{file}:#{begin_line}:#{begin_column}-#{end_line}:#{end_column}"
@@ -52,7 +40,7 @@ module RBI
       end
     end
 
-    sig { returns(T.nilable(String)) }
+    #: -> String?
     def source
       file = self.file
       return unless file