Merge pull request #13 from ruby/anonymous_class_doc

Fix anonymous class doc_namespace to use named superclass

Author: tompng

lib/repl_type_completor/result.rb

@@ -139,29 +139,37 @@ def method_doc(type, name)
       type = type.types.find { _1.all_methods.include? name.to_sym }
       case type
       when Types::SingletonType
-        "#{Types.class_name_of(type.module_or_class)}.#{name}"
+        "#{doc_class_module_name(type.module_or_class)}.#{name}"
       when Types::InstanceType
-        "#{Types.class_name_of(type.klass)}##{name}"
+        "#{doc_class_module_name(type.klass)}##{name}"
       end
     end
 
     def call_or_const_doc(type, name)
       if name =~ /\A[A-Z]/
         type = type.types.grep(Types::SingletonType).find { _1.module_or_class.const_defined?(name) }
-        type.module_or_class == Object ? name : "#{Types.class_name_of(type.module_or_class)}::#{name}" if type
+        type.module_or_class == Object ? name : "#{doc_class_module_name(type.module_or_class)}::#{name}" if type
       else
         method_doc(type, name)
       end
     end
 
+    def doc_class_module_name(module_or_class)
+      if Class === module_or_class
+        Types.class_name_of(module_or_class)
+      else
+        Methods::MODULE_NAME_METHOD.bind_call(module_or_class) || 'Module'
+      end
+    end
+
     def value_doc(type)
       return unless type
       type.types.each do |t|
         case t
         when Types::SingletonType
-          return Types.class_name_of(t.module_or_class)
+          return doc_class_module_name(t.module_or_class)
         when Types::InstanceType
-          return Types.class_name_of(t.klass)
+          return doc_class_module_name(t.klass)
         end
       end
       nil

lib/repl_type_completor/types.rb

@@ -53,8 +53,12 @@ def self.load_rbs_builder
     end
 
     def self.class_name_of(klass)
-      klass = klass.superclass if klass.singleton_class?
-      Methods::MODULE_NAME_METHOD.bind_call klass
+      while true
+        name = Methods::MODULE_NAME_METHOD.bind_call klass
+        return name if name
+
+        klass = klass.superclass
+      end
     end
 
     if RBS::TypeName.respond_to?(:parse) # RBS >= 3.8.0
@@ -69,9 +73,11 @@ def self.rbs_absolute_type_name(name)
     end
 
     def self.rbs_search_method(klass, method_name, singleton)
+      return unless rbs_builder
+
       klass.ancestors.each do |ancestor|
-        name = class_name_of ancestor
-        next unless name && rbs_builder
+        next unless (name = Methods::MODULE_NAME_METHOD.bind_call(ancestor))
+
         type_name = rbs_absolute_type_name(name)
         definition = (singleton ? rbs_builder.build_singleton(type_name) : rbs_builder.build_instance(type_name)) rescue nil
         method = definition.methods[method_name] if definition
@@ -219,9 +225,9 @@ def types() = [self]
       def nillable?() = (@klass == NilClass)
       def nonnillable() = self
       def rbs_methods
-        name = Types.class_name_of(@klass)
-        return {} unless name && Types.rbs_builder
+        return {} unless Types.rbs_builder
 
+        name = Types.class_name_of(@klass)
         type_name = Types.rbs_absolute_type_name(name)
         Types.rbs_builder.build_instance(type_name).methods rescue {}
       end

test/repl_type_completor/test_repl_type_completor.rb

@@ -183,6 +183,20 @@ def bo.foo; end
       end
     end
 
+    def test_anonymous_class
+      bind = eval('c = Struct.new(:foobar); o = c.new; binding')
+      assert_completion('c.', binding: bind, include: ['ancestors', 'singleton_class?', 'superclass'])
+      assert_completion('o.', binding: bind, include: ['foobar', 'each_pair'])
+      assert_doc_namespace('c.superclass', 'Struct.superclass', binding: bind)
+      assert_doc_namespace('o.each', 'Struct#each', binding: bind)
+    end
+
+    def test_anonymous_module
+      bind = eval('m = Module.new; binding')
+      assert_completion('m.', binding: bind, include: ['ancestors', 'singleton_class?'], exclude: 'superclass')
+      assert_doc_namespace('m.ancestors', 'Module.ancestors', binding: bind)
+    end
+
     DEPRECATED_CONST = 1
     deprecate_constant :DEPRECATED_CONST
     def test_deprecated_const_without_warning