Commit d2daf1de authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Don't lose line number data while merging.

parent 5978ee6c

lib/jsduck/merger.rb

+7 −3
Original line number Diff line number Diff line
@@ -17,12 +17,16 @@ module JsDuck 


      case docset[:tagname]

      when :class

        merge_class(docs, code)

        result = merge_class(docs, code)

      when :method, :event, :css_mixin

        merge_like_method(docs, code)

        result = merge_like_method(docs, code)

      when :cfg, :property, :css_var

        merge_like_property(docs, code)

        result = merge_like_property(docs, code)

      end



      result[:linenr] = docset[:linenr]



      result

    end



    private

spec/merger_spec.rb

+5 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ describe JsDuck::Merger do 
        :code => {

          :tagname => :property,

          :name => "option",

        }

        },

        :linenr => 15,

      })

    end
@@ -36,6 +37,9 @@ describe JsDuck::Merger do 
    it "gets name from code" do

      @doc[:name].should == "option"

    end

    it "keeps line number data" do

      @doc[:linenr].should == 15

    end

  end



  describe "most stuff in code" do