From f24b13d0209b437be2d2a7e5df2cc89c9cc59e7d Mon Sep 17 00:00:00 2001
From: Rene Saarsoo <nene@triin.net>
Date: Mon, 1 Oct 2012 11:50:59 -0700
Subject: [PATCH] Fix inheriting from other member types.

Only turn properties into configs when dealing with autodetected members.
---
 lib/jsduck/inherit_doc.rb          |  2 +-
 spec/aggregator_inheritdoc_spec.rb | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lib/jsduck/inherit_doc.rb b/lib/jsduck/inherit_doc.rb
index 38594090..9cb0c345 100644
--- a/lib/jsduck/inherit_doc.rb
+++ b/lib/jsduck/inherit_doc.rb
@@ -40,7 +40,7 @@ module JsDuck
         end
 
         # remember properties that have changed to configs
-        if m[:tagname] != parent[:tagname]
+        if m[:autodetected] && m[:tagname] != parent[:tagname]
           new_cfgs << m
         end
       end
diff --git a/spec/aggregator_inheritdoc_spec.rb b/spec/aggregator_inheritdoc_spec.rb
index b397c18d..6f07caa4 100644
--- a/spec/aggregator_inheritdoc_spec.rb
+++ b/spec/aggregator_inheritdoc_spec.rb
@@ -218,6 +218,33 @@ describe JsDuck::Aggregator do
     it_behaves_like "@inheritdoc"
   end
 
+  describe "using @inheritdoc to inherit from another type of member" do
+    before do
+      @docs = parse(<<-EOF)
+        /** @class Foo */
+          /**
+           * @method bar
+           * Original comment.
+           */
+
+        /** @class Core */
+          /**
+           * @event foobar
+           * New comment.
+           * @inheritdoc Foo#method-bar
+           */
+      EOF
+      @orig = @docs["Foo"][:members][0]
+      @inheritdoc = @docs["Core"][:members][0]
+    end
+
+    it_behaves_like "@inheritdoc"
+
+    it "keeps the type of the member" do
+      @inheritdoc[:tagname].should == :event
+    end
+  end
+
   describe "@inheritdoc without type info uses the type of itself" do
     before do
       @docs = parse(<<-EOF)
-- 
GitLab