rbs 2.8.4 → 3.8.1

data/lib/rbs/definition_builder/ancestor_builder.rb

@@ -190,6 +190,8 @@ module RBS
       end
 
       def one_instance_ancestors(type_name)
+        type_name = env.normalize_module_name(type_name)
+
         as = one_instance_ancestors_cache[type_name] and return as
 
         entry = env.class_decls[type_name] or raise "Unknown name for one_instance_ancestors: #{type_name}"
@@ -207,14 +209,19 @@ module RBS
               super_args = super_class.args
             else
               super_name = BuiltinNames::Object.name
-              super_args = []
+              super_args = [] #: Array[Types::t]
             end
 
+            super_name = env.normalize_module_name(super_name)
+
             NoSuperclassFoundError.check!(super_name, env: env, location: primary.decl.location)
             if super_class
               InheritModuleError.check!(super_class, env: env)
             end
 
+            super_entry = env.normalized_class_entry(super_name) or raise
+            super_args = AST::TypeParam.normalize_args(super_entry.type_params, super_args)
+
             ancestors = OneAncestors.class_instance(
               type_name: type_name,
               params: params,
@@ -236,7 +243,20 @@ module RBS
           else
             entry.self_types.each do |module_self|
               NoSelfTypeFoundError.check!(module_self, env: env)
-              self_types.push Definition::Ancestor::Instance.new(name: module_self.name, args: module_self.args, source: module_self)
+
+              module_name = module_self.name
+              if module_name.class?
+                module_entry = env.normalized_module_class_entry(module_name) or raise
+                module_name = module_entry.name
+                self_args = AST::TypeParam.normalize_args(module_entry.type_params, module_self.args)
+              end
+              if module_name.interface?
+                interface_entry = env.interface_decls.fetch(module_name)
+                self_args = AST::TypeParam.normalize_args(interface_entry.decl.type_params, module_self.args)
+              end
+              self_args or raise
+
+              self_types.push Definition::Ancestor::Instance.new(name: module_name, args: self_args, source: module_self)
             end
           end
         end
@@ -253,6 +273,7 @@ module RBS
       end
 
       def one_singleton_ancestors(type_name)
+        type_name = env.normalize_module_name(type_name)
         as = one_singleton_ancestors_cache[type_name] and return as
 
         entry = env.class_decls[type_name] or raise "Unknown name for one_singleton_ancestors: #{type_name}"
@@ -270,6 +291,8 @@ module RBS
               super_name = BuiltinNames::Object.name
             end
 
+            super_name = env.normalize_module_name(super_name)
+
             NoSuperclassFoundError.check!(super_name, env: env, location: primary.decl.location)
             if super_class
               InheritModuleError.check!(super_class, env: env)
@@ -328,16 +351,24 @@ module RBS
           when AST::Members::Include
             module_name = member.name
             module_args = member.args.map {|type| align_params ? type.sub(align_params) : type }
-            ancestor = Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
 
             case
             when member.name.class? && included_modules
               MixinClassError.check!(type_name: type_name, env: env, member: member)
               NoMixinFoundError.check!(member.name, env: env, member: member)
-              included_modules << ancestor
+
+              module_decl = env.normalized_module_entry(module_name) or raise
+              module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
+
+              module_name = env.normalize_module_name(module_name)
+              included_modules << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
             when member.name.interface? && included_interfaces
               NoMixinFoundError.check!(member.name, env: env, member: member)
-              included_interfaces << ancestor
+
+              interface_decl = env.interface_decls.fetch(module_name)
+              module_args = AST::TypeParam.normalize_args(interface_decl.decl.type_params, module_args)
+
+              included_interfaces << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
             end
 
           when AST::Members::Prepend
@@ -345,8 +376,11 @@ module RBS
               MixinClassError.check!(type_name: type_name, env: env, member: member)
               NoMixinFoundError.check!(member.name, env: env, member: member)
 
-              module_name = member.name
+              module_decl = env.normalized_module_entry(member.name) or raise
+              module_name = module_decl.name
+
               module_args = member.args.map {|type| align_params ? type.sub(align_params) : type }
+              module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
 
               prepended_modules << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
             end
@@ -354,16 +388,24 @@ module RBS
           when AST::Members::Extend
             module_name = member.name
             module_args = member.args
-            ancestor = Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
 
             case
             when member.name.class? && extended_modules
               MixinClassError.check!(type_name: type_name, env: env, member: member)
               NoMixinFoundError.check!(member.name, env: env, member: member)
-              extended_modules << ancestor
+
+              module_decl = env.normalized_module_entry(module_name) or raise
+              module_args = AST::TypeParam.normalize_args(module_decl.type_params, module_args)
+
+              module_name = env.normalize_module_name(module_name)
+              extended_modules << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
             when member.name.interface? && extended_interfaces
               NoMixinFoundError.check!(member.name, env: env, member: member)
-              extended_interfaces << ancestor
+
+              interface_decl = env.interface_decls.fetch(module_name)
+              module_args = AST::TypeParam.normalize_args(interface_decl.decl.type_params, module_args)
+
+              extended_interfaces << Definition::Ancestor::Instance.new(name: module_name, args: module_args, source: member)
             end
           end
         end
@@ -416,8 +458,11 @@ module RBS
             super_name = super_class.name
             super_args = super_class.args
 
-            super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors)
-            ancestors.unshift(*super_ancestors.apply(super_args, location: entry.primary.decl.location))
+            super_ancestors =
+              instance_ancestors(super_name, building_ancestors: building_ancestors)
+                .apply(super_args, env: env, location: entry.primary.decl.super_class&.location)
+            super_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: super_name, source: :super) }
+            ancestors.unshift(*super_ancestors)
           end
         end
 
