Indent fix for trailing comments (dartbug.com/16383).

pkg/analyzer/lib/src/services/formatter_impl.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library formatter_impl;
 
 import 'dart:math';
 
 import 'package:analyzer/analyzer.dart';
 import 'package:analyzer/src/generated/java_core.dart' show CharSequence;
@@ skipping 436 matching lines @@
     space();
     token(node.operator);
     space();
     visit(node.rightOperand);
   }
 
   visitBlock(Block node) {
     token(node.leftBracket);
     indent();
     visitNodes(node.statements, precededBy: newlines, separatedBy: newlines);
-    unindent();
     newlines();
-    token(node.rightBracket);
+    token(node.rightBracket, precededBy: unindent);
   }
 
   visitBlockFunctionBody(BlockFunctionBody node) {
     visit(node.block);
   }
 
   visitBooleanLiteral(BooleanLiteral node) {
     token(node.literal);
   }
 
@@ skipping 48 matching lines @@
       visit(node.typeParameters);
       visitNode(node.extendsClause, precededBy: space);
       visitNode(node.withClause, precededBy: space);
       visitNode(node.implementsClause, precededBy: space);
       visitNode(node.nativeClause, precededBy: space);
       space();
     });
     token(node.leftBracket);
     indent();
     visitNodes(node.members, precededBy: newlines, separatedBy: newlines);
-    unindent();
     newlines();
-    token(node.rightBracket);
+    token(node.rightBracket, precededBy: unindent);
   }
 
   visitClassTypeAlias(ClassTypeAlias node) {
     preserveLeadingNewlines();
     visitNodes(node.metadata, followedBy: newlines);
     modifier(node.abstractKeyword);
     token(node.keyword);
     space();
     visit(node.name);
     visit(node.typeParameters);
@@ skipping 446 matching lines @@
     append(node.name);
   }
 
   visitListLiteral(ListLiteral node) {
     modifier(node.constKeyword);
     visit(node.typeArguments);
     token(node.leftBracket);
     indent();
     visitCommaSeparatedNodes(node.elements /*, followedBy: breakableSpace*/);
     optionalTrailingComma(node.rightBracket);
-    unindent();
-    token(node.rightBracket);
+    token(node.rightBracket, precededBy: unindent);
   }
 
   visitMapLiteral(MapLiteral node) {
     modifier(node.constKeyword);
     visitNode(node.typeArguments, followedBy: space);
     token(node.leftBracket);
     if (!node.entries.isEmpty) {
       newlines();
       indent();
       visitCommaSeparatedNodes(node.entries, followedBy: newlines);
@@ skipping 202 matching lines @@
     token(node.keyword);
     space();
     token(node.leftParenthesis);
     visit(node.expression);
     token(node.rightParenthesis);
     space();
     token(node.leftBracket);
     indent();
     newlines();
     visitNodes(node.members, separatedBy: newlines, followedBy: newlines);
-    unindent();
-    token(node.rightBracket);
+    token(node.rightBracket, precededBy: unindent);
+
   }
 
   visitSymbolLiteral(SymbolLiteral node) {
     token(node.poundSign);
     var components = node.components;
     var size = components.length;
     for (var component in components) {
       // The '.' separator
       if (component.previous.lexeme == '.') {
         token(component.previous);
@@ skipping 202 matching lines @@
       token(rightBracket.previous);
     }
   }
 
   /// Indicate that user introduced newlines should be emitted before the next
   /// token.
   preserveLeadingNewlines() {
     preserveNewlines = true;
   }
 
-  token(Token token, {precededBy(), followedBy(),
-      printToken(tok), int minNewlines: 0}) {
+  token(Token token, {precededBy(), followedBy(), printToken(tok),
+      int minNewlines: 0}) {
     if (token != null) {
       if (needsNewline) {
         minNewlines = max(1, minNewlines);
       }
       var emitted = emitPrecedingCommentsAndNewlines(token, min: minNewlines);
       if (emitted > 0) {
         needsNewline = false;
       }
       if (precededBy != null) {
         precededBy();
@@ skipping 48 matching lines @@
     //TODO(pquitslund): replace with a proper space token
     leadingSpaces+=n;
     allowLineLeadingSpaces = allowLineLeading;
     currentBreakWeight = breakWeight;
   }
 
   /// Append the given [string] to the source writer if it's non-null.
   append(String string) {
     if (string != null && !string.isEmpty) {
       emitSpaces();
-      writer.print(string);
+      writer.write(string);
     }
   }
 
   /// Indent.
   indent([n = 1]) {
     while (n-- > 0) {
       writer.indent();
     }
   }
 
   /// Unindent
   unindent([n = 1]) {
     while (n-- > 0) {
       writer.unindent();
     }
   }
 
   /// Print this statement as if it were a block (e.g., surrounded by braces).
   printAsBlock(Statement statement) {
     if (codeTransforms && statement is! Block) {
       token(OPEN_CURLY);
       indent();
       newlines();
       visit(statement);
       newlines();
-      unindent();
-      token(CLOSE_CURLY);
+      token(CLOSE_CURLY, precededBy: unindent);
     } else {
       visit(statement);
     }
   }
 
   /// Emit any detected comments and newlines or a minimum as specified
   /// by [min].
   int emitPrecedingCommentsAndNewlines(Token token, {min: 0}) {
 
     var comment = token.precedingComments;
     var currentToken = comment != null ? comment : token;
 
     //Handle EOLs before newlines
     if (isAtEOL(comment)) {
       emitComment(comment, previousToken);
       comment = comment.next;
       currentToken = comment != null ? comment : token;
       // Ensure EOL comments force a linebreak
       needsNewline = true;
     }
 
     var lines = 0;
     if (needsNewline || preserveNewlines) {
       lines = max(min, countNewlinesBetween(previousToken, currentToken));
       preserveNewlines = false;
     }
+
     emitNewlines(lines);
 
     previousToken =
         currentToken.previous != null ? currentToken.previous : token.previous;
 
     while (comment != null) {
 
       emitComment(comment, previousToken);
 
       var nextToken = comment.next != null ? comment.next : token;
@@ skipping 109 matching lines @@
     var lastLine =
         lineInfo.getLocation(lastOffset).lineNumber;
     var currentLine =
         lineInfo.getLocation(currentOffset).lineNumber;
     return currentLine - lastLine;
   }
 
   String toString() => writer.toString();
 
 }