Commit 8e277eaa authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Unify warnings formatting. 

Filename always at the beginning, followed by line number and message.
parent a28f90ba

lib/jsduck/aliases.rb

+2 −2
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ module JsDuck 


      orig = @relations[al_def[:cls]]

      unless orig

        Logger.instance.warn("Class #{al_def[:cls]} not found in #{al[:filename]} line #{al[:linenr]}")

        Logger.instance.warn("Class #{al_def[:cls]} not found", al[:filename], al[:linenr])

        return al

      end

      orig = orig.get_member(al_def[:member], al_def[:type] || al[:tagname])

      unless orig

        Logger.instance.warn("Member #{al_def[:cls]}##{al_def[:member]} not found in #{al[:filename]} line #{al[:linenr]}")

        Logger.instance.warn("Member #{al_def[:cls]}##{al_def[:member]} not found", al[:filename], al[:linenr])

        return al

      end

lib/jsduck/app.rb

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ module JsDuck 
          name = d[:name]

          file = d[:filename]

          line = d[:linenr]

          Logger.instance.warn("Ignoring #{type}: #{name} in #{file} line #{line}")

          Logger.instance.warn("Ignoring #{type}: #{name}", file, line)

        end

      end

      Relations.new(classes, @opts.external_classes)

lib/jsduck/class.rb

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ module JsDuck 
      if @relations[classname]

        @relations[classname]

      elsif !@relations.ignore?(classname)

        Logger.instance.warn("Class #{classname} not found in #{@doc[:filename]} line #{@doc[:linenr]}")

        Logger.instance.warn("Class #{classname} not found", @doc[:filename], @doc[:linenr])

        nil

      end

    end

lib/jsduck/class_formatter.rb

+2 −2
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ module JsDuck 
      else

        context = @formatter.doc_context

        if tp.error == :syntax

          Logger.instance.warn("Incorrect type syntax #{type} in #{context[:filename]} line #{context[:linenr]}")

          Logger.instance.warn("Incorrect type syntax #{type}", context[:filename], context[:linenr])

        else

          Logger.instance.warn("Unknown type #{type} in #{context[:filename]} line #{context[:linenr]}")

          Logger.instance.warn("Unknown type #{type}", context[:filename], context[:linenr])

        end

        type

      end

lib/jsduck/doc_formatter.rb

+3 −3
Original line number Diff line number Diff line
@@ -129,10 +129,10 @@ module JsDuck 
        file = @doc_context[:filename]

        line = @doc_context[:linenr]

        if !@relations[cls]

          Logger.instance.warn("#{file} line #{line} #{input} links to non-existing class.")

          Logger.instance.warn("#{input} links to non-existing class", file, line)

          text

        elsif member && !get_member(cls, member, type)

          Logger.instance.warn("#{file} line #{line} #{input} links to non-existing member.")

          Logger.instance.warn("#{input} links to non-existing member", file, line)

          text

        else

          link(cls, member, text, type)
@@ -189,7 +189,7 @@ module JsDuck 
          else

            file = @doc_context[:filename]

            line = @doc_context[:linenr]

            Logger.instance.warn("--examples not specified, but {@example} found in #{file} line #{line}.")

            Logger.instance.warn("--inline-examples not specified, but {@example} found", file, line)

          end

        else

          $1