Function Decl formatter fixes (external and getters/setters) --- (dartbug.com/15914).

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 797 matching lines @@
     }
     token(node.rightParenthesis);
     if (node.body is! EmptyStatement) {
       space();
     }
     visit(node.body);
   }
 
   visitFunctionDeclaration(FunctionDeclaration node) {
     preserveLeadingNewlines();
-    visitNode(node.returnType, followedBy: space);
-    token(node.propertyKeyword, followedBy: space);
+    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);
     visit(node.functionExpression);
   }
 
   visitFunctionDeclarationStatement(FunctionDeclarationStatement node) {
     visit(node.functionDeclaration);
   }
 
   visitFunctionExpression(FunctionExpression node) {
     visit(node.parameters);
-    space();
+    if (node.body is! EmptyFunctionBody) {
+      space();
+    }
     visit(node.body);
   }
 
   visitFunctionExpressionInvocation(FunctionExpressionInvocation node) {
     visit(node.function);
     visit(node.argumentList);
   }
 
   visitFunctionTypeAlias(FunctionTypeAlias node) {
     token(node.keyword);
@@ skipping 792 matching lines @@
     var lastLine =
         lineInfo.getLocation(lastOffset).lineNumber;
     var currentLine =
         lineInfo.getLocation(currentOffset).lineNumber;
     return currentLine - lastLine;
   }
 
   String toString() => writer.toString();
 
 }