Merge pull request #2542 from ksss/fix-prototype-todo

[prototype runtime] Find redefined methods

Author: ksss

lib/rbs/prototype/runtime.rb

@@ -27,6 +27,10 @@ def skip_singleton_method?(module_name:, method:, accessibility:)
           method_definition = @builder.build_singleton(module_name.absolute!).methods[method.name]
           return false unless method_definition
 
+          return false unless method_definition.defs.any? do |type_def|
+            type_def.implemented_in&.relative!.to_s == method.owner.to_s.delete_prefix("#<Class:").delete_suffix(">")
+          end
+
           method_definition.accessibility == accessibility
         end
 
@@ -36,6 +40,10 @@ def skip_instance_method?(module_name:, method:, accessibility:)
           method_definition = @builder.build_instance(module_name.absolute!).methods[method.name]
           return false unless method_definition
 
+          return false unless method_definition.defs.any? do |type_def|
+            type_def.implemented_in&.relative!.to_s == method.owner.to_s
+          end
+
           method_definition.accessibility == accessibility
         end
 

test/rbs/runtime_prototype_test.rb

@@ -584,13 +584,21 @@ def self.singleton_todo; end
 
     CONST_DEFINED = 1
     CONST_TODO = 1
+
+    def self.singleton_inherited; end
+    def public_inherited; end
   end
 
   module TodoModule
     def public_defined; end
     def public_todo; end
   end
 
+  class InheritedTodoClass < TodoClass
+    def self.singleton_inherited; end
+    def public_inherited; end
+  end
+
   def test_todo
     SignatureManager.new do |manager|
       manager.files[Pathname("foo.rbs")] = <<~RBS
@@ -605,10 +613,14 @@ def public_defined: () -> void
               def self.singleton_defined: () -> void
               def accessibility_mismatch: () -> void
               CONST_DEFINED: Integer
+              def self.singleton_inherited: () -> void
+              def public_inherited: () -> void
             end
             module TodoModule
               def public_defined: () -> void
             end
+            class InheritedTodoClass < TodoClass
+            end
           end
         end
       RBS
@@ -647,6 +659,19 @@ def public_todo: () -> untyped
             end
           end
         RBS
+
+        p = Runtime.new(patterns: ["RBS::RuntimePrototypeTest::InheritedTodoClass"], env: env, merge: false, todo: true)
+        assert_write p.decls, <<~RBS
+          module RBS
+            class RuntimePrototypeTest < ::Test::Unit::TestCase
+              class InheritedTodoClass < ::RBS::RuntimePrototypeTest::TodoClass
+                def self.singleton_inherited: () -> untyped
+
+                def public_inherited: () -> untyped
+              end
+            end
+          end
+        RBS
       end
     end
   end