Formatter fixes and tweaks.

pkg/analyzer_experimental/test/services/formatter_test.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.
 
 import 'package:unittest/unittest.dart';
 
 import 'package:analyzer_experimental/src/generated/scanner.dart';
 import 'package:analyzer_experimental/src/services/formatter_impl.dart';
 import 'package:analyzer_experimental/src/services/writer.dart';
 
 main() {
 
   /// Formatter tests
   group('formatter', () {
 
     test('failed parse', () {
       var formatter = new CodeFormatter();
       expect(() => formatter.format(CodeKind.COMPILATION_UNIT, '~'),
                    throwsA(new isInstanceOf<FormatterException>()));
     });
 
     test('CU (1)', () {
       expectCUFormatsTo(
           'class A  {\n'
+          '  inc(int x) => ++x;\n'
           '}\n',
           'class A {\n'
+          '  inc(int x) => ++x;\n'
           '}\n'
         );
     });
 
     test('CU (2)', () {
       expectCUFormatsTo(
           'class      A  {  \n'
           '}\n',
           'class A {\n'
           '}\n'
@@ skipping 49 matching lines @@
           'foo() {\n'
           '}\n'
           'bar() {\n'
           '}\n',
           '\n\n'
           'foo() {\n'
           '}\n'
           'bar() {\n'
           '}\n'
       );
+      expectCUFormatsTo(
+          'const A = 42;\n'
+          'final foo = 32;\n',
+          'const A = 42;\n'
+          'final foo = 32;\n'
+      );
     });
     
     test('CU - imports', () {
       expectCUFormatsTo(
           'import "dart:io";\n\n'
           'import "package:unittest/unittest.dart";\n'
           'foo() {\n'
           '}\n',
           'import "dart:io";\n\n'
           'import "package:unittest/unittest.dart";\n'
           'foo() {\n'
           '}\n'
       );
     });
 
     test('CU w/class decl comment', () {
       expectCUFormatsTo(
           'import "foo";\n\n'
           '//Killer class\n'
           'class A {\n'
           '}',
           'import "foo";\n\n'
           '//Killer class\n'
           'class A {\n'
           '}'
         );
     });
 
-
+    test('CU (method body)', () {
+      expectCUFormatsTo(
+          'class A {\n'
+          '  foo(path) {\n'
+          '    var buffer = new StringBuffer();\n'
+          '    var file = new File(path);\n'
+          '    return file;\n'
+          '  }\n'
+          '}\n',
+          'class A {\n'
+          '  foo(path) {\n'
+          '    var buffer = new StringBuffer();\n'
+          '    var file = new File(path);\n'
+          '    return file;\n'
+          '  }\n'
+          '}\n'
+      );
+      expectCUFormatsTo(
+          'class A {\n'
+          '  foo(files) {\n'
+          '    for (var  file in files) {\n'
+          '      print(file);\n'
+          '    }\n'
+          '  }\n'
+          '}\n',
+          'class A {\n'
+          '  foo(files) {\n'
+          '    for (var  file in files) {\n'

[Brian Wilkerson, 2013/08/21 18:18:53]

I don't think you want to produce two spaces here.

[pquitslund, 2013/08/21 19:40:40]

Aha!  That explains why the code you commented on worked.

Thanks for the catch.

+          '      print(file);\n'
+          '    }\n'
+          '  }\n'
+          '}\n'
+      );
+    });
+    
     test('CU (method indent)', () {
       expectCUFormatsTo(
           'class A {\n'
           'void x(){\n'
           '}\n'
           '}\n',
           'class A {\n'
           '  void x() {\n'
           '  }\n'
           '}\n'
-        );
+      );
     });
 
     test('CU (method indent - 2)', () {
       expectCUFormatsTo(
           'class A {\n'
           ' static  bool x(){\n'
           'return true; }\n'
           ' }\n',
           'class A {\n'
           '  static bool x() {\n'
@@ skipping 11 matching lines @@
           'class A {\n'
           '  int x() => 42 + 3;\n'
           '}\n'
         );
     });
 
     test('CU (method indent - 4)', () {
       expectCUFormatsTo(
           'class A {\n'
           ' int x() { \n'
-          'if (true) {\nreturn 42;\n'
+          'if (true) {\n'
+          'return 42;\n'
           '} else {\n'
           'return 13;\n }\n'
           '   }'
           '}\n',
           'class A {\n'
           '  int x() {\n'
           '    if (true) {\n'
           '      return 42;\n'
           '    } else {\n'
           '      return 13;\n'
@@ skipping 257 matching lines @@
 String formatCU(src, {options: const FormatterOptions()}) =>
     new CodeFormatter(options).format(CodeKind.COMPILATION_UNIT, src);
 
 String formatStatement(src, {options: const FormatterOptions()}) =>
     new CodeFormatter(options).format(CodeKind.STATEMENT, src);
 
 expectCUFormatsTo(src, expected) => expect(formatCU(src), equals(expected));
 
 expectStmtFormatsTo(src, expected) => expect(formatStatement(src),
     equals(expected));