Merge pull request #136 from alyst/condensed_fields

Condense $FIELDS template

Author: MichaelHatherly

src/abbreviations.jl

@@ -81,13 +81,9 @@ type `Vector{Any}`.
 
   - `x::String`
 
-  - `y::Int`
+  - `y::Int`: Unlike the `x` field this field has been documented.
 
-    Unlike the `x` field this field has been documented.
-
-  - `z::Array{Any, 1}`
-
-    Another documented field.
+  - `z::Array{Any, 1}`: Another documented field.
 ```
 """
 const TYPEDFIELDS = TypeFields(true)
@@ -96,22 +92,20 @@ function format(abbrv::TypeFields, buf, doc)
     local docs = get(doc.data, :fields, Dict())
     local binding = doc.data[:binding]
     local object = Docs.resolve(binding)
-    # On 0.7 fieldnames() on an abstract type throws an error. We then explicitly return
-    # an empty vector to be consistent with the behaviour on v0.6.
     local fields = isabstracttype(object) ? Symbol[] : fieldnames(object)
     if !isempty(fields)
         println(buf)
         for field in fields
-            if abbrv.types
-                println(buf, "  - `", field, "::", fieldtype(object, field), "`")
-            else
-                println(buf, "  - `", field, "`")
-            end
+            print(buf, "  - `", field)
+            abbrv.types && print(buf, "::", fieldtype(object, field))
+            println(buf, "`")
             # Print the field docs if they exist and aren't a `doc"..."` docstring.
             if haskey(docs, field) && isa(docs[field], AbstractString)
-                println(buf)
+                print(buf, ": ")
+                indented = true
                 for line in split(docs[field], "\n")
-                    println(buf, isempty(line) ? "" : "    ", rstrip(line))
+                    println(buf, indented || isempty(line) ? "" : "    ", rstrip(line))
+                    indented = false
                 end
             end
             println(buf)