Update DefinitionBuilder

Author: soutaro

lib/rbs/definition_builder.rb

@@ -606,7 +606,7 @@ def import_methods(definition, module_name, module_methods, interfaces_methods,
 
         methods.each do |method|
           if interface_method_duplicates.include?(method.name)
-            member.is_a?(AST::Members::Include) || member.is_a?(AST::Members::Extend) or raise
+            (member.is_a?(AST::Members::Include) || member.is_a?(AST::Members::Extend)) or raise
 
             raise DuplicatedInterfaceMethodDefinitionError.new(
               type: definition.self_type,

lib/rbs/definition_builder/ancestor_builder.rb

@@ -537,7 +537,7 @@ def instance_ancestors(type_name, building_ancestors: [])
           included_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod.source.is_a?(AST::Members::Include) or raise
+            (mod.source.is_a?(AST::Members::Include) || mod.source.is_a?(AST::Ruby::Members::IncludeMember)) or raise
             mod_ancestors =
               instance_ancestors(name, building_ancestors: building_ancestors)
                 .apply(arg_types, env: env, location: mod.source.location)
@@ -552,7 +552,7 @@ def instance_ancestors(type_name, building_ancestors: [])
           prepended_modules.each do |mod|
             name = mod.name
             arg_types = mod.args
-            mod.source.is_a?(AST::Members::Prepend) or raise
+            (mod.source.is_a?(AST::Members::Prepend) || mod.source.is_a?(AST::Ruby::Members::PrependMember)) or raise
             mod_ancestors =
               instance_ancestors(name, building_ancestors: building_ancestors)
                 .apply(arg_types, env: env, location: mod.source.location)
@@ -607,7 +607,7 @@ def singleton_ancestors(type_name, building_ancestors: [])
         extended_modules.each do |mod|
           name = mod.name
           args = mod.args
-          mod.source.is_a?(AST::Members::Extend) or raise
+          (mod.source.is_a?(AST::Members::Extend) || mod.source.is_a?(AST::Ruby::Members::ExtendMember)) or raise
           mod_ancestors =
             instance_ancestors(name, building_ancestors: building_ancestors)
               .apply(args, env: env, location: mod.source.location)

test/rbs/ancestor_builder_test.rb

@@ -1295,4 +1295,43 @@ class TestPrependClass
       end
     end
   end
+
+  def test__ruby__invalid_ancestor_args
+    SignatureManager.new do |manager|
+      manager.files[Pathname("foo.rbs")] = <<-EOF
+module X
+end
+      EOF
+
+      manager.ruby_files[Pathname("lib/test.rb")] = <<-RUBY
+class A
+  include X #[bool]
+end
+
+class B
+  extend X #[untyped]
+end
+
+class C
+  prepend X #[void]
+end
+      RUBY
+
+      manager.build do |env|
+        builder = DefinitionBuilder::AncestorBuilder.new(env: env)
+
+        assert_raises InvalidTypeApplicationError do
+          builder.instance_ancestors(type_name("::A"))
+        end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.singleton_ancestors(type_name("::B"))
+        end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.instance_ancestors(type_name("::C"))
+        end
+      end
+    end
+  end
 end

test/rbs/definition_builder_test.rb

@@ -3253,4 +3253,59 @@ def hello(x) = 123
       end
     end
   end
+
+  def test_ruby_mixin_members
+    SignatureManager.new do |manager|
+      manager.files[Pathname("modules.rbs")] = <<EOF
+module M1[T]
+  def m1_method: [U] () { (T) -> U } -> Hash[T, U]
+end
+
+module M2
+  def m2_method: (untyped) -> bool
+end
+
+module M3
+  def m3_method: () -> String
+end
+EOF
+
+      manager.add_ruby_file("mixin_test.rb", <<~RUBY)
+        class A
+          include M1 #[String]
+          extend M2
+          prepend M3
+        end
+      RUBY
+
+      manager.build do |env|
+        builder = DefinitionBuilder.new(env: env)
+
+        builder.build_instance(type_name("::A")).tap do |definition|
+          # Test include: should have m1_method from M1[String]
+          definition.methods[:m1_method].tap do |method|
+            assert_equal type_name("::M1"), method.defined_in
+            assert_equal type_name("::M1"), method.implemented_in
+            assert_equal [parse_method_type("[U] () { (::String) -> U } -> ::Hash[::String, U]")], method.method_types
+          end
+
+          # Test prepend: should have m3_method from M3
+          definition.methods[:m3_method].tap do |method|
+            assert_equal type_name("::M3"), method.defined_in
+            assert_equal type_name("::M3"), method.implemented_in
+            assert_equal [parse_method_type("() -> ::String")], method.method_types
+          end
+        end
+
+        builder.build_singleton(type_name("::A")).tap do |definition|
+          # Test extend: should have m2_method from M2
+          definition.methods[:m2_method].tap do |method|
+            assert_equal type_name("::M2"), method.defined_in
+            assert_equal type_name("::M2"), method.implemented_in
+            assert_equal [parse_method_type("(untyped) -> bool")], method.method_types
+          end
+        end
+      end
+    end
+  end
 end