lib/rbs/definition_builder.rb in rbs-3.0.4 vs lib/rbs/definition_builder.rb in rbs-3.1.0

@@ -237,27 +237,24 @@
             definition.methods.merge!(defn.methods)
             definition.instance_variables.merge!(defn.instance_variables)
             definition.class_variables.merge!(defn.class_variables)
           end
 
-          all_interfaces = one_ancestors.each_extended_interface.flat_map do |interface|
-            other_interfaces = ancestor_builder.interface_ancestors(interface.name).ancestors #: Array[Definition::Ancestor::Instance]
-            other_interfaces = other_interfaces.select {|ancestor| ancestor.source }
-            [interface, *other_interfaces]
-          end
-          interface_methods = interface_methods(all_interfaces)
-          import_methods(definition, type_name, methods, interface_methods, Substitution.new)
-
           one_ancestors.each_extended_module do |mod|
             mod.args.each do |arg|
               validate_type_presence(arg)
             end
 
             subst = tapp_subst(mod.name, mod.args)
             define_instance(definition, mod.name, subst)
           end
 
-          interface_methods = interface_methods(one_ancestors.each_extended_interface.to_a)
+          all_interfaces = one_ancestors.each_extended_interface.flat_map do |interface|
+            other_interfaces = ancestor_builder.interface_ancestors(interface.name).ancestors #: Array[Definition::Ancestor::Instance]
+            other_interfaces = other_interfaces.select {|ancestor| ancestor.source }
+            [interface, *other_interfaces]
+          end
+          interface_methods = interface_methods(all_interfaces)
           import_methods(definition, type_name, methods, interface_methods, Substitution.new)
 
           entry.decls.each do |d|
             d.decl.members.each do |member|
               case member