Commit 5e476b62 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Rename :var and :mixin to :css_var and :css_mixin. 

Less confusion this way with JavaScript mixin classes.
parent a83186a8

lib/jsduck/aggregator.rb

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ module JsDuck 
              :property => [],

              :method => [],

              :event => [],

              :var => [],

              :mixin => [],

              :css_var => [],

              :css_mixin => [],

            })

          end

          add_member(orph)

lib/jsduck/app.rb

+2 −1
Original line number Diff line number Diff line 
require 'rubygems'

require 'jsduck/parser'

require 'jsduck/css_parser'

require 'jsduck/aggregator'

require 'jsduck/source_formatter'

require 'jsduck/class'
@@ -75,7 +76,7 @@ module JsDuck 
        {

          :filename => fname,

          :html_filename => File.basename(src.write(code, fname)),

          :data => Parser.new(code).parse,

          :data => fname =~ /\.s?css$/ ? CssParser.new(code).parse : Parser.new(code).parse,

        }

      end

    end

lib/jsduck/css_parser.rb

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ module JsDuck 
    def mixin

      match("@", "mixin")

      return {

        :type => :mixin,

        :type => :css_mixin,

        :name => look(:ident) ? css_ident : nil,

      }

    end

lib/jsduck/doc_parser.rb

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ module JsDuck 
    # matches @var {type} $name ...

    def at_var

      match(/@var/)

      add_tag(:var)

      add_tag(:css_var)

      maybe_type

      maybe_name(/\$[a-zA-Z0-9_-]*/)

      skip_white

lib/jsduck/merger.rb

+16 −16
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ module JsDuck 
        create_cfg(docs, code)

      when :property

        create_property(docs, code)

      when :var

        create_var(docs, code)

      when :mixin

        create_mixin(docs, code)

      when :css_var

        create_css_var(docs, code)

      when :css_mixin

        create_css_mixin(docs, code)

      end

    end
@@ -37,16 +37,16 @@ module JsDuck 
        :method

      elsif doc_map[:property] || doc_map[:type]

        :property

      elsif doc_map[:var]

        :var

      elsif doc_map[:css_var]

        :css_var

      elsif code[:type] == :ext_define

        :class

      elsif code[:type] == :assignment && class_name?(*code[:left])

        :class

      elsif code[:type] == :function && class_name?(code[:name])

        :class

      elsif code[:type] == :mixin

        :mixin

      elsif code[:type] == :css_mixin

        :css_mixin

      elsif doc_map[:cfg]

        :cfg

      elsif code[:type] == :function
@@ -177,24 +177,24 @@ module JsDuck 
      }

    end



    def create_var(docs, code)

    def create_css_var(docs, code)

      doc_map = build_doc_map(docs)

      return {

        :tagname => :var,

        :name => detect_name(:var, doc_map, code),

        :tagname => :css_var,

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

        :member => detect_member(doc_map),

        :type => detect_type(:var, doc_map, code),

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

        :doc => detect_doc(docs),

        :private => !!doc_map[:private],

        :static => !!doc_map[:static],

      }

    end



    def create_mixin(docs, code)

    def create_css_mixin(docs, code)

      doc_map = build_doc_map(docs)

      return {

        :tagname => :mixin,

        :name => detect_name(:mixin, doc_map, code),

        :tagname => :css_mixin,

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

        :member => detect_member(doc_map),

        :doc => detect_doc(docs),

        :private => !!doc_map[:private],
@@ -208,7 +208,7 @@ module JsDuck 
        main_tag[:name]

      elsif doc_map[:constructor]

        "constructor"

      elsif code[:type] == :function || code[:type] == :mixin

      elsif code[:type] == :function || code[:type] == :css_mixin

        code[:name]

      elsif code[:type] == :assignment

        name_type == :full_name ? code[:left].join(".") : code[:left].last