Annotation whitespace convention fixes (dartbug.com/17837).

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/parser.dart';
@@ skipping 512 matching lines @@
       token(node.rightParenthesis);
       space();
     } else {
       space();
     }
     visit(node.body);
   }
 
   visitClassDeclaration(ClassDeclaration node) {
     preserveLeadingNewlines();
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.abstractKeyword);
     token(node.classKeyword);
     space();
     visit(node.name);
     allowContinuedLines((){
       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();
     if (!node.members.isEmpty) {
       visitNodes(node.members, precededBy: newlines, separatedBy: newlines);
       newlines();
     } else {
       preserveLeadingNewlines();
     }
     token(node.rightBracket, precededBy: unindent);
   }
 
   visitClassTypeAlias(ClassTypeAlias node) {
     preserveLeadingNewlines();
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.abstractKeyword);
     token(node.keyword);
     space();
     visit(node.name);
     visit(node.typeParameters);
     space();
     token(node.equals);
     space();
     visit(node.superclass);
     visitNode(node.withClause, precededBy: space);
@@ skipping 38 matching lines @@
       space();
       visit(node.thenExpression);
       space();
       token(node.colon);
       space();
       visit(node.elseExpression);
     });
   }
 
   visitConstructorDeclaration(ConstructorDeclaration node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.externalKeyword);
     modifier(node.constKeyword);
     modifier(node.factoryKeyword);
     visit(node.returnType);
     token(node.period);
     visit(node.name);
     visit(node.parameters);
 
     // Check for redirects or initializer lists
     if (node.separator != null) {
@@ skipping 107 matching lines @@
     token(node.semicolon);
   }
 
   visitEmptyStatement(EmptyStatement node) {
     if (!codeTransforms || node.parent is! Block) {
       token(node.semicolon);
     }
   }
 
   visitExportDirective(ExportDirective node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitDirectiveMetadata(node.metadata);
     token(node.keyword);
     space();
     visit(node.uri);
     allowContinuedLines((){
       visitNodes(node.combinators, precededBy: space, separatedBy: space);
     });
     token(node.semicolon);
   }
 
   visitExpressionFunctionBody(ExpressionFunctionBody node) {
     token(node.functionDefinition);
     space();
     visit(node.expression);
     token(node.semicolon);
   }
 
   visitExpressionStatement(ExpressionStatement node) {
     visit(node.expression);
     token(node.semicolon);
   }
 
   visitExtendsClause(ExtendsClause node) {
     token(node.keyword);
     space();
     visit(node.superclass);
   }
 
   visitFieldDeclaration(FieldDeclaration node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.staticKeyword);
     visit(node.fields);
     token(node.semicolon);
   }
 
   visitFieldFormalParameter(FieldFormalParameter node) {
     token(node.keyword, followedBy: space);
     visitNode(node.type, followedBy: space);
     token(node.thisToken);
     token(node.period);
@@ skipping 69 matching lines @@
     }
     token(node.rightParenthesis);
     if (node.body is! EmptyStatement) {
       space();
     }
     visit(node.body);
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
     preserveLeadingNewlines();
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.externalKeyword);
     visitNode(node.returnType, followedBy: space);
     modifier(node.propertyKeyword);
     visit(node.name);
     visit(node.functionExpression);
   }
 
   visitFunctionDeclarationStatement(FunctionDeclarationStatement node) {
     visit(node.functionDeclaration);
   }
 
   visitFunctionExpression(FunctionExpression node) {
     visit(node.parameters);
     if (node.body is! EmptyFunctionBody) {
       space();
     }
     visit(node.body);
   }
 
   visitFunctionExpressionInvocation(FunctionExpressionInvocation node) {
     visit(node.function);
     visit(node.argumentList);
   }
 
   visitFunctionTypeAlias(FunctionTypeAlias node) {
-    visitNodes(node.metadata, separatedBy: newlines, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     token(node.keyword);
     space();
     visitNode(node.returnType, followedBy: space);
     visit(node.name);
     visit(node.typeParameters);
     visit(node.parameters);
     token(node.semicolon);
   }
 
   visitFunctionTypedFormalParameter(FunctionTypedFormalParameter node) {
@@ skipping 33 matching lines @@
     }
   }
 
   visitImplementsClause(ImplementsClause node) {
     token(node.keyword);
     space();
     visitCommaSeparatedNodes(node.interfaces);
   }
 
   visitImportDirective(ImportDirective node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitDirectiveMetadata(node.metadata);
     token(node.keyword);
     nonBreakingSpace();
     visit(node.uri);
     token(node.asToken, precededBy: space, followedBy: space);
     allowContinuedLines((){
       visit(node.prefix);
       visitNodes(node.combinators, precededBy: space, separatedBy: space);
     });
     token(node.semicolon);
   }
