Merge pull request #2615 from ruby/fix-type-app-validation

Validate type args given to non-generic ancestor

Author: soutaro

lib/rbs/ast/type_param.rb

@@ -196,7 +196,7 @@ def self.application(params, args)
       end
 
       def self.normalize_args(params, args)
-        app = application(params, args) or return []
+        app = application(params, args) or return args
 
         min_count = params.count { _1.default_type.nil? }
         unless min_count <= args.size && args.size <= params.size

test/rbs/ancestor_builder_test.rb

@@ -703,6 +703,61 @@ module F : D[Integer]
     end
   end
 
+  def test_invalid_ancestor_args
+    SignatureManager.new do |manager|
+      manager.files[Pathname("foo.rbs")] = <<EOF
+module X
+end
+
+class Y
+end
+
+class A < Y[top]
+end
+
+class B
+  include X[bool]
+end
+
+class C
+  extend X[untyped]
+end
+
+class D
+  prepend X[void]
+end
+
+module E : X[untyped]
+end
+EOF
+
+
+      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.instance_ancestors(type_name("::B"))
+        end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.singleton_ancestors(type_name("::C"))
+        end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.instance_ancestors(type_name("::D"))
+        end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.instance_ancestors(type_name("::E"))
+        end
+      end
+    end
+  end
+
   def test_invalid_mixin_include
     SignatureManager.new do |manager|
       manager.files[Pathname("foo.rbs")] = <<EOF