rbs 1.1.1 → 1.2.0

data/lib/rbs/ast/declarations.rb

@@ -7,13 +7,28 @@ module RBS
       class ModuleTypeParams
         attr_reader :params
 
-        TypeParam = _ = Struct.new(:name, :variance, :skip_validation, keyword_init: true) do
-          def to_json(*a)
+        TypeParam = _ = Struct.new(:name, :variance, :skip_validation, :location, keyword_init: true) do
+          # @implements TypeParam
+
+          def to_json(state = _ = nil)
             {
               name: name,
               variance: variance,
               skip_validation: skip_validation,
-            }.to_json(*a)
+            }.to_json(state)
+          end
+
+          def ==(other)
+            other.is_a?(TypeParam) &&
+              other.name == name &&
+              other.variance == variance &&
+              other.skip_validation == skip_validation
+          end
+
+          alias eql? ==
+
+          def hash
+            self.class.hash ^ name.hash ^ variance.hash ^ skip_validation.hash
           end
         end
 
@@ -40,10 +55,10 @@ module RBS
           params.find {|p| p.name == name }
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             params: params
-          }.to_json(*a)
+          }.to_json(state)
         end
 
         def each(&block)
@@ -80,7 +95,7 @@ module RBS
           ModuleTypeParams.new().tap do |params|
             names.each.with_index do |new_name, index|
               param = self.params[index]
-              params.add(TypeParam.new(name: new_name, variance: param.variance, skip_validation: param.skip_validation))
+              params.add(TypeParam.new(name: new_name, variance: param.variance, skip_validation: param.skip_validation, location: param.location))
             end
           end
         end
@@ -154,12 +169,12 @@ module RBS
             self.class.hash ^ name.hash ^ args.hash
           end
 
-          def to_json(*a)
+          def to_json(state = _ = nil)
             {
               name: name,
               args: args,
               location: location
-            }.to_json(*a)
+            }.to_json(state)
           end
         end
 
@@ -198,7 +213,7 @@ module RBS
           self.class.hash ^ name.hash ^ type_params.hash ^ super_class.hash ^ members.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             declaration: :class,
             name: name,
@@ -208,7 +223,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -234,12 +249,12 @@ module RBS
             self.class.hash ^ name.hash ^ args.hash ^ location.hash
           end
 
-          def to_json(*a)
+          def to_json(state = _ = nil)
             {
               name: name,
               args: args,
               location: location
-            }.to_json(*a)
+            }.to_json(state)
           end
 
           def to_s
@@ -286,7 +301,7 @@ module RBS
           self.class.hash ^ name.hash ^ type_params.hash ^ self_types.hash ^ members.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             declaration: :module,
             name: name,
@@ -296,7 +311,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -332,7 +347,7 @@ module RBS
           self.class.hash ^ type_params.hash ^ members.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             declaration: :interface,
             name: name,
@@ -341,7 +356,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -372,7 +387,7 @@ module RBS
           self.class.hash ^ name.hash ^ type.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             declaration: :alias,
             name: name,
@@ -380,7 +395,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -409,14 +424,14 @@ module RBS
           self.class.hash ^ name.hash ^ type.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             declaration: :constant,
             name: name,
             type: type,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -445,14 +460,14 @@ module RBS
           self.class.hash ^ name.hash ^ type.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             declaration: :global,
             name: name,
             type: type,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
     end

data/lib/rbs/ast/members.rb

@@ -61,7 +61,7 @@ module RBS
           )
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :method_definition,
             kind: kind,
@@ -70,7 +70,7 @@ module RBS
             location: location,
             comment: comment,
             overload: overload
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -101,42 +101,42 @@ module RBS
       class InstanceVariable < Base
         include Var
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :instance_variable,
             name: name,
             type: type,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
       class ClassInstanceVariable < Base
         include Var
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :class_instance_variable,
             name: name,
             type: type,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
       class ClassVariable < Base
         include Var
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :class_variable,
             name: name,
             type: type,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -171,7 +171,7 @@ module RBS
       class Include < Base
         include Mixin
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :include,
             name: name,
