lib/jsduck/class_formatter.rb in jsduck-3.0.pre2 vs lib/jsduck/class_formatter.rb in jsduck-3.0.pre3

@@ -12,18 +12,19 @@
 
     def initialize(relations, formatter)
       @relations = relations
       @formatter = formatter
       @include_types = true
+      @meta_tags = []
     end
 
     # Runs the formatter on doc object of a class.
     # Accessed using Class#internal_doc
     def format(cls)
       @cls = cls
       @formatter.class_context = cls[:name]
-      @formatter.doc_context = cls
+      @formatter.doc_context = cls[:files][0]
       cls[:doc] = @formatter.format(cls[:doc]) if cls[:doc]
       cls[:members].each_pair do |type, members|
         cls[:members][type] = members.reject {|m| m[:private] }.map {|m| format_member(m) }
       end
       cls[:statics].each_pair do |type, members|
@@ -31,11 +32,11 @@
       end
       cls
     end
 
     def format_member(m)
-      @formatter.doc_context = m
+      @formatter.doc_context = m[:files][0]
       m[:doc] = @formatter.format(m[:doc]) if m[:doc]
       m[:deprecated][:text] = @formatter.format(m[:deprecated][:text]) if m[:deprecated]
       if expandable?(m) || @formatter.too_long?(m[:doc])
         m[:shortDoc] = @formatter.shorten(m[:doc])
       end
@@ -66,12 +67,12 @@
       if tp.parse(type)
         tp.out
       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
     end