Small formatter fixes.

mojom/mojom_parser/formatter/printer.go

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package formatter
 
 import (
         "bytes"
         "fmt"
         "mojom/mojom_parser/lexer"
@@ skipping 249 matching lines @@
         p.writeRightComments(enumValue)
 }
 
 // writeDeclaredObjectsContainer
 // DeclaredObjectsContainers are MojomEnum, MojomUnion, MojomInterface, MojomStruct.
 // This method writes the name of the object, an opening brace, the contained
 // declarations (fields, enum values, nested declarations and methods) and the
 // closing brace.
 func (p *printer) writeDeclaredObjectsContainer(container mojom.DeclaredObjectsContainer) {
 
+        p.writef("%v {", container.(mojom.DeclaredObject).NameToken().Text)
         if len(container.GetDeclaredObjects()) == 0 && !containsFinalComments(container.(mojom.MojomElement)) {
-                p.writef("%v{};", container.(mojom.DeclaredObject).NameToken().Text)
+                p.writef("};")
                 return
         }
-        p.writef("%v {", container.(mojom.DeclaredObject).NameToken().Text)
         p.writeRightComments(container.(mojom.MojomElement))
         p.incIndent()
         p.nl()
         declaredObjects := container.GetDeclaredObjects()
         for i, declaredObject := range declaredObjects {
                 p.writeDeclaredObject(declaredObject)
                 if i < len(declaredObjects)-1 {
                         p.nl()
                 }
         }
@@ skipping 30 matching lines @@
 
         if len(attrs.List) == 0 {
                 return
         }
 
         p.writef("[")
         for idx, attr := range attrs.List {
                 p.writeAttribute(&attr)
                 if idx < len(attrs.List)-1 {
                         p.writef(",")
-                        if singleLine {
-                                p.write(" ")
-                        } else {
+                        if !singleLine {
                                 p.nl()
                         }
+                        p.write(" ")
                 }
         }
         p.writef("]")
-        if !singleLine {
+        if singleLine {
+                p.write(" ")
+        } else {
                 p.nl()
         }
 }
 
 func (p *printer) writeAttribute(attr *mojom.MojomAttribute) {
         p.writeBeforeComments(attr)
         p.writef("%s=", attr.Key)
         p.writeValueRef(attr.Value)
         p.writeRightComments(attr)
 }
@@ skipping 222 matching lines @@
                 p.lineStarted = true
         }
         p.buffer.WriteString(s)
 }
 
 // nl writes a new line. Before writing the new line, nl writes the last
 // comment on the line.
 func (p *printer) nl() {
         // Before going to the next line, print the last comment on the line.
         if p.eolComment != nil {
-                p.writef(" %s", p.eolComment.Text)
+                p.writef("  %s", p.eolComment.Text)
                 p.eolComment = nil
         }
 
         p.buffer.WriteString("\n")
         p.lineStarted = false
 }
 
 func (p *printer) incIndent() {
         p.indentLevel += 1
 }
@@ skipping 85 matching lines @@
 
 // See sort.Interface.
 func (ifs *importedFilesSorter) Less(i, j int) bool {
         return ifs.imports[i].SpecifiedName < ifs.imports[j].SpecifiedName
 }
 
 // See sort.Interface.
 func (ifs *importedFilesSorter) Swap(i, j int) {
         ifs.imports[i], ifs.imports[j] = ifs.imports[j], ifs.imports[i]
 }