@@ -434,8 +479,12 @@ module RBS
           included_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors)
-            ancestors.unshift(*mod_ancestors.apply(arg_types, location: entry.primary.decl.location))
+            mod.source.is_a?(AST::Members::Include) or raise
+            mod_ancestors =
+              instance_ancestors(name, building_ancestors: building_ancestors)
+                .apply(arg_types, env: env, location: mod.source.location)
+            mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
+            ancestors.unshift(*mod_ancestors)
           end
         end
 
@@ -445,8 +494,12 @@ module RBS
           prepended_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors)
-            ancestors.unshift(*mod_ancestors.apply(arg_types, location: entry.primary.decl.location))
+            mod.source.is_a?(AST::Members::Prepend) or raise
+            mod_ancestors =
+              instance_ancestors(name, building_ancestors: building_ancestors)
+                .apply(arg_types, env: env, location: mod.source.location)
+            mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
+            ancestors.unshift(*mod_ancestors)
           end
         end
 
@@ -472,15 +525,18 @@ module RBS
 
         one_ancestors = one_singleton_ancestors(type_name)
 
-        ancestors = []
+        ancestors = [] #: Array[Definition::Ancestor::t]
 
         case super_class = one_ancestors.super_class
         when Definition::Ancestor::Instance
           super_name = super_class.name
           super_args = super_class.args
 
-          super_ancestors = instance_ancestors(super_name, building_ancestors: building_ancestors)
-          ancestors.unshift(*super_ancestors.apply(super_args, location: entry.primary.decl.location))
+          super_ancestors =
+            instance_ancestors(super_name, building_ancestors: building_ancestors)
+              .apply(super_args, env: env, location: nil)
+          super_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: super_name, source: :super) }
+          ancestors.unshift(*super_ancestors)
 
         when Definition::Ancestor::Singleton
           super_name = super_class.name
@@ -493,8 +549,12 @@ module RBS
         extended_modules.each do |mod|
           name = mod.name
           args = mod.args
-          mod_ancestors = instance_ancestors(name, building_ancestors: building_ancestors)
-          ancestors.unshift(*mod_ancestors.apply(args, location: entry.primary.decl.location))
+          mod.source.is_a?(AST::Members::Extend) or raise
+          mod_ancestors =
+            instance_ancestors(name, building_ancestors: building_ancestors)
+              .apply(args, env: env, location: mod.source.location)
+          mod_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: name, source: mod.source) }
+          ancestors.unshift(*mod_ancestors)
         end
 
         ancestors.unshift(self_ancestor)
@@ -521,13 +581,16 @@ module RBS
         building_ancestors.push self_ancestor
 
         one_ancestors = one_interface_ancestors(type_name)
-        ancestors = []
+        ancestors = [] #: Array[Definition::Ancestor::t]
 
         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))
+          a.source.is_a?(AST::Members::Include) or raise
+          included_ancestors =
+            interface_ancestors(a.name, building_ancestors: building_ancestors)
+              .apply(a.args, env: env, location: a.source.location)
+          included_ancestors.map! {|ancestor| fill_ancestor_source(ancestor, name: a.name, source: a.source) }
+          ancestors.unshift(*included_ancestors)
         end
 
         ancestors.unshift(self_ancestor)
@@ -539,6 +602,19 @@ module RBS
           ancestors: ancestors
         )
       end
+
+      def fill_ancestor_source(ancestor, name:, source:, &block)
+        case ancestor
+        when Definition::Ancestor::Instance
+          if ancestor.name == name && !ancestor.source
+            Definition::Ancestor::Instance.new(name: ancestor.name, args: ancestor.args, source: source)
+          else
+            ancestor
+          end
+        else
+          ancestor
+        end
+      end
     end
   end
 end

data/lib/rbs/definition_builder/method_builder.rb

@@ -4,7 +4,7 @@ module RBS
   class DefinitionBuilder
     class MethodBuilder
       class Methods
-        Definition = _ = Struct.new(:name, :type, :originals, :overloads, :accessibilities, keyword_init: true) do
+        class Definition < Struct.new(:name, :type, :originals, :overloads, :accessibilities, keyword_init: true)
           # @implements Definition
 
           def original
@@ -113,14 +113,14 @@ module RBS
                       build_method(
                         methods,
                         type,
-                        member: member.update(types: member.types.map {|type| type.sub(subst) }),
+                        member: member.update(overloads: member.overloads.map {|overload| overload.sub(subst) }),
                         accessibility: member.visibility || accessibility
                       )
                     when :singleton_instance
                       build_method(
                         methods,
                         type,
-                        member: member.update(types: member.types.map {|type| type.sub(subst) }),
+                        member: member.update(overloads: member.overloads.map {|overload| overload.sub(subst) }),
                         accessibility: :private
                       )
                     end
@@ -215,7 +215,7 @@ module RBS
       def build_method(methods, type, member:, accessibility:)
         defn = methods.methods[member.name] ||= Methods::Definition.empty(type: type, name: member.name)
 
-        if member.overload?
+        if member.overloading?
           defn.overloads << member
         else
           defn.accessibilities << accessibility