Commit 25bd6057 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Move :owner field creation to @member Tag class.

parent 35857e7a

lib/jsduck/doc_ast.rb

+0 −10
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ module JsDuck 
      return add_shared({

        :tagname => :method,

        :name => detect_name(:method, doc_map),

        :owner => detect_owner(doc_map),

        :doc => detect_doc(docs),

        :params => detect_params(doc_map),

        :return => detect_return(doc_map),
@@ -71,7 +70,6 @@ module JsDuck 
      return add_shared({

        :tagname => :event,

        :name => detect_name(:event, doc_map),

        :owner => detect_owner(doc_map),

        :doc => detect_doc(docs),

        :params => detect_params(doc_map),

      }, doc_map)
@@ -82,7 +80,6 @@ module JsDuck 
      return add_shared({

        :tagname => :cfg,

        :name => detect_name(:cfg, doc_map),

        :owner => detect_owner(doc_map),

        :type => detect_type(:cfg, doc_map),

        :doc => detect_doc(docs),

        :default => detect_default(:cfg, doc_map),
@@ -95,7 +92,6 @@ module JsDuck 
      return add_shared({

        :tagname => :property,

        :name => detect_name(:property, doc_map),

        :owner => detect_owner(doc_map),

        :type => detect_type(:property, doc_map),

        :doc => detect_doc(docs),

        :default => detect_default(:property, doc_map),
@@ -108,7 +104,6 @@ module JsDuck 
      return add_shared({

        :tagname => :css_var,

        :name => detect_name(:css_var, doc_map),

        :owner => detect_owner(doc_map),

        :type => detect_type(:css_var, doc_map),

        :default => detect_default(:css_var, doc_map),

        :doc => detect_doc(docs),
@@ -120,7 +115,6 @@ module JsDuck 
      return add_shared({

        :tagname => :css_mixin,

        :name => detect_name(:css_mixin, doc_map),

        :owner => detect_owner(doc_map),

        :doc => detect_doc(docs),

        :params => detect_params(doc_map),

      }, doc_map)
@@ -157,10 +151,6 @@ module JsDuck 
      end

    end



    def detect_owner(doc_map)

      extract(doc_map, :member, :member)

    end



    def detect_type(tagname, doc_map)

      extract(doc_map, tagname, :type) || extract(doc_map, :type, :type)

    end

lib/jsduck/tag/member.rb

+9 −2
Original line number Diff line number Diff line
@@ -2,14 +2,21 @@ require "jsduck/tag/tag" 


module JsDuck::Tag

  class Member < Tag

    # This is an odd case where tag itself is @member, but the value

    # of it gets stored in :owner.

    def initialize

      @pattern = "member"

      @key = :owner

    end



    # @member classname

    def parse(p)

      p.add_tag(:member)

      p.maybe_ident_chain(:member)

      p.add_tag(:owner)

      p.maybe_ident_chain(:owner)

    end



    def process_doc(tags)

      tags[0][:owner]

    end

  end

end