From 29e3d021f0e822bb8fbb5e8ccb6c417d46a24f5e Mon Sep 17 00:00:00 2001
From: Rene Saarsoo <nene@triin.net>
Date: Mon, 14 Jan 2013 19:53:00 +0200
Subject: [PATCH] Move method name detection to Tag::Method.

Also the @constructor plays part in determining the name.
To make the two work together inspect the hash passed in to #process_doc
and only set the method name when needed.
---
 lib/jsduck/doc/ast.rb         | 8 +-------
 lib/jsduck/tag/constructor.rb | 7 +++++++
 lib/jsduck/tag/method.rb      | 7 +++++++
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/jsduck/doc/ast.rb b/lib/jsduck/doc/ast.rb
index d1fd0d08..9079969b 100644
--- a/lib/jsduck/doc/ast.rb
+++ b/lib/jsduck/doc/ast.rb
@@ -49,7 +49,6 @@ module JsDuck
       def create_method(docs, doc_map)
         return add_shared({
             :tagname => :method,
-            :name => detect_name(:method, doc_map),
             :doc => detect_doc(docs),
             :params => detect_params(doc_map),
             :return => detect_return(doc_map),
@@ -120,12 +119,7 @@ module JsDuck
       end
 
       def detect_name(tagname, doc_map)
-        name = extract(doc_map, tagname, :name)
-        if name
-          name
-        else
-          doc_map[:constructor] ? "constructor" : nil
-        end
+        extract(doc_map, tagname, :name)
       end
 
       def extract(doc_map, tagname, propname = nil)
diff --git a/lib/jsduck/tag/constructor.rb b/lib/jsduck/tag/constructor.rb
index 088f05ca..915c7dc4 100644
--- a/lib/jsduck/tag/constructor.rb
+++ b/lib/jsduck/tag/constructor.rb
@@ -4,11 +4,18 @@ module JsDuck::Tag
   class Constructor < Tag
     def initialize
       @pattern = "constructor"
+      @key = :constructor
     end
 
     # @constructor
     def parse(p)
       {:tagname => :constructor}
     end
+
+    # The method name will become "constructor" unless a separate
+    # @method tag already supplied the name.
+    def process_doc(h, tags)
+      h[:name] = "constructor" unless h[:name]
+    end
   end
 end
diff --git a/lib/jsduck/tag/method.rb b/lib/jsduck/tag/method.rb
index dec55041..d4c54c79 100644
--- a/lib/jsduck/tag/method.rb
+++ b/lib/jsduck/tag/method.rb
@@ -5,6 +5,7 @@ module JsDuck::Tag
   class Method < Tag
     def initialize
       @pattern = "method"
+      @key = :method
       @member_type = :method
     end
 
@@ -15,5 +16,11 @@ module JsDuck::Tag
         :name => p.hw.ident,
       }
     end
+
+    # Onle sets the name when it's actually specified.
+    # Otherwise we might overwrite name coming from @constructor.
+    def process_doc(h, tags)
+      h[:name] = tags[0][:name] if tags[0][:name]
+    end
   end
 end
-- 
GitLab