@@ -179,14 +179,14 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
       class Extend < Base
         include Mixin
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :extend,
             name: name,
@@ -194,14 +194,14 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
       class Prepend < Base
         include Mixin
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :prepend,
             name: name,
@@ -209,7 +209,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -263,7 +263,7 @@ module RBS
       class AttrReader < Base
         include Attribute
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :attr_reader,
             name: name,
@@ -273,14 +273,14 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
       class AttrAccessor < Base
         include Attribute
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :attr_accessor,
             name: name,
@@ -290,14 +290,14 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
       class AttrWriter < Base
         include Attribute
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :attr_writer,
             name: name,
@@ -307,7 +307,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
       end
 
@@ -332,16 +332,16 @@ module RBS
       class Public < Base
         include LocationOnly
 
-        def to_json(*a)
-          { member: :public, location: location }.to_json(*a)
+        def to_json(state = _ = nil)
+          { member: :public, location: location }.to_json(state)
         end
       end
 
       class Private < Base
         include LocationOnly
 
-        def to_json(*a)
-          { member: :private, location: location }.to_json(*a)
+        def to_json(state = _ = nil)
+          { member: :private, location: location }.to_json(state)
         end
       end
 
@@ -375,7 +375,7 @@ module RBS
           self.class.hash ^ new_name.hash ^ old_name.hash ^ kind.hash
         end
 
-        def to_json(*a)
+        def to_json(state = _ = nil)
           {
             member: :alias,
             new_name: new_name,
@@ -384,7 +384,7 @@ module RBS
             annotations: annotations,
             location: location,
             comment: comment
-          }.to_json(*a)
+          }.to_json(state)
         end
 
         def instance?

data/lib/rbs/cli.rb

@@ -816,9 +816,12 @@ EOB
         'RBS_TEST_TARGET' => (targets.join(',') unless targets.empty?)
       }
 
+      # @type var out: String
+      # @type var err: String
       out, err, status = Open3.capture3(env_hash, *args)
       stdout.print(out)
       stderr.print(err)
+
       status
     end
   end

data/lib/rbs/constant_table.rb

@@ -56,7 +56,10 @@ module RBS
                         name_to_constant(TypeName.new(name: head, namespace: Namespace.root))
                       else
                         resolve_constant_reference_context(head, context: context) ||
-                          resolve_constant_reference_inherit(head, scopes: constant_scopes(context.first.to_type_name))
+                          context.first.yield_self do |first_contet|
+                            raise unless first_contet
+                            resolve_constant_reference_inherit(head, scopes: constant_scopes(first_contet.to_type_name))
+                          end
                       end
 
       tail.inject(head_constant) do |constant, name|

data/lib/rbs/definition.rb

@@ -122,7 +122,7 @@ module RBS
       end
 
       def annotations
-        @annotations ||= @extra_annotations + defs.flat_map(&:annotations)
+        @annotations ||= @extra_annotations + defs.flat_map {|d| d.annotations }
       end
 
       def members

data/lib/rbs/definition_builder.rb

@@ -746,6 +746,20 @@ module RBS
                               end
             )
           end
+
+          defs = method.defs.map do |defn|
+            defn.update(
+              type: sub.empty? ? defn.type : defn.type.sub(sub),
+              implemented_in: case implemented_in
+                              when :keep
+                                defn.implemented_in
+                              when nil
+                                nil
+                              else
+                                implemented_in
+                              end
+            )
+          end
         end
 
         super_method = methods[name]

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -508,6 +508,7 @@ module RBS
         included_interfaces = one_ancestors.included_interfaces or raise
         included_interfaces.each do |a|
           included_ancestors = interface_ancestors(a.name, building_ancestors: building_ancestors)
+
           ancestors.unshift(*included_ancestors.apply(a.args, location: entry.decl.location))
         end