rbi 0.3.0 → 0.3.2

data/lib/rbi/rewriters/merge_trees.rb

@@ -67,8 +67,8 @@ module RBI
         @left_name = left_name
         @right_name = right_name
         @keep = keep
-        @tree = T.let(MergeTree.new, MergeTree)
-        @scope_stack = T.let([@tree], T::Array[Tree])
+        @tree = MergeTree.new #: MergeTree
+        @scope_stack = [@tree] #: Array[Tree]
       end
 
       #: (Tree tree) -> void
@@ -99,12 +99,12 @@ module RBI
         def initialize(output, left_name: "left", right_name: "right", keep: Keep::NONE)
           super()
           @tree = output
-          @index = T.let(output.index, Index)
-          @scope_stack = T.let([@tree], T::Array[Tree])
+          @index = output.index #: Index
+          @scope_stack = [@tree] #: Array[Tree]
           @left_name = left_name
           @right_name = right_name
           @keep = keep
-          @conflicts = T.let([], T::Array[Conflict])
+          @conflicts = [] #: Array[Conflict]
         end
 
         # @override
@@ -159,7 +159,7 @@ module RBI
 
         #: -> Tree
         def current_scope
-          T.must(@scope_stack.last)
+          @scope_stack.last #: as !nil
         end
 
         #: (Node node) -> Node?
@@ -245,7 +245,7 @@ module RBI
         # @override
         #: (Array[Node] nodes) -> void
         def visit_all(nodes)
-          last_conflict_tree = T.let(nil, T.nilable(ConflictTree))
+          last_conflict_tree = nil #: ConflictTree?
           nodes.dup.each do |node|
             if node.is_a?(ConflictTree)
               if last_conflict_tree
@@ -287,7 +287,7 @@ module RBI
 
     #: -> ConflictTree?
     def parent_conflict_tree
-      parent = T.let(parent_tree, T.nilable(Node))
+      parent = parent_tree #: Node?
       while parent
         return parent if parent.is_a?(ConflictTree)
 
@@ -555,9 +555,9 @@ module RBI
       super()
       @left_name = left_name
       @right_name = right_name
-      @left = T.let(Tree.new, Tree)
+      @left = Tree.new #: Tree
       @left.parent_tree = self
-      @right = T.let(Tree.new, Tree)
+      @right = Tree.new #: Tree
       @right.parent_tree = self
     end
   end

data/lib/rbi/rewriters/nest_top_level_members.rb

@@ -24,7 +24,7 @@ module RBI
       def initialize
         super
 
-        @top_level_object_class = T.let(nil, T.nilable(Class))
+        @top_level_object_class = nil #: Class?
       end
 
       # @override

data/lib/rbi/rewriters/remove_known_definitions.rb

@@ -53,7 +53,7 @@ module RBI
       def initialize(index)
         super()
         @index = index
-        @operations = T.let([], T::Array[Operation])
+        @operations = [] #: Array[Operation]
       end
 
       class << self
@@ -107,10 +107,10 @@ module RBI
         when Scope
           node.empty?
         when Attr
-          previous = T.cast(previous, Attr)
+          previous = previous #: as Attr
           node.names == previous.names && node.sigs == previous.sigs
         when Method
-          previous = T.cast(previous, Method)
+          previous = previous #: as Method
           node.params == previous.params && node.sigs == previous.sigs
         else
           true

data/lib/rbi/rewriters/sort_nodes.rb

@@ -31,7 +31,9 @@ module RBI
             next res if res && res != 0 # we can sort the nodes by their name, let's stop here
 
             # Finally, if the two nodes have the same rank and the same name or at least one node is anonymous then,
-            T.must(original_order[a]) <=> T.must(original_order[b]) # we keep the original order
+            original_order_a = original_order[a] #: as !nil
+            original_order_b = original_order[b] #: as !nil
+            original_order_a <=> original_order_b # we keep the original order
           end
         end
 

data/lib/rbi/rewriters/translate_rbs_sigs.rb

@@ -35,7 +35,7 @@ module RBI
         comments = node.comments.dup
         node.comments.clear
 
-        rbs_sigs = T.let([], T::Array[RBSComment])
+        rbs_sigs = [] #: Array[RBSComment]
 
         comments.each do |comment|
           case comment
@@ -67,7 +67,7 @@ module RBI
             raise Error, "AttrWriter must have exactly one name"
           end
 
-          name = T.must(node.names.first)
+          name = node.names.first #: as !nil
           sig.params << SigParam.new(name.to_s, RBS::TypeTranslator.translate(attr_type))
         end
 

data/lib/rbi/type.rb

@@ -285,7 +285,7 @@ module RBI
       def initialize(name, *params)
         super()
         @name = name
-        @params = T.let(params, T::Array[Type])
+        @params = params #: Array[Type]
       end
 
       # @override
@@ -395,9 +395,9 @@ module RBI
       #: -> void
       def initialize
         super
-        @proc_params = T.let({}, T::Hash[Symbol, Type])
-        @proc_returns = T.let(Type.void, Type)
-        @proc_bind = T.let(nil, T.nilable(Type))
+        @proc_params = {} #: Hash[Symbol, Type]
+        @proc_returns = Type.void #: Type
+        @proc_bind = nil #: Type?
       end
 
       # @override
@@ -570,7 +570,7 @@ module RBI
         end.uniq
 
         if flattened.size == 1
-          T.must(flattened.first)
+          flattened.first #: as !nil
         else
           raise ArgumentError, "RBI::Type.all should have at least 2 types supplied" if flattened.size < 2
 
