Fix class/module alias document having wrong name

Stop aliased class/module document file overwrite original one.
Fix aliasing-to-toplevel check.

Author: tompng

lib/rdoc/code_object/class_module.rb

@@ -807,11 +807,13 @@ def update_aliases
       cm_alias = cm.dup
       cm_alias.name = const.name
 
-      # Don't move top-level aliases under Object, they look ugly there
-      unless RDoc::TopLevel === cm_alias.parent then
+      if full_name == 'Object'
+        # Don't move top-level aliases under Object, they look ugly there
+        cm_alias.parent = top_level
+      else
         cm_alias.parent = self
-        cm_alias.full_name = nil # force update for new parent
       end
+      cm_alias.full_name = nil # force update for new parent
 
       cm_alias.aliases.clear
       cm_alias.is_alias_for = cm

lib/rdoc/generator/darkfish.rb

@@ -322,6 +322,10 @@ def generate_class(klass, template_file = nil)
 
     debug_msg "  working on %s (%s)" % [klass.full_name, klass.path]
     out_file   = @outputdir + klass.path
+
+    # If klass is an alias, out_file is already generated by the original class/module
+    return if klass.is_alias_for
+
     rel_prefix = @outputdir.relative_path_from out_file.dirname
     search_index_rel_prefix = rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output

test/rdoc/generator/darkfish_test.rb

@@ -297,11 +297,13 @@ def test_install_rdoc_static_file_missing
   def test_setup
     @g.setup
 
-    assert_equal [@klass_alias, @ignored, @klass, @object],
+    assert_equal %w[Ignored Klass Klass::A Object],
+                 [@ignored, @klass, @klass_alias, @object].map(&:full_name)
+    assert_equal [@ignored, @klass, @klass_alias, @object],
                  @g.classes.sort_by { |klass| klass.full_name }
     assert_equal [@top_level],                           @g.files
     assert_equal [@meth, @meth, @meth_bang, @meth_bang, @meth_with_html_tag_yield, @meth_with_html_tag_yield], @g.methods
-    assert_equal [@klass_alias, @klass, @object], @g.modsort
+    assert_equal [@klass, @klass_alias, @object], @g.modsort
   end
 
   def test_template_for
@@ -338,7 +340,7 @@ def test_generated_method_with_html_tag_yield
 
     @g.generate
 
-    path = File.join @tmpdir, 'A.html'
+    path = File.join @tmpdir, 'Klass.html'
 
     f = open(path)
     internal_file = f.read