Fix new line breaks on }

lib/src/codegen/dart_codegen.dart

 // Copyright (c) 2015, 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 ddc.src.codegen.dart_codegen;
 
 import 'dart:io' show File;
 
 import 'package:analyzer/analyzer.dart' as analyzer;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/java_core.dart' as java_core;
 import 'package:analyzer/src/generated/scanner.dart' show Token;
 import 'package:dart_style/dart_style.dart';
 import 'package:logging/logging.dart' as logger;
 import 'package:path/path.dart' as path;
 
 import 'package:dev_compiler/src/info.dart';
 import 'package:dev_compiler/src/checker/rules.dart';
+import 'package:dev_compiler/src/options.dart';
 import 'package:dev_compiler/src/report.dart';
 import 'package:dev_compiler/src/utils.dart' as utils;
 import 'ast_builder.dart';
 import 'code_generator.dart' as codegenerator;
 import 'reify_coercions.dart' as reifier;
 
 final _log = new logger.Logger('ddc.dartgenerator');
 
 class DdcRuntime {
   Identifier _ddcRuntimeId = AstBuilder.identifierFromString("DDC\$RT");
@@ skipping 27 matching lines @@
 
   Expression runtimeOperation(RuntimeOperation oper) {
     var id = runtimeId(oper);
     var args = oper.arguments;
     return AstBuilder.application(id, args);
   }
 }
 
 // TODO(leafp) This is kind of a hack, but it works for now.
 class FileWriter extends java_core.PrintStringWriter {
-  bool _format;
+  final CompilerOptions options;
   String _path;
-  FileWriter(this._format, this._path);
+  FileWriter(this.options, this._path);
   int indent = 0;
+  int withinInterpolationExpression = 0;
+  bool insideForLoop = false;
 
   void print(x) {
-    if (_format) {
+    if (!options.cheapTestFormat) {
       super.print(x);
       return;
     }
 
-    if (x == '{') {
-      indent++;
-      x = '{\n${"  " * indent}';
-    } else if (x == ';') {
-      x = ';\n${"  " * indent}';
-    } else if (x == '}') {
-      indent--;
-      x = '}\n${"  " * indent}';
+    switch (x) {
+      case '{':
+        indent++;
+        x = '{\n${"  " * indent}';
+        break;
+      case ';':
+        if (!insideForLoop) {
+          x = ';\n${"  " * indent}';
+        }
+        break;
+      case 'for (':
+        insideForLoop = true;
+        break;
+      case ') ':
+        insideForLoop = false;
+        break;
+      case r'${':
+        withinInterpolationExpression++;
+        break;
+      case '}':
+        if (withinInterpolationExpression > 0) {
+          withinInterpolationExpression--;
+        } else {
+          indent--;
+          x = '}\n${"  " * indent}';
+        }
+        break;
     }
     super.print(x);
   }
 
   void finalize() {
     String s = toString();
-    if (_format) {
+    if (options.formatOutput && !options.cheapTestFormat) {
       DartFormatter d = new DartFormatter();
       try {
         _log.fine("Formatting file $_path ");
         s = d.format(s, uri: _path);
       } catch (e) {
         _log.severe("Failed to format $_path: " + e.toString());
       }
     }
     _log.fine("Writing file $_path");
     new File(_path).writeAsStringSync(s);
@@ skipping 280 matching lines @@
     output(id.name);
     return null;
   }
 
   void generate() {
     visitCompilationUnit(unit);
   }
 }
 
 class DartGenerator extends codegenerator.CodeGenerator {
-  bool _format;
+  final CompilerOptions options;
   reifier.VariableManager _vm;
   Set<LibraryElement> _extraImports;
   TypeRules _rules;
 
-  DartGenerator(String outDir, Uri root, TypeRules rules, this._format)
+  DartGenerator(String outDir, Uri root, TypeRules rules, this.options)
       : _rules = rules,
         super(outDir, root, rules);
 
   void generateUnit(CompilationUnit unit, LibraryInfo info, String libraryDir) {
     var uri = unit.element.source.uri;
     _log.fine("Generating unit " + uri.toString());
     FileWriter out = new FileWriter(
-        _format, path.join(libraryDir, '${uri.pathSegments.last}'));
+        options, path.join(libraryDir, '${uri.pathSegments.last}'));
     var tm = new reifier.TypeManager(_vm);
     var r = new reifier.UnitCoercionReifier(tm, _vm, _rules);
     r.reify(unit);
     var ids = new Set<Identifier>.from(tm.addedTypes.map((tn) => tn.name));
     var unitGen = new UnitGenerator(unit, out, outDir, _extraImports, ids);
     unitGen.generate();
     out.finalize();
   }
 
   void _generateLibrary(Iterable<CompilationUnit> units, LibraryInfo info,
@@ skipping 34 matching lines @@
   void output(String s) => _out.print(s);
   void outputln(String s) => _out.println(s);
 
   void generate() {
     unit.visitChildren(this);
   }
 }
 
 // This class emits the code unchanged, for comparison purposes.
 class EmptyDartGenerator extends codegenerator.CodeGenerator {
-  bool _format;
+  final CompilerOptions options;
 
-  EmptyDartGenerator(String outDir, Uri root, TypeRules rules, this._format)
+  EmptyDartGenerator(String outDir, Uri root, TypeRules rules, this.options)
       : super(outDir, root, rules);
 
   void generateUnit(CompilationUnit unit, LibraryInfo info, String libraryDir) {
     var uri = unit.element.source.uri;
     _log.fine("Emitting original unit " + uri.toString());
     FileWriter out = new FileWriter(
-        _format, path.join(libraryDir, '${uri.pathSegments.last}'));
+        options, path.join(libraryDir, '${uri.pathSegments.last}'));
     var unitGen = new EmptyUnitGenerator(unit, out);
     unitGen.generate();
     out.finalize();
   }
 }