@@ -596,7 +596,7 @@ module RBI
           end
         end
 
-        is_nilable = T.let(false, T::Boolean)
+        is_nilable = false #: bool
 
         types = flattened.filter_map do |type|
           case type
@@ -632,7 +632,7 @@ module RBI
             raise ArgumentError, "RBI::Type.any should have at least 2 types supplied"
           end
         when 1
-          T.must(types.first)
+          types.first #: as !nil
         else
           Any.new(types)
         end
@@ -693,7 +693,7 @@ module RBI
 
     #: -> void
     def initialize
-      @nilable = T.let(false, T::Boolean)
+      @nilable = false #: bool
     end
 
     # Returns a new type that is `nilable` if it is not already.

data/lib/rbi/type_parser.rb

@@ -18,7 +18,7 @@ module RBI
         raise Error, "Expected a type expression, got nothing" if node.statements.body.empty?
         raise Error, "Expected a single type expression, got `#{node.slice}`" if node.statements.body.size > 1
 
-        node = T.must(node.statements.body.first)
+        node = node.statements.body.first #: as !nil
         parse_node(node)
       end
 
@@ -40,7 +40,9 @@ module RBI
           children = body.body
           raise Error, "Expected exactly 1 child, got #{children.size}" unless children.size == 1
 
-          parse_node(T.must(children.first))
+          parse_node(
+            children.first, #: as !nil
+          )
         else
           raise Error, "Unexpected node `#{node}`"
         end
@@ -84,7 +86,11 @@ module RBI
             if t_class?(recv)
               # `T::Class[Foo]` or `::T::Class[Foo]`
               args = check_arguments_exactly!(node, 1)
-              return Type::Class.new(parse_node(T.must(args.first)))
+              return Type::Class.new(
+                parse_node(
+                  args.first, #: as !nil
+                ),
+              )
             else
               # `::Foo[Bar]` or `::Foo[Bar, Baz]`
               args = check_arguments_at_least!(node, 1)
@@ -94,11 +100,15 @@ module RBI
             # `T.class_of(Foo)[Bar]`
             if t_class_of?(recv)
               type_args = check_arguments_exactly!(recv, 1)
-              type = parse_node(T.must(type_args.first))
+              type = parse_node(
+                type_args.first, #: as !nil
+              )
               raise Error, "Expected a simple type, got `#{type}`" unless type.is_a?(Type::Simple)
 
               type_param_args = check_arguments_exactly!(node, 1)
-              type_param = parse_node(T.must(type_param_args.first))
+              type_param = parse_node(
+                type_param_args.first, #: as !nil
+              )
               return Type::ClassOf.new(type, type_param)
             end
           end
@@ -117,7 +127,9 @@ module RBI
         when :nilable
           # `T.nilable(Foo)`
           args = check_arguments_exactly!(node, 1)
-          type = parse_node(T.must(args.first))
+          type = parse_node(
+            args.first, #: as !nil
+          )
           Type::Nilable.new(type)
         when :anything
           # `T.anything`
@@ -142,7 +154,9 @@ module RBI
         when :class_of
           # `T.class_of(Foo)`
           args = check_arguments_exactly!(node, 1)
-          type = parse_node(T.must(args.first))
+          type = parse_node(
+            args.first, #: as !nil
+          )
           raise Error, "Expected a simple type, got `#{type}`" unless type.is_a?(Type::Simple)
 
           Type::ClassOf.new(type)
@@ -180,7 +194,9 @@ module RBI
           elem_key = elem.key
           key = case elem_key
           when Prism::SymbolNode
-            T.must(elem_key.value).to_sym
+            elem_key
+              .value #: as !nil
+              .to_sym
           when Prism::StringNode
             elem_key.content
           else
@@ -216,14 +232,22 @@ module RBI
             T.unsafe(type).params(**params)
           when :returns
             args = check_arguments_exactly!(call, 1)
-            type.returns(parse_node(T.must(args.first)))
+            type.returns(
+              parse_node(
+                args.first, #: as !nil
+              ),
+            )
           when :void
             type.void
           when :proc
             return type
           when :bind
             args = check_arguments_exactly!(call, 1)
-            type.bind(parse_node(T.must(args.first)))
+            type.bind(
+              parse_node(
+                args.first, #: as !nil
+              ),
+            )
           else
             raise Error, "Unexpected expression `#{node.slice}`"
           end
@@ -261,8 +285,8 @@ module RBI
 
       #: (Prism::CallNode node) -> Array[Prism::Node]
       def call_chain(node)
-        call_chain = T.let([node], T::Array[Prism::Node])
-        receiver = T.let(node.receiver, T.nilable(Prism::Node))
+        call_chain = [node] #: Array[Prism::Node]
+        receiver = node.receiver #: Prism::Node?
         while receiver
           call_chain.prepend(receiver)
           break unless receiver.is_a?(Prism::CallNode)

data/lib/rbi/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module RBI
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

data/lib/rbi/visitor.rb

@@ -88,6 +88,8 @@ module RBI
         visit_sig(node)
       when SigParam
         visit_sig_param(node)
+      when TEnumValue
+        visit_tenum_value(node)
       when TStructConst
         visit_tstruct_const(node)
       when TStructProp
@@ -222,6 +224,9 @@ module RBI
     #: (TEnumBlock node) -> void
     def visit_tenum_block(node); end
 
+    #: (TEnumValue node) -> void
+    def visit_tenum_value(node); end
+
     #: (Helper node) -> void
     def visit_helper(node); end