Merge pull request #2289 from ksss/validate-super-self_type

Validate superclass and module-self-type

Author: ksss

lib/rbs/definition_builder/ancestor_builder.rb

@@ -217,6 +217,7 @@ def one_instance_ancestors(type_name)
             NoSuperclassFoundError.check!(super_name, env: env, location: primary.decl.location)
             if super_class
               InheritModuleError.check!(super_class, env: env)
+              InvalidTypeApplicationError.check2!(type_name: super_class.name, args: super_class.args, env: env, location: super_class.location)
             end
 
             super_entry = env.normalized_class_entry(super_name) or raise
@@ -243,6 +244,7 @@ def one_instance_ancestors(type_name)
           else
             entry.self_types.each do |module_self|
               NoSelfTypeFoundError.check!(module_self, env: env)
+              InvalidTypeApplicationError.check2!(type_name: module_self.name, args: module_self.args, env: env, location: module_self.location)
 
               module_name = module_self.name
               if module_name.class?

test/rbs/ancestor_builder_test.rb

@@ -665,7 +665,18 @@ class B < Y[Integer, void]
 class C
   extend X
 end
+
+class D
+end
+
+class E < D[Integer]
+end
+
+module F : D[Integer]
+end
 EOF
+
+
       manager.build do |env|
         builder = DefinitionBuilder::AncestorBuilder.new(env: env)
 
@@ -680,6 +691,14 @@ class C
         assert_raises InvalidTypeApplicationError do
           builder.singleton_ancestors(type_name("::C"))
         end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.instance_ancestors(type_name("::E"))
+        end
+
+        assert_raises InvalidTypeApplicationError do
+          builder.instance_ancestors(type_name("::F"))
+        end
       end
     end
   end