@@ skipping 48 matching lines @@
     visit(node.label);
     token(node.colon);
   }
 
   visitLabeledStatement(LabeledStatement node) {
     visitNodes(node.labels, separatedBy: space, followedBy: space);
     visit(node.statement);
   }
 
   visitLibraryDirective(LibraryDirective node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitDirectiveMetadata(node.metadata);
     token(node.keyword);
     space();
     visit(node.name);
     token(node.semicolon);
   }
 
   visitLibraryIdentifier(LibraryIdentifier node) {
     append(node.name);
   }
 
@@ skipping 23 matching lines @@
   }
 
   visitMapLiteralEntry(MapLiteralEntry node) {
     visit(node.key);
     token(node.separator);
     space();
     visit(node.value);
   }
 
   visitMethodDeclaration(MethodDeclaration node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.externalKeyword);
     modifier(node.modifierKeyword);
     visitNode(node.returnType, followedBy: space);
     modifier(node.propertyKeyword);
     modifier(node.operatorKeyword);
     visit(node.name);
     if (!node.isGetter) {
       visit(node.parameters);
     }
     visitPrefixedBody(space, node.body);
@@ skipping 106 matching lines @@
     token(node.scriptTag);
   }
 
   visitShowCombinator(ShowCombinator node) {
     token(node.keyword);
     space();
     visitCommaSeparatedNodes(node.shownNames);
   }
 
   visitSimpleFormalParameter(SimpleFormalParameter node) {
-    visitNodes(node.metadata, followedBy: space);
+    visitMemberMetadata(node.metadata);
     modifier(node.keyword);
     visitNode(node.type, followedBy: space);
     visit(node.identifier);
   }
 
   visitSimpleIdentifier(SimpleIdentifier node) {
     token(node.token);
   }
 
   visitSimpleStringLiteral(SimpleStringLiteral node) {
@@ skipping 102 matching lines @@
     visitCommaSeparatedNodes(node.arguments);
     token(node.rightBracket);
   }
 
   visitTypeName(TypeName node) {
     visit(node.name);
     visit(node.typeArguments);
   }
 
   visitTypeParameter(TypeParameter node) {
-    visitNodes(node.metadata, followedBy: space);
+    visitMemberMetadata(node.metadata);
     visit(node.name);
     token(node.keyword /* extends */, precededBy: space, followedBy: space);
     visit(node.bound);
   }
 
   visitTypeParameterList(TypeParameterList node) {
     token(node.leftBracket);
     visitCommaSeparatedNodes(node.typeParameters);
     token(node.rightBracket);
   }
@@ skipping 10 matching lines @@
           visit(initializer);
         });
       } else {
         space();
         visit(initializer);
       }
     }
   }
 
   visitVariableDeclarationList(VariableDeclarationList node) {
-    visitNodes(node.metadata, followedBy: newlines);
+    visitMemberMetadata(node.metadata);
     modifier(node.keyword);
     visitNode(node.type, followedBy: space);
 
     var variables = node.variables;
     // Decls with initializers get their own lines (dartbug.com/16849)
     if (variables.any((v) => (v.initializer != null))) {
       var size = variables.length;
       if (size > 0) {
         var variable;
         for (var i = 0; i < size; i++) {
@@ skipping 42 matching lines @@
     visitCommaSeparatedNodes(node.mixinTypes);
   }
 
   /// Safely visit the given [node].
   visit(AstNode node) {
     if (node != null) {
       node.accept(this);
     }
   }
 
+  /// Visit member metadata
+  visitMemberMetadata(NodeList<Annotation> metadata) {
+    visitNodes(metadata,
+      separatedBy: () {
+        space();
+        preserveLeadingNewlines();
+      },
+      followedBy: space);
+    if (metadata != null && metadata.length > 0) {
+      preserveLeadingNewlines();
+    }
+  }
+
+  /// Visit member metadata
+  visitDirectiveMetadata(NodeList<Annotation> metadata) {
+    visitNodes(metadata, separatedBy: newlines, followedBy: newlines);
+  }
+
   /// Visit the given function [body], printing the [prefix] before if given
   /// body is not empty.
   visitPrefixedBody(prefix(), FunctionBody body) {
     if (body is! EmptyFunctionBody) {
       prefix();
     }
     visit(body);
   }
 
   /// Visit a list of [nodes] if not null, optionally separated and/or preceded
@@ skipping 342 matching lines @@
     var lastLine =
         lineInfo.getLocation(lastOffset).lineNumber;
     var currentLine =
         lineInfo.getLocation(currentOffset).lineNumber;
     return currentLine - lastLine;
   }
 
   String toString() => writer.toString();
 
 }