chore: move to clang-format 1.0.17.

clang-format 1.0.17 substantially improves formatting for fat arrow functions
and array literal detection. It also fixes a number of minor formatting issues.

gulpfile.js

@@ -223,11 +223,7 @@ gulp.task('build/pubbuild.dart', pubbuild(gulp, gulpPlugins, {
 // formatting
 
 function doCheckFormat() {
-  return gulp.src(['Brocfile*.js', 'modules/**/*.ts', 'tools/**/*.ts', '!**/typings/**/*.d.ts',
+  return gulp.src(['Brocfile*.js', 'modules/**/*.ts', 'tools/**/*.ts', '!**/typings/**/*.d.ts'])
-                   // skipped  due to https://github.com/angular/clang-format/issues/4
-                   '!tools/broccoli/tree-differ.ts',
-                   // skipped  due to https://github.com/angular/gulp-clang-format/issues/3
-                   '!tools/broccoli/broccoli-typescript.ts' ])
       .pipe(format.checkFormat('file'));
 }
 

modules/angular2/router.ts

@@ -35,7 +35,8 @@ export var routerInjectables: List<any> = [
   Pipeline,
   BrowserLocation,
   Location,
-  bind(Router).toFactory((registry, pipeline, location, appRoot) =>
+  bind(Router)
-                         { return new RootRouter(registry, pipeline, location, appRoot);},
+      .toFactory((registry, pipeline, location,
+                  appRoot) => { return new RootRouter(registry, pipeline, location, appRoot);},
                  [RouteRegistry, Pipeline, Location, appComponentTypeToken])
 ];

modules/angular2/src/change_detection/change_detection.ts

@@ -33,8 +33,8 @@ export var iterableDiff: List<PipeFactory> = [new IterableChangesFactory(), new
  *
  * @exportedAs angular2/pipes
  */
-export var async: List<
+export var async: List<PipeFactory> =
-    PipeFactory> = [new ObservablePipeFactory(), new PromisePipeFactory(), new NullPipeFactory()];
+    [new ObservablePipeFactory(), new PromisePipeFactory(), new NullPipeFactory()];
 
 /**
  * Uppercase text transform.

modules/angular2/src/core/application.ts

@@ -71,8 +71,8 @@ function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
         .toValue(DOM.defaultDoc()),
     bind(appComponentTypeToken).toValue(appComponentType),
     bind(appComponentRefToken)
-        .toAsyncFactory((dynamicComponentLoader, injector, testability, registry) =>
+        .toAsyncFactory(
-                        {
+            (dynamicComponentLoader, injector, testability, registry) => {
 
               // TODO(rado): investigate whether to support bindings on root component.
               return dynamicComponentLoader.loadAsRoot(appComponentType, null, injector)
@@ -93,8 +93,7 @@ function _injectorBindings(appComponentType): List<Type | Binding | List<any>> {
                    [ExceptionHandler]),
     bind(EventManager)
         .toFactory(
-            (ngZone) =>
+            (ngZone) => {
-            {
               var plugins =
                   [new HammerGesturesPlugin(), new KeyEventsPlugin(), new DomEventsPlugin()];
               return new EventManager(plugins, ngZone);
@@ -293,8 +292,7 @@ export function bootstrap(appComponentType: Type,
 
     PromiseWrapper.then(
         appInjector.asyncGet(appComponentRefToken),
-        (componentRef) =>
+        (componentRef) => {
-        {
           var appChangeDetector = internalView(componentRef.hostView).changeDetector;
           // retrieve life cycle: may have already been created if injected in root component
           var lc = appInjector.get(LifeCycle);

modules/angular2/src/core/compiler/compiler.ts

@@ -94,10 +94,8 @@ export class Compiler {
 
     var directiveMetadata = componentBinding.metadata;
     return this._render.compileHost(directiveMetadata)
-        .then((hostRenderPv) =>
+        .then((hostRenderPv) => {
-              {
+          return this._compileNestedProtoViews(componentBinding, hostRenderPv, [componentBinding]);
-                return this._compileNestedProtoViews(componentBinding, hostRenderPv,
-                                                     [componentBinding]);
         })
         .then((appProtoView) => { return new ProtoViewRef(appProtoView); });
   }

modules/angular2/src/test_lib/test_injector.ts

@@ -118,8 +118,8 @@ function _getAppBindings() {
     TestComponentBuilder,
     bind(NgZone).toClass(MockNgZone),
     bind(EventManager)
-        .toFactory((zone) =>
+        .toFactory(
-                   {
+            (zone) => {
               var plugins = [
                 new DomEventsPlugin(),
               ];

modules/angular2/src/test_lib/test_lib.ts

@@ -334,11 +334,10 @@ export class SpyObject {
 }
 
 function elementText(n) {
-  var hasNodes = (n) =>
+  var hasNodes = (n) => {
-  {
     var children = DOM.childNodes(n);
     return children && children.length > 0;
-  }
+  };
 
   if (n instanceof Array) {
     return n.map((nn) => elementText(nn)).join("");

modules/angular2/test/change_detection/change_detector_spec.ts

@@ -240,18 +240,18 @@ export function main() {
           "dynamic": (bindingRecords, variableBindings = null, directiveRecords = null,
                       registry = null, strategy = null) =>
                              new DynamicProtoChangeDetector(
-                             registry,
+                                 registry, new ChangeDetectorDefinition(
-                             new ChangeDetectorDefinition(
+                                               null, strategy,
-                                 null, strategy, isBlank(variableBindings) ? [] : variableBindings,
+                                               isBlank(variableBindings) ? [] : variableBindings,
                                                isBlank(bindingRecords) ? [] : bindingRecords,
                                                isBlank(directiveRecords) ? [] : directiveRecords)),
 
-          "JIT":
+          "JIT": (bindingRecords, variableBindings = null, directiveRecords = null, registry = null,
-              (bindingRecords, variableBindings = null, directiveRecords = null, registry = null,
                   strategy = null) =>
                          new JitProtoChangeDetector(
                              registry, new ChangeDetectorDefinition(
-                                    null, strategy, isBlank(variableBindings) ? [] :
+                                           null,
+                                           strategy, isBlank(variableBindings) ? [] :
                                                                                  variableBindings,
                                            isBlank(bindingRecords) ? [] : bindingRecords,
                                            isBlank(directiveRecords) ? [] : directiveRecords))

modules/angular2/test/change_detection/coalesce_spec.ts

@@ -19,12 +19,8 @@ export function main() {
     it("should remove non-terminal duplicate records" +
            " and update the context indices referencing them",
        () => {
-         var rs = coalesce([
+         var rs = coalesce(
-           r("user", [], 0, 1),
+             [r("user", [], 0, 1), r("first", [], 1, 2), r("user", [], 0, 3), r("last", [], 3, 4)]);
-           r("first", [], 1, 2),
-           r("user", [], 0, 3),
-           r("last", [], 3, 4)
-         ]);
 
          expect(rs).toEqual([r("user", [], 0, 1), r("first", [], 1, 2), r("last", [], 1, 3)]);
        });

modules/angular2/test/change_detection/pipes/keyvalue_changes_spec.ts

@@ -58,14 +58,12 @@ export function main() {
         MapWrapper.set(m, 1, 20);
         changes.check(m);
 
-        changes.forEachChangedItem((record) =>
+        changes.forEachChangedItem((record) => {
-                                   {
           previous = record.previousValue;
           current = record.currentValue;
-                                   })
+        });
 
-            expect(previous)
+        expect(previous).toEqual(10);
-                .toEqual(10);
         expect(current).toEqual(20);
       });
 
@@ -97,11 +95,8 @@ export function main() {
         MapWrapper.delete(m, 'b');
         changes.check(m);
         expect(changes.toString())
-            .toEqual(kvChangesAsString({
+            .toEqual(kvChangesAsString(
-              map: ['a', 'd'],
+                {map: ['a', 'd'], previous: ['a', 'b[BB->null]', 'd'], removals: ['b[BB->null]']}));
-              previous: ['a', 'b[BB->null]', 'd'],
-              removals: ['b[BB->null]']
-            }));
 
         MapWrapper.clear(m);
         changes.check(m);

modules/angular2/test/core/compiler/compiler_spec.ts

@@ -77,8 +77,7 @@ export function main() {
       }
 
       function captureDirective(directive): Promise<renderApi.DirectiveMetadata> {
-        return captureTemplate(
+        return captureTemplate(new viewAnn.View({template: '<div></div>', directives: [directive]}))
-                   new viewAnn.View({template: '<div></div>', directives: [directive]}))
             .then((renderTpl) => {
               expect(renderTpl.directives.length).toBe(1);
               return renderTpl.directives[0];
@@ -315,9 +314,11 @@ export function main() {
              createProtoView([createComponentElementBinder(directiveResolver, NestedComponent)]);
          var nestedProtoView = createProtoView();
          var compiler = createCompiler([
-           createRenderProtoView([createRenderViewportElementBinder(
+           createRenderProtoView([
+             createRenderViewportElementBinder(
                  createRenderProtoView([createRenderComponentElementBinder(0)],
-                                     renderApi.ProtoViewDto.EMBEDDED_VIEW_TYPE))]),
+                                       renderApi.ProtoViewDto.EMBEDDED_VIEW_TYPE))
+           ]),
            createRenderProtoView()
          ],
                                        [[mainProtoView, viewportProtoView], [nestedProtoView]]);
@@ -336,8 +337,7 @@ export function main() {
          var expectedProtoView = createProtoView();
          var compiler = createCompiler([renderProtoView], [[expectedProtoView]]);
          compiler.compile(MainComponent)
-             .then((protoViewRef) =>
+             .then((protoViewRef) => {
-                   {
                expect(internalProtoView(protoViewRef)).toBe(expectedProtoView);
                return compiler.compile(MainComponent);
              })

modules/angular2/test/core/compiler/dynamic_component_loader_spec.ts

@@ -76,27 +76,23 @@ export function main() {
              view.context.ctxBoolProp = true;
              view.detectChanges();
              var dynamicComponent = view.rawView.viewContainers[0].views[0].locals.get("dynamic");
-             dynamicComponent.done.then((_) =>
+             var promise = dynamicComponent.done.then((_) => {
-                                        {
                view.detectChanges();
                expect(view.rootNodes).toHaveText('hello');
 
                view.context.ctxBoolProp = false;
                view.detectChanges();
 
-                                          expect(view.rawView.viewContainers[0].views.length)
+               expect(view.rawView.viewContainers[0].views.length).toBe(0);
-                                              .toBe(0);
                expect(view.rootNodes).toHaveText('');
 
                view.context.ctxBoolProp = true;
                view.detectChanges();
 
-                                          var dynamicComponent =
+               var dynamicComponent = view.rawView.viewContainers[0].views[0].locals.get("dynamic");
-                                              view.rawView.viewContainers[0].views[0].locals.get(
-                                                  "dynamic");
                return dynamicComponent.done;
-                                        })
+             });
-                 .then((_) => {
+             promise.then((_) => {
                view.detectChanges();
                expect(view.rootNodes).toHaveText('hello');
                async.done();

modules/angular2/test/core/compiler/integration_spec.ts

@@ -112,8 +112,8 @@ export function main() {
 
       it('should consume binding to aria-* attributes',
          inject([TestBed, AsyncTestCompleter], (tb, async) => {
-           tb.overrideView(
+           tb.overrideView(MyComp,
-               MyComp, new viewAnn.View({template: '<div [attr.aria-label]="ctxProp"></div>'}));
+                           new viewAnn.View({template: '<div [attr.aria-label]="ctxProp"></div>'}));
 
            tb.createView(MyComp, {context: ctx})
                .then((view) => {
@@ -234,10 +234,12 @@ export function main() {
 
       describe('pipes', () => {
         beforeEachBindings(() => {
-          return [bind(ChangeDetection)
+          return [
+            bind(ChangeDetection)
                 .toFactory(() => new DynamicChangeDetection(
                                new PipeRegistry({"double": [new DoublePipeFactory()]})),
-                                 [])];
+                           [])
+          ];
         });
 
         it("should support pipes in bindings and bind config",
@@ -312,8 +314,8 @@ export function main() {
 
       it('should support directives where a selector matches property binding',
          inject([TestBed, AsyncTestCompleter], (tb, async) => {
-           tb.overrideView(MyComp, new viewAnn.View(
+           tb.overrideView(
-                                       {template: '<p [id]="ctxProp"></p>', directives: [IdDir]}));
+               MyComp, new viewAnn.View({template: '<p [id]="ctxProp"></p>', directives: [IdDir]}));
 
            tb.createView(MyComp, {context: ctx})
                .then((view) => {
@@ -1007,11 +1009,8 @@ export function main() {
               </parent-providing-event-bus>
             </grand-parent-providing-event-bus>
           `,
-             directives: [
+             directives:
-               GrandParentProvidingEventBus,
+                 [GrandParentProvidingEventBus, ParentProvidingEventBus, ChildConsumingEventBus]
-               ParentProvidingEventBus,
-               ChildConsumingEventBus
-             ]
            }));
            tb.createView(MyComp, {context: ctx})
                .then((view) => {
@@ -1161,8 +1160,7 @@ export function main() {
           tb.overrideView(MyComp, new viewAnn.View({template: inlineTpl}));
           PromiseWrapper.then(
               tb.createView(MyComp),
-              (value) =>
+              (value) => {
-              {
                 throw new BaseException(
                     "Test failure: should not have come here as an exception was expected");
               },
@@ -1638,11 +1636,15 @@ function createParentBusView(p) {
 }
 @Component({
   selector: 'parent-providing-event-bus',
-  hostInjector: [new Binding(
+  hostInjector: [
-      EventBus, {toFactory: createParentBusHost, deps: [[EventBus, new visAnn.Unbounded()]]})],
+    new Binding(EventBus,
-  viewInjector: [new Binding(
+                {toFactory: createParentBusHost, deps: [[EventBus, new visAnn.Unbounded()]]})
+  ],
+  viewInjector: [
+    new Binding(
         EventBus,
-      {toFactory: createParentBusView, deps: [[FORWARD_REF(() => ParentProvidingEventBus)]]})]
+        {toFactory: createParentBusView, deps: [[FORWARD_REF(() => ParentProvidingEventBus)]]})
+  ]
 })
 @View({
   directives: [FORWARD_REF(() => ChildConsumingEventBus)],

modules/angular2/test/core/directive_lifecycle_integration_spec.ts

@@ -48,8 +48,7 @@ export function main() {
 }
 
 
-@Directive(
+@Directive({selector: "[lifecycle]", properties: ['field'], lifecycle: [onChange, onCheck, onInit]})
-    {selector: "[lifecycle]", properties: ['field'], lifecycle: [onChange, onCheck, onInit]})
 class LifecycleDir {
   field;
   log: List<string>;

modules/angular2/test/core/zone/ng_zone_spec.ts

@@ -290,8 +290,7 @@ function commonTests() {
          var ran = false;
          _zone.initCallbacks({
            onTurnStart: _log.fn('onTurnStart'),
-           onTurnDone: () =>
+           onTurnDone: () => {
-                       {
              _log.add('onTurnDone(begin)');
              if (!ran) {
                microTask(() => {
@@ -323,8 +322,7 @@ function commonTests() {
          var ran = false;
          _zone.initCallbacks({
            onTurnStart: _log.fn('onTurnStart'),
-           onTurnDone: () =>
+           onTurnDone: () => {
-                       {
              _log.add('onTurnDone(begin)');
              if (!ran) {
                _log.add('onTurnDone(scheduleMicrotask)');
@@ -361,8 +359,7 @@ function commonTests() {
          var startPromiseRan = false;
 
          _zone.initCallbacks({
-           onTurnStart: () =>
+           onTurnStart: () => {
-                        {
              _log.add('onTurnStart(begin)');
              if (!startPromiseRan) {
                _log.add('onTurnStart(schedulePromise)');
@@ -371,8 +368,7 @@ function commonTests() {
              }
              _log.add('onTurnStart(end)');
            },
-           onTurnDone: () =>
+           onTurnDone: () => {
-                       {
              _log.add('onTurnDone(begin)');
              if (!donePromiseRan) {
                _log.add('onTurnDone(schedulePromise)');
@@ -386,12 +382,13 @@ function commonTests() {
          macroTask(() => {
            _zone.run(() => {
              _log.add('run start');
-             PromiseWrapper.resolve(null).then((_) => {
-                                           _log.add('promise then');
              PromiseWrapper.resolve(null)
-                                               .then(_log.fn('promise foo'));
+                 .then((_) => {
+                   _log.add('promise then');
+                   PromiseWrapper.resolve(null).then(_log.fn('promise foo'));
                    return PromiseWrapper.resolve(null);
-                                         }).then(_log.fn('promise bar'));
+                 })
+                 .then(_log.fn('promise bar'));
              _log.add('run end');
            });
          });

modules/angular2/test/di/async_spec.ts

@@ -68,9 +68,8 @@ export function main() {
       it('should return a promise when instantiating a sync binding ' +
              'with an async dependency',
          inject([AsyncTestCompleter], (async) => {
-           var injector =
+           var injector = Injector.resolveAndCreate(
-               Injector
+               [bind(UserList).toAsyncFactory(fetchUsers), UserController]);
-                   .resolveAndCreate([bind(UserList).toAsyncFactory(fetchUsers), UserController]);
 
            injector.asyncGet(UserController)
                .then(function(userController) {
@@ -145,9 +144,8 @@ export function main() {
 
       it('should not throw when instantiating a sync binding with a resolved async dependency',
          inject([AsyncTestCompleter], (async) => {
-           var injector =
+           var injector = Injector.resolveAndCreate(
-               Injector
+               [bind(UserList).toAsyncFactory(fetchUsers), UserController]);
-                   .resolveAndCreate([bind(UserList).toAsyncFactory(fetchUsers), UserController]);
 
            injector.asyncGet(UserList).then((_) => {
              expect(() => { injector.get(UserController); }).not.toThrow();

modules/angular2/test/di/injector_spec.ts

@@ -167,9 +167,8 @@ export function main() {
     });
 
     it('should support overriding factory dependencies', () => {
-      var injector =
+      var injector = Injector.resolveAndCreate(
-          Injector
+          [Engine, bind(Car).toFactory((e) => new SportsCar(e), [Engine])]);
-              .resolveAndCreate([Engine, bind(Car).toFactory((e) => new SportsCar(e), [Engine])]);
 
       var car = injector.get(Car);
       expect(car).toBeAnInstanceOf(SportsCar);
@@ -191,9 +190,8 @@ export function main() {
     });
 
     it("should use the last binding when there are multiple bindings for same token", () => {
-      var injector =
+      var injector = Injector.resolveAndCreate(
-          Injector
+          [bind(Engine).toClass(Engine), bind(Engine).toClass(TurboEngine)]);
-              .resolveAndCreate([bind(Engine).toClass(Engine), bind(Engine).toClass(TurboEngine)]);
 
       expect(injector.get(Engine)).toBeAnInstanceOf(TurboEngine);
     });
@@ -393,10 +391,11 @@ export function main() {
       });
 
       it('should support overriding factory dependencies with dependency annotations', () => {
-        var bindings = Injector.resolve(
+        var bindings = Injector.resolve([
-            [bind("token")
+          bind("token")
               .toFactory((e) => "result",
-                               [[new ann.Inject("dep"), new CustomDependencyAnnotation()]])]);
+                         [[new ann.Inject("dep"), new CustomDependencyAnnotation()]])
+        ]);
         var binding = bindings[Key.get("token").id];
 
         expect(binding.dependencies[0].key.token).toEqual("dep");

modules/angular2/test/forms/model_spec.ts

@@ -139,10 +139,8 @@ export function main() {
         });
 
         it("should support nested groups", () => {
-          var g = new ControlGroup({
+          var g = new ControlGroup(
-            "one": new Control("111"),
+              {"one": new Control("111"), "nested": new ControlGroup({"two": new Control("222")})});
-            "nested": new ControlGroup({"two": new Control("222")})
-          });
           expect(g.value).toEqual({"one": "111", "nested": {"two": "222"}});
 
           g.controls["nested"].controls["two"].updateValue("333");
@@ -154,10 +152,8 @@ export function main() {
       describe("find", () => {
         var g;
         beforeEach(() => {
-          g = new ControlGroup({
+          g = new ControlGroup(
-            "one": new Control("111"),
+              {"one": new Control("111"), "nested": new ControlGroup({"two": new Control("222")})});
-            "nested": new ControlGroup({"two": new Control("222")})
-          });
         });
 
         it("should return a control if it is present", () => {

modules/angular2/test/mock/template_resolver_mock_spec.ts

@@ -42,10 +42,8 @@ export function main() {
 
       it('should not allow overriding a template after it has been resolved', () => {
         resolver.resolve(SomeComponent);
-        expect(() =>
+        expect(() => {
-               {
+          resolver.setView(SomeComponent, new viewImpl.View({template: 'overridden template'}));
-                 resolver.setView(SomeComponent,
-                                  new viewImpl.View({template: 'overridden template'}));
         })
             .toThrowError(
                 `The component ${stringify(SomeComponent)} has already been compiled, its configuration can not be changed`);
@@ -101,9 +99,9 @@ export function main() {
 
       it('should not allow overriding a directive after its template has been resolved', () => {
         resolver.resolve(SomeComponent);
-        expect(
+        expect(() => {
-            () =>
+          resolver.overrideViewDirective(SomeComponent, SomeDirective, SomeOtherDirective);
-            { resolver.overrideViewDirective(SomeComponent, SomeDirective, SomeOtherDirective); })
+        })
             .toThrowError(
                 `The component ${stringify(SomeComponent)} has already been compiled, its configuration can not be changed`);
       });

modules/angular2/test/render/dom/compiler/directive_parser_spec.ts

@@ -36,8 +36,7 @@ export function main() {
       if (isBlank(directives)) directives = annotatedDirectives;
 
       return new CompilePipeline([
-        new MockStep((parent, current, control) =>
+        new MockStep((parent, current, control) => {
-                     {
           if (isPresent(propertyBindings)) {
             StringMapWrapper.forEach(propertyBindings, (ast, name) => {
               current.bindElement().bindProperty(name, ast);

modules/angular2/test/render/dom/compiler/pipeline_spec.ts

@@ -39,12 +39,14 @@ export function main() {
 
     it('should inherit protoViewBuilders to children', () => {
       var element = el('<div><div><span viewroot><span></span></span></div></div>');
-      var pipeline = new CompilePipeline([new MockStep((parent, current, control) => {
+      var pipeline = new CompilePipeline([
+        new MockStep((parent, current, control) => {
           if (isPresent(DOM.getAttribute(current.element, 'viewroot'))) {
             current.inheritedProtoView =
                 new ProtoViewBuilder(current.element, ProtoViewDto.EMBEDDED_VIEW_TYPE);
           }
-      })]);
+        })
+      ]);
       var results = pipeline.process(element);
       expect(results[0].inheritedProtoView).toBe(results[1].inheritedProtoView);
       expect(results[2].inheritedProtoView).toBe(results[3].inheritedProtoView);
@@ -52,11 +54,13 @@ export function main() {
 
     it('should inherit elementBinderBuilders to children', () => {
       var element = el('<div bind><div><span bind><span></span></span></div></div>');
-      var pipeline = new CompilePipeline([new MockStep((parent, current, control) => {
+      var pipeline = new CompilePipeline([
+        new MockStep((parent, current, control) => {
           if (isPresent(DOM.getAttribute(current.element, 'bind'))) {
             current.bindElement();
           }
-      })]);
+        })
+      ]);
       var results = pipeline.process(element);
       expect(results[0].inheritedElementBinder).toBe(results[1].inheritedElementBinder);
       expect(results[2].inheritedElementBinder).toBe(results[3].inheritedElementBinder);
@@ -70,11 +74,13 @@ export function main() {
 
     it('should calculate distanceToParent / parent correctly', () => {
       var element = el('<div bind><div bind></div><div><div bind></div></div></div>');
-      var pipeline = new CompilePipeline([new MockStep((parent, current, control) => {
+      var pipeline = new CompilePipeline([
+        new MockStep((parent, current, control) => {
           if (isPresent(DOM.getAttribute(current.element, 'bind'))) {
             current.bindElement();
           }
-      })]);
+        })
+      ]);
       var results = pipeline.process(element);
       expect(results[0].inheritedElementBinder.distanceToParent).toBe(0);
       expect(results[1].inheritedElementBinder.distanceToParent).toBe(1);
@@ -101,8 +107,8 @@ export function main() {
         var element = el('<div id="1"><span wrap0="1" id="2"><b id="3"></b></span></div>');
         var step0Log = [];
         var step1Log = [];
-        var pipeline = new CompilePipeline(
+        var pipeline =
-            [createWrapperStep('wrap0', step0Log), createLoggerStep(step1Log)]);
+            new CompilePipeline([createWrapperStep('wrap0', step0Log), createLoggerStep(step1Log)]);
         var result = pipeline.process(element);
         expect(step0Log).toEqual(['1', '1<2', '2<3']);
         expect(step1Log).toEqual(['1', '1<wrap0#0', 'wrap0#0<2', '2<3']);
@@ -149,8 +155,8 @@ export function main() {
         var element = el('<div id="1"><span wrap0="2" id="2"><b id="3"></b></span></div>');
         var step0Log = [];
         var step1Log = [];
-        var pipeline = new CompilePipeline(
+        var pipeline =
-            [createWrapperStep('wrap0', step0Log), createLoggerStep(step1Log)]);
+            new CompilePipeline([createWrapperStep('wrap0', step0Log), createLoggerStep(step1Log)]);
         var result = pipeline.process(element);
         expect(step0Log).toEqual(['1', '1<2', '2<3']);
         expect(step1Log).toEqual(['1', '1<wrap0#0', 'wrap0#0<wrap0#1', 'wrap0#1<2', '2<3']);
@@ -165,8 +171,7 @@ export function main() {
         var resultLog = [];
         var newChild = new CompileElement(el('<div id="3"></div>'));
         var pipeline = new CompilePipeline([
-          new MockStep((parent, current, control) =>
+          new MockStep((parent, current, control) => {
-                       {
             if (StringWrapper.equals(DOM.getAttribute(current.element, 'id'), '1')) {
               control.addChild(newChild);
             }

modules/angular2/test/render/dom/compiler/property_binding_parser_spec.ts

@@ -15,8 +15,7 @@ export function main() {
   describe('PropertyBindingParser', () => {
     function createPipeline(hasNestedProtoView = false) {
       return new CompilePipeline([
-        new MockStep((parent, current, control) =>
+        new MockStep((parent, current, control) => {
-                     {
           if (hasNestedProtoView) {
             current.bindElement().bindNestedProtoView(el('<template></template>'));
           }

modules/angular2/test/render/dom/compiler/template_loader_spec.ts

@@ -52,8 +52,7 @@ export function main() {
          xhr.expect('base/foo', 'xhr template');
          var template = new ViewDefinition({absUrl: 'base/foo'});
          loader.load(template)
-             .then((el) =>
+             .then((el) => {
-                   {
                expect(DOM.content(el)).toHaveText('xhr template');
                firstEl = el;
                return loader.load(template);

modules/angular2/test/render/dom/dom_renderer_integration_spec.ts

@@ -58,8 +58,7 @@ export function main() {
        inject([AsyncTestCompleter, DomTestbed], (async, tb) => {
          tb.compileAll([
              someComponent,
-             new ViewDefinition(
+             new ViewDefinition({componentId: 'someComponent', template: 'hello', directives: []})
-                 {componentId: 'someComponent', template: 'hello', directives: []})
            ])
              .then((protoViewDtos) => {
                var rootView = tb.createRootView(protoViewDtos[0]);
@@ -74,8 +73,7 @@ export function main() {
     it('should update text nodes', inject([AsyncTestCompleter, DomTestbed], (async, tb) => {
          tb.compileAll([
              someComponent,
-             new ViewDefinition(
+             new ViewDefinition({componentId: 'someComponent', template: '{{a}}', directives: []})
-                 {componentId: 'someComponent', template: '{{a}}', directives: []})
            ])
              .then((protoViewDtos) => {
                var rootView = tb.createRootView(protoViewDtos[0]);

modules/angular2/test/render/dom/shadow_dom/light_dom_spec.ts

@@ -158,10 +158,11 @@ export function main() {
       it("should include view container nodes", () => {
         var lightDomEl = el("<div><template></template></div>");
         var lightDom = createLightDom(
-            new FakeView(
+            new FakeView([
-                [new FakeViewContainer(DOM.firstChild(lightDomEl),  // template element
+              new FakeViewContainer(DOM.firstChild(lightDomEl),  // template element
                                     [el('<a></a>')]  // light DOM nodes of view container
-                                       )]),
+                                    )
+            ]),
             null, lightDomEl);
 
         expect(toHtml(lightDom.expandedDomNodes())).toEqual(["<a></a>"]);
@@ -169,11 +170,13 @@ export function main() {
 
       it("should include content nodes", () => {
         var lightDomEl = el("<div><content></content></div>");
-        var lightDom = createLightDom(
+        var lightDom =
-            new FakeView([new FakeContentTag(DOM.firstChild(lightDomEl),  // content element
+            createLightDom(new FakeView([
+                             new FakeContentTag(DOM.firstChild(lightDomEl),  // content element
                                                 '',                          // selector
                                                 [el('<a></a>')]  // light DOM nodes of content tag
-                                             )]),
+                                                )
+                           ]),
                            null, lightDomEl);
 
         expect(toHtml(lightDom.expandedDomNodes())).toEqual(["<a></a>"]);

modules/angular2/test/render/dom/shadow_dom_emulation_integration_spec.ts

@@ -43,8 +43,8 @@ export function main() {
                              styleInliner, styleUrlResolver, null),
                          [StyleInliner, StyleUrlResolver]),
       "unscoped": bind(ShadowDomStrategy)
-                      .toFactory((styleUrlResolver) =>
+                      .toFactory((styleUrlResolver) => new EmulatedUnscopedShadowDomStrategy(
-                                     new EmulatedUnscopedShadowDomStrategy(styleUrlResolver, null),
+                                     styleUrlResolver, null),
                                  [StyleUrlResolver])
     };
     if (DOM.supportsNativeShadowDOM()) {
@@ -404,8 +404,8 @@ var mainDir =
 var simple = new DirectiveMetadata(
     {selector: 'simple', id: 'simple', type: DirectiveMetadata.COMPONENT_TYPE});
 
-var empty = new DirectiveMetadata(
+var empty =
-    {selector: 'empty', id: 'empty', type: DirectiveMetadata.COMPONENT_TYPE});
+    new DirectiveMetadata({selector: 'empty', id: 'empty', type: DirectiveMetadata.COMPONENT_TYPE});
 
 var dynamicComponent = new DirectiveMetadata(
     {selector: 'dynamic', id: 'dynamic', type: DirectiveMetadata.COMPONENT_TYPE});
@@ -425,11 +425,11 @@ var outerWithIndirectNestedComponent = new DirectiveMetadata({
   type: DirectiveMetadata.COMPONENT_TYPE
 });
 
-var outerComponent = new DirectiveMetadata(
+var outerComponent =
-    {selector: 'outer', id: 'outer', type: DirectiveMetadata.COMPONENT_TYPE});
+    new DirectiveMetadata({selector: 'outer', id: 'outer', type: DirectiveMetadata.COMPONENT_TYPE});
 
-var innerComponent = new DirectiveMetadata(
+var innerComponent =
-    {selector: 'inner', id: 'inner', type: DirectiveMetadata.COMPONENT_TYPE});
+    new DirectiveMetadata({selector: 'inner', id: 'inner', type: DirectiveMetadata.COMPONENT_TYPE});
 
 var innerInnerComponent = new DirectiveMetadata(
     {selector: 'innerinner', id: 'innerinner', type: DirectiveMetadata.COMPONENT_TYPE});

modules/angular2/test/router/outlet_spec.ts

@@ -46,8 +46,9 @@ export function main() {
       RouteRegistry,
       DirectiveResolver,
       bind(Location).toClass(SpyLocation),
-      bind(Router).toFactory((registry, pipeline, location) =>
+      bind(Router)
-                             { return new RootRouter(registry, pipeline, location, MyComp); },
+          .toFactory((registry, pipeline,
+                      location) => { return new RootRouter(registry, pipeline, location, MyComp); },
                      [RouteRegistry, Pipeline, Location])
     ]);
 
@@ -60,10 +61,10 @@ export function main() {
     }));
 
     function compile(template: string = "<router-outlet></router-outlet>") {
-      tb.overrideView(MyComp, new annotations.View({
+      tb.overrideView(
-        template: ('<div>' + template + '</div>'),
+          MyComp,
-        directives: [RouterOutlet, RouterLink]
+          new annotations.View(
-      }));
+              {template: ('<div>' + template + '</div>'), directives: [RouterOutlet, RouterLink]}));
       return tb.createView(MyComp, {context: ctx}).then((v) => { view = v; });
     }
 
@@ -84,8 +85,7 @@ export function main() {
          compile()
              .then((_) => rtr.config({'path': '/user/:name', 'component': UserCmp}))
              .then((_) => rtr.navigate('/user/brian'))
-             .then((_) =>
+             .then((_) => {
-                   {
                view.detectChanges();
                expect(view.rootNodes).toHaveText('hello brian');
              })
@@ -116,8 +116,7 @@ export function main() {
              .then((_) => rtr.config({'path': '/ab', 'components': {'left': A, 'right': B}}))
              .then((_) => rtr.config({'path': '/ba', 'components': {'left': B, 'right': A}}))
              .then((_) => rtr.navigate('/ab'))
-             .then((_) =>
+             .then((_) => {
-                   {
                view.detectChanges();
                expect(view.rootNodes).toHaveText('left { A } | right { B }');
              })
@@ -175,8 +174,7 @@ export function main() {
          compile()
              .then((_) => rtr.config({'path': '/team/:id', 'component': TeamCmp}))
              .then((_) => rtr.navigate('/team/angular/user/rado'))
-             .then((_) =>
+             .then((_) => {
-                   {
                view.detectChanges();
                expect(teamCmpCount).toBe(1);
                expect(view.rootNodes).toHaveText('team angular { hello rado }');

modules/angular2/test/router/router_spec.ts

@@ -34,8 +34,9 @@ export function main() {
       RouteRegistry,
       DirectiveResolver,
       bind(Location).toClass(SpyLocation),
-      bind(Router).toFactory((registry, pipeline, location) =>
+      bind(Router)
-                             { return new RootRouter(registry, pipeline, location, AppCmp); },
+          .toFactory((registry, pipeline,
+                      location) => { return new RootRouter(registry, pipeline, location, AppCmp); },
                      [RouteRegistry, Pipeline, Location])
     ]);
 
@@ -78,8 +79,7 @@ export function main() {
 
          router.registerOutlet(outlet)
              .then((_) => router.navigate('/a'))
-             .then((_) =>
+             .then((_) => {
-                   {
                expect(outlet.spy('activate')).not.toHaveBeenCalled();
                return router.config({'path': '/a', 'component': 'A'});
              })

modules/angular2/test/services/url_resolver_spec.ts

@@ -36,8 +36,7 @@ export function main() {
     });
 
     it('should ignore the base path when the url has a scheme',
-       () =>
+       () => {
-       {
          expect(resolver.resolve('http://www.foo.com', 'http://www.bar.com'))
              .toEqual('http://www.bar.com');
        })

modules/angular2_material/src/components/input/input.ts

@@ -58,11 +58,8 @@ export class MdInputContainer {
   selector: 'md-input-container input',
   events: ['mdChange', 'mdFocusChange'],
   hostProperties: {'yes': 'class.md-input'},
-  hostListeners: {
+  hostListeners:
-    'input': 'updateValue($event)',
+      {'input': 'updateValue($event)', 'focus': 'setHasFocus(true)', 'blur': 'setHasFocus(false)'}
-    'focus': 'setHasFocus(true)',
-    'blur': 'setHasFocus(false)'
-  }
 })
 export class MdInput {
   value: string;

modules/benchmarks/src/naive_infinite_scroll/index.ts

@@ -23,16 +23,14 @@ export function setupReflector() {
 
   // TODO(kegluneq): Generate this.
   reflector.registerSetters({
-    'style': (o, m) =>
+    'style': (o, m) => {
-             {
       // HACK
       MapWrapper.forEach(m, function(v, k) { o.style.setProperty(k, v); });
     }
   });
 
   reflector.registerMethods({
-    'onScroll': (o, args) =>
+    'onScroll': (o, args) => {
-                {
       // HACK
       o.onScroll(args[0]);
     },

modules/benchpress/src/firefox_extension/lib/main.ts

@@ -44,8 +44,7 @@ var data = require("sdk/self").data;
 mod.PageMod({
   include: ['*'],
   contentScriptFile: data.url("installed_script.js"),
-  onAttach: worker =>
+  onAttach: worker => {
-            {
     worker.port.on('startProfiler', () => startProfiler());
     worker.port.on('stopAndRecord', filePath => stopAndRecord(filePath));
     worker.port.on('forceGC', () => forceGC());

modules/benchpress/src/sample_description.ts

@@ -23,8 +23,8 @@ export class SampleDescription {
   toJson() { return {'id': this.id, 'description': this.description, 'metrics': this.metrics}; }
 }
 
-var _BINDINGS =
+var _BINDINGS = [
-    [bind(SampleDescription)
+  bind(SampleDescription)
       .toFactory((metric, id, forceGc, userAgent, validator, defaultDesc, userDesc) =>
                          new SampleDescription(id, [
                            {'forceGc': forceGc, 'userAgent': userAgent},
@@ -41,4 +41,5 @@ var _BINDINGS =
                    Validator,
                    Options.DEFAULT_DESCRIPTION,
                    Options.SAMPLE_DESCRIPTION
-                       ])];
+                 ])
+];

modules/benchpress/src/sampler.ts

@@ -95,8 +95,8 @@ export class SampleState {
   constructor(public completeSample: List<any>, public validSample: List<any>) {}
 }
 
-var _BINDINGS =
+var _BINDINGS = [
-    [bind(Sampler)
+  bind(Sampler)
       .toFactory((driver, metric, reporter, validator, prepare, execute, now) => new Sampler({
                    driver: driver,
                    reporter: reporter,
@@ -117,4 +117,5 @@ var _BINDINGS =
                    Options.PREPARE,
                    Options.EXECUTE,
                    Options.NOW
-                       ])];
+                 ])
+];

modules/benchpress/src/web_driver_extension.ts

@@ -20,8 +20,8 @@ export class WebDriverExtension {
                               ListWrapper.map(childTokens, (token) => injector.asyncGet(token))),
                           [Injector]),
       bind(WebDriverExtension)
-          .toFactory((children, capabilities) =>
+          .toFactory(
-                     {
+              (children, capabilities) => {
                 var delegate;
                 ListWrapper.forEach(children, (extension) => {
                   if (extension.supports(capabilities)) {
@@ -29,8 +29,7 @@ export class WebDriverExtension {
                   }
                 });
                 if (isBlank(delegate)) {
-                         throw new BaseException(
+                  throw new BaseException('Could not find a delegate for given capabilities!');
-                             'Could not find a delegate for given capabilities!');
                 }
                 return delegate;
               },

modules/benchpress/src/webdriver/chrome_driver_extension.ts

@@ -132,5 +132,7 @@ function normalizeEvent(chromeEvent: StringMap<string, any>,
   return result;
 }
 
-var _BINDINGS = [bind(ChromeDriverExtension)
+var _BINDINGS = [
-                     .toFactory((driver) => new ChromeDriverExtension(driver), [WebDriverAdapter])];
+  bind(ChromeDriverExtension)
+      .toFactory((driver) => new ChromeDriverExtension(driver), [WebDriverAdapter])
+];

modules/benchpress/src/webdriver/ios_driver_extension.ts

@@ -128,5 +128,7 @@ function createMarkEndEvent(name, time) {
   return createEvent('e', name, time);
 }
 
-var _BINDINGS = [bind(IOsDriverExtension)
+var _BINDINGS = [
-                     .toFactory((driver) => new IOsDriverExtension(driver), [WebDriverAdapter])];
+  bind(IOsDriverExtension)
+      .toFactory((driver) => new IOsDriverExtension(driver), [WebDriverAdapter])
+];

modules/benchpress/test/metric/perflog_metric_spec.ts

@@ -44,8 +44,7 @@ export function main() {
       PerflogMetric.BINDINGS,
       bind(Options.MICRO_METRICS).toValue(microMetrics),
       bind(PerflogMetric.SET_TIMEOUT)
-          .toValue((fn, millis) =>
+          .toValue((fn, millis) => {
-                   {
             ListWrapper.push(commandLog, ['setTimeout', millis]);
             fn();
           }),
@@ -125,12 +124,14 @@ export function main() {
 
       it('should mark and aggregate events in between the marks',
          inject([AsyncTestCompleter], (async) => {
-           var events = [[
+           var events = [
+             [
                eventFactory.markStart('benchpress0', 0),
                eventFactory.start('script', 4),
                eventFactory.end('script', 6),
                eventFactory.markEnd('benchpress0', 10)
-           ]];
+             ]
+           ];
            var metric = createMetric(events);
            metric.beginMeasure()
                .then((_) => metric.endMeasure(false))
@@ -224,8 +225,7 @@ export function main() {
            var metric = createMetric(events);
            metric.beginMeasure()
                .then((_) => metric.endMeasure(true))
-               .then((data) =>
+               .then((data) => {
-                     {
                  expect(data['scriptTime']).toBe(0);
                  return metric.endMeasure(true)
                })
@@ -247,7 +247,8 @@ export function main() {
       describe('with forced gc', () => {
         var events;
         beforeEach(() => {
-          events = [[
+          events = [
+            [
               eventFactory.markStart('benchpress0', 0),
               eventFactory.start('script', 4),
               eventFactory.end('script', 6),
@@ -256,7 +257,8 @@ export function main() {
               eventFactory.start('gc', 12, {'usedHeapSize': 2500}),
               eventFactory.end('gc', 15, {'usedHeapSize': 1000}),
               eventFactory.markEnd('benchpress1', 20)
-          ]];
+            ]
+          ];
         });
 
         it('should measure forced gc', inject([AsyncTestCompleter], (async) => {
@@ -359,14 +361,16 @@ export function main() {
       it('should ignore events from different processed as the start mark',
          inject([AsyncTestCompleter], (async) => {
            var otherProcessEventFactory = new TraceEventFactory('timeline', 'pid1');
-           var metric = createMetric([[
+           var metric = createMetric([
+             [
                eventFactory.markStart('benchpress0', 0),
                eventFactory.start('script', 0, null),
                eventFactory.end('script', 5, null),
                otherProcessEventFactory.start('script', 10, null),
                otherProcessEventFactory.end('script', 17, null),
                eventFactory.markEnd('benchpress0', 20)
-           ]]);
+             ]
+           ]);
            metric.beginMeasure()
                .then((_) => metric.endMeasure(false))
                .then((data) => {

modules/benchpress/test/reporter/json_file_reporter_spec.ts

@@ -30,8 +30,7 @@ export function main() {
         bind(JsonFileReporter.PATH).toValue(path),
         bind(Options.NOW).toValue(() => DateWrapper.fromMillis(1234)),
         bind(Options.WRITE_FILE)
-            .toValue((filename, content) =>
+            .toValue((filename, content) => {
-                     {
               loggedFile = {
                 'filename': filename,
                 'content': content
@@ -58,11 +57,13 @@ export function main() {
              .toEqual({
                "description":
                    {"id": "someId", "description": {"a": 2}, "metrics": {"script": "script time"}},
-               "completeSample": [{
+               "completeSample": [
+                 {
                    "timeStamp": "1970-01-01T00:00:00.000Z",
                    "runIndex": 0,
                    "values": {"a": 3, "b": 6}
-               }],
+                 }
+               ],
                "validSample": [
                  {
                    "timeStamp": "1970-01-01T00:00:00.000Z",

modules/benchpress/test/runner_spec.ts

@@ -36,8 +36,8 @@ export function main() {
       }
       runner = new Runner([
         defaultBindings,
-        bind(Sampler).toFactory((_injector) =>
+        bind(Sampler).toFactory(
-                                {
+            (_injector) => {
               injector = _injector;
               return new MockSampler();
             },
@@ -61,8 +61,7 @@ export function main() {
 
     it('should merge SampleDescription.description', inject([AsyncTestCompleter], (async) => {
          createRunner([bind(Options.DEFAULT_DESCRIPTION).toValue({'a': 1})])
-             .sample(
+             .sample({id: 'someId', bindings: [bind(Options.SAMPLE_DESCRIPTION).toValue({'b': 2})]})
-                 {id: 'someId', bindings: [bind(Options.SAMPLE_DESCRIPTION).toValue({'b': 2})]})
              .then((_) => injector.asyncGet(SampleDescription))
              .then((desc) => {
 

modules/benchpress/test/sampler_spec.ts

@@ -151,15 +151,14 @@ export function main() {
          var iterationCount = 1;
          createSampler({
            validator: createCountingValidator(2),
-           metric: new MockMetric([], () =>
+           metric: new MockMetric([],
-                                      {
+                                  () => {
                                     var result = PromiseWrapper.resolve({'script': scriptTime});
                                     scriptTime = 0;
                                     return result;
                                   }),
            prepare: () => { scriptTime = 1 * iterationCount; },
-           execute: () =>
+           execute: () => {
-                    {
              scriptTime = 10 * iterationCount;
              iterationCount++;
            }
@@ -192,11 +191,8 @@ export function main() {
 
            expect(log.length).toBe(2);
            expect(log[0]).toEqual(['validate', [mv(0, 1000, {'script': 0})], null]);
-           expect(log[1]).toEqual([
+           expect(log[1]).toEqual(
-             'validate',
+               ['validate', [mv(0, 1000, {'script': 0}), mv(1, 1001, {'script': 1})], validSample]);
-             [mv(0, 1000, {'script': 0}), mv(1, 1001, {'script': 1})],
-             validSample
-           ]);
 
            async.done();
          });

modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts

@@ -135,8 +135,10 @@ export function main() {
          }));
 
       it('should ignore FunctionCalls from webdriver', inject([AsyncTestCompleter], (async) => {
-           createExtension([chromeTimelineEvents.start(
+           createExtension([
-                               'FunctionCall', 0, {'data': {'scriptName': 'InjectedScript'}})])
+             chromeTimelineEvents.start('FunctionCall', 0,
+                                        {'data': {'scriptName': 'InjectedScript'}})
+           ])
                .readPerfLog()
                .then((events) => {
                  expect(events).toEqual([]);
@@ -270,8 +272,7 @@ class MockDriverAdapter extends WebDriverAdapter {
     if (type === 'performance') {
       return PromiseWrapper.resolve(this._events.map((event) => {
         return {
-          'message':
+          'message': Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
-              Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
         };
       }));
     } else {

modules/examples/src/forms/index.ts

@@ -181,8 +181,7 @@ class SurveyBuilder {
     // We are disabling the responseLength control when the question type is checkbox.
     var typeCtrl: Control = newQuestion.controls['type'];
 
-    ObservableWrapper.subscribe(typeCtrl.valueChanges,
+    ObservableWrapper.subscribe(typeCtrl.valueChanges, (v) => v == 'text' || v == 'textarea' ?
-                                (v) => v == 'text' || v == 'textarea' ?
                                                            newQuestion.include('responseLength') :
                                                            newQuestion.exclude('responseLength'));
 

npm-shrinkwrap.clean.json

@@ -4199,7 +4199,7 @@
           }
         },
         "clang-format": {
-          "version": "1.0.15"
+          "version": "1.0.17"
         }
       }
     },

npm-shrinkwrap.json

@@ -6488,9 +6488,9 @@
           }
         },
         "clang-format": {
-          "version": "1.0.15",
+          "version": "1.0.17",
-          "from": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.15.tgz",
+          "from": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.17.tgz",
-          "resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.15.tgz"
+          "resolved": "https://registry.npmjs.org/clang-format/-/clang-format-1.0.17.tgz"
         }
       }
     },

tools/broccoli/broccoli-typescript.ts

@@ -50,8 +50,7 @@ class DiffingTSCompiler implements DiffingBroccoliPlugin {
     let pathsToEmit = [];
     let pathsWithErrors = [];
 
-    treeDiff.changedPaths
+    treeDiff.changedPaths.forEach((tsFilePath) => {
-        .forEach((tsFilePath) => {
       if (!this.fileRegistry[tsFilePath]) {
         this.fileRegistry[tsFilePath] = {version: 0};
         this.rootFilePaths.push(tsFilePath);
@@ -62,8 +61,7 @@ class DiffingTSCompiler implements DiffingBroccoliPlugin {
       pathsToEmit.push(tsFilePath);
     });
 
-    treeDiff.removedPaths
+    treeDiff.removedPaths.forEach((tsFilePath) => {
-        .forEach((tsFilePath) => {
       console.log('removing outputs for', tsFilePath);
 
       this.rootFilePaths.splice(this.rootFilePaths.indexOf(tsFilePath), 1);
@@ -138,7 +136,8 @@ class DiffingTSCompiler implements DiffingBroccoliPlugin {
       allDiagnostics.forEach(diagnostic => {
         var {line, character} = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
         var message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-        errorMessages.push(`  ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
+        errorMessages.push(
+            `  ${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
       });
 
       if (errorMessages.length) {

tools/broccoli/tree-differ.spec.ts

@@ -110,8 +110,7 @@ describe('TreeDiffer', () => {
           'file-1.txt': mockfs.file({content: 'file-1.txt content', mtime: new Date(1000)}),
           'file-2.txt': mockfs.file({content: 'file-2.txt content', mtime: new Date(1000)}),
           'subdir-1': {
-            'file-1.1.txt':
+            'file-1.1.txt': mockfs.file({content: 'file-1.1.txt content', mtime: new Date(1000)})
-                mockfs.file({content: 'file-1.1.txt content', mtime: new Date(1000)})
           }
         },
         'symlinks': {

tools/broccoli/trees/node_tree.ts

@@ -84,11 +84,13 @@ module.exports = function makeNodeTree(destinationPath) {
   // TODO: remove this when we no longer use traceur
   var traceurCompatibleTsModulesTree = replace(modulesTree, {
     files: ['**/*.ts'],
-    patterns: [{
+    patterns: [
+      {
         // Empty replacement needed so that replaceWithPath gets triggered...
         match: /$/g,
         replacement: ""
-    }],
+      }
+    ],
     replaceWithPath: function(path, content) {
       if (!path.endsWith('.d.ts')) {
         content += '\r\nexport var __esModule = true;\n';
@@ -120,11 +122,13 @@ module.exports = function makeNodeTree(destinationPath) {
       return "var parse5Adapter = require('angular2/src/dom/parse5_adapter'); " +
              "parse5Adapter.Parse5DomAdapter.makeCurrent();" + content;
     },
-    patterns: [{
+    patterns: [
+      {
         // Append main() to all tests since all of our tests are wrapped in exported main fn
         match: /$/g,
         replacement: "\r\n main();"
-    }]
+      }
+    ]
   });
 
   return destCopy(nodeTree, destinationPath);