Formatter support for metadata.

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 478 matching lines @@
       token(node.rightParenthesis);
       space();
     } else {
       space();
     }
     visit(node.body);
   }
 
   visitClassDeclaration(ClassDeclaration node) {
     preserveLeadingNewlines();
+    visitNodes(node.metadata, followedBy: newlines);
     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);
       space();
     });
     token(node.leftBracket);
     indent();
     visitNodes(node.members, precededBy: newlines, separatedBy: newlines);
     unindent();
     newlines();
     token(node.rightBracket);
   }
 
   visitClassTypeAlias(ClassTypeAlias node) {
     preserveLeadingNewlines();
+    visitNodes(node.metadata, followedBy: newlines);
     //TODO(pquitslund): the following _should_ work (dartbug.com/15912)
     //modifier(node.abstractKeyword);
     // ... in the meantime we use this workaround
     var prev = node.keyword.previous;
-    if (prev.keyword == Keyword.ABSTRACT) {
+    if (prev is KeywordToken && prev.keyword == Keyword.ABSTRACT) {
       token(prev);
       space();
     }
     token(node.keyword);
     space();
     visit(node.name);
     visit(node.typeParameters);
     space();
     token(node.equals);
     space();
@@ skipping 40 matching lines @@
       space();
       visit(node.thenExpression);
       space();
       token(node.colon);
       space();
       visit(node.elseExpression);
     });
   }
 
   visitConstructorDeclaration(ConstructorDeclaration node) {
+    visitNodes(node.metadata, followedBy: newlines);
     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 100 matching lines @@
 
   visitEmptyFunctionBody(EmptyFunctionBody node) {
     token(node.semicolon);
   }
 
   visitEmptyStatement(EmptyStatement node) {
     token(node.semicolon);
   }
 
   visitExportDirective(ExportDirective node) {
+    visitNodes(node.metadata, followedBy: newlines);
     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);
     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 65 matching lines @@
     }
     token(node.rightParenthesis);
     if (node.body is! EmptyStatement) {
       space();
     }
     visit(node.body);
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
     preserveLeadingNewlines();
+    visitNodes(node.metadata, followedBy: newlines);
     modifier(node.externalKeyword);
     //TODO(pquitslund): remove this workaround once setter functions
     //have their return types properly set (dartbug.com/15914)
     if (node.returnType == null && node.propertyKeyword != null) {
       modifier(node.propertyKeyword.previous);
     } else {
       visitNode(node.returnType, followedBy: space);
     }
     modifier(node.propertyKeyword);
     visit(node.name);
@@ skipping 60 matching lines @@
     }
   }
 
   visitImplementsClause(ImplementsClause node) {
     token(node.keyword);
     space();
     visitCommaSeparatedNodes(node.interfaces);
   }
 
   visitImportDirective(ImportDirective node) {
+    visitNodes(node.metadata, followedBy: newlines);
     token(node.keyword);
     space();
     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);
     token(node.keyword);
     space();
     visit(node.name);
     token(node.semicolon);
   }
 
   visitLibraryIdentifier(LibraryIdentifier node) {
     append(node.name);
   }
 
@@ skipping 22 matching lines @@
   }
 
   visitMapLiteralEntry(MapLiteralEntry node) {
     visit(node.key);
     token(node.separator);
     space();
     visit(node.value);
   }
 
   visitMethodDeclaration(MethodDeclaration node) {
+    visitNodes(node.metadata, followedBy: newlines);
     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);
     modifier(node.keyword);
     visitNode(node.type, followedBy: space);
     visit(node.identifier);
   }
 
   visitSimpleIdentifier(SimpleIdentifier node) {
     token(node.token);
   }
 
   visitSimpleStringLiteral(SimpleStringLiteral node) {
@@ skipping 83 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);
     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);
     modifier(node.keyword);
     visitNode(node.type, followedBy: space);
     visitCommaSeparatedNodes(node.variables);
   }
 
   visitVariableDeclarationStatement(VariableDeclarationStatement node) {
     visit(node.variables);
     token(node.semicolon);
   }
 
@@ skipping 365 matching lines @@
     var lastLine =
         lineInfo.getLocation(lastOffset).lineNumber;
     var currentLine =
         lineInfo.getLocation(currentOffset).lineNumber;
     return currentLine - lastLine;
   }
 
   String toString() => writer.toString();
 
 }