chore: clang-format after various changes.

modules/angular2/src/compiler/compiler.ts

@@ -39,7 +39,8 @@ function _createCompilerConfig() {
  * A set of providers that provide `RuntimeCompiler` and its dependencies to use for
  * template compilation.
  */
-export const COMPILER_PROVIDERS: Array<any | Type | {[k: string]: any} | any[]> = /*@ts2dart_const*/ [
+export const COMPILER_PROVIDERS: Array<any | Type | {[k: string]: any} | any[]> =
+    /*@ts2dart_const*/[
       Lexer,
       Parser,
       HtmlParser,

modules/angular2/src/core/application_ref.ts

@@ -437,10 +437,8 @@ export class ApplicationRef_ extends ApplicationRef {
 export const PLATFORM_CORE_PROVIDERS =
     /*@ts2dart_const*/[
       PlatformRef_,
-      /*@ts2dart_const*/ (/* @ts2dart_Provider */ {
+      /*@ts2dart_const*/ (
-        provide: PlatformRef,
+          /* @ts2dart_Provider */ {provide: PlatformRef, useExisting: PlatformRef_})
-        useExisting: PlatformRef_
-      })
     ];
 
 /**

modules/angular2/src/platform/worker_app_common.ts

@@ -37,10 +37,8 @@ export const WORKER_APP_PLATFORM_MARKER =
 export const WORKER_APP_PLATFORM: Array<any /*Type | Provider | any[]*/> =
     /*@ts2dart_const*/[
       PLATFORM_COMMON_PROVIDERS,
-      /*@ts2dart_const*/ (/* @ts2dart_Provider */ {
+      /*@ts2dart_const*/ (
-        provide: WORKER_APP_PLATFORM_MARKER,
+          /* @ts2dart_Provider */ {provide: WORKER_APP_PLATFORM_MARKER, useValue: true})
-        useValue: true
-      })
     ];
 
 export const WORKER_APP_APPLICATION_COMMON: Array<any /*Type | Provider | any[]*/> =

modules/angular2/src/router/router_providers.ts

@@ -31,10 +31,8 @@ import {PlatformLocation} from 'angular2/platform/common';
  */
 export const ROUTER_PROVIDERS: any[] = /*@ts2dart_const*/[
   ROUTER_PROVIDERS_COMMON,
-  /*@ts2dart_const*/ (/* @ts2dart_Provider */ {
+  /*@ts2dart_const*/ (
-    provide: PlatformLocation,
+      /* @ts2dart_Provider */ {provide: PlatformLocation, useClass: BrowserPlatformLocation}),
-    useClass: BrowserPlatformLocation
-  }),
 ];
 
 /**

modules/angular2/test/core/di/reflective_injector_spec.ts

@@ -251,7 +251,8 @@ export function main() {
         expect(car).toBe(sportsCar);
       });
 
-      it('should support multiProviders', () => {
+      it(
+          'should support multiProviders', () => {
             var injector = createInjector([
           Engine,
           /* @ts2dart_Provider */ {provide: Car, useClass: SportsCar, multi: true},
@@ -264,10 +265,12 @@ export function main() {
             expect(cars[1]).toBeAnInstanceOf(CarWithOptionalEngine);
           });
 
-      it('should support multiProviders that are created using useExisting',
+      it('should support multiProviders that are created using useExisting', () => {
-         () => {
+        var injector = createInjector([
-           var injector = createInjector(
+          Engine,
-            [Engine, SportsCar, /* @ts2dart_Provider */ {provide: Car, useExisting: SportsCar, multi: true}]);
+          SportsCar,
+          /* @ts2dart_Provider */ {provide: Car, useExisting: SportsCar, multi: true}
+        ]);
 
         var cars = injector.get(Car);
         expect(cars.length).toEqual(1);
@@ -513,7 +516,8 @@ export function main() {
       });
     });
 
-    describe('resolve', () => {
+    describe('resolve',
+             () => {
                it('should resolve and flatten', () => {
                  var providers = ReflectiveInjector.resolve([Engine, [BrokenEngine]]);
                  providers.forEach(function(b) {
@@ -522,7 +526,8 @@ export function main() {
                  });
                });
 
-      it("should support multi providers", () => {
+               it("should support multi providers",
+                  () => {
                     var provider = ReflectiveInjector.resolve([
           /* @ts2dart_Provider */ {provide: Engine, useClass: BrokenEngine, multi: true},
           /* @ts2dart_Provider */ {provide: Engine, useClass: TurboEngine, multi: true}
@@ -534,7 +539,8 @@ export function main() {
                   });
 
 
-      it("should support providers as hash", () => {
+               it("should support providers as hash",
+                  () => {
                     var provider = ReflectiveInjector.resolve([
           /* @ts2dart_Provider */ {provide: Engine, useClass: BrokenEngine, multi: true},
           /* @ts2dart_Provider */ {provide: Engine, useClass: TurboEngine, multi: true}
@@ -547,11 +553,7 @@ export function main() {
 
                it("should support multi providers with only one provider", () => {
                  var provider = ReflectiveInjector.resolve([
-          /* @ts2dart_Provider */ {
+                   /* @ts2dart_Provider */ {provide: Engine, useClass: BrokenEngine, multi: true}
-            provide: Engine,
-            useClass: BrokenEngine,
-            multi: true
-          }
                  ])[0];
 
                  expect(provider.key.token).toBe(Engine);
@@ -559,27 +561,18 @@ export function main() {
                  expect(provider.resolvedFactories.length).toEqual(1);
                });
 
-      it("should throw when mixing multi providers with regular providers",
+               it("should throw when mixing multi providers with regular providers", () => {
-         () => {
                  expect(() => {
                    ReflectiveInjector.resolve([
-               /* @ts2dart_Provider */ {
+                     /* @ts2dart_Provider */ {provide: Engine, useClass: BrokenEngine, multi: true},
-                 provide: Engine,
-                 useClass: BrokenEngine,
-                 multi: true
-               },
                      Engine
                    ]);
-           })
+                 }).toThrowErrorWith("Cannot mix multi providers and regular providers");
-               .toThrowErrorWith(
-                   "Cannot mix multi providers and regular providers");
 
                  expect(() => {
                    ReflectiveInjector.resolve(
               [Engine, /* @ts2dart_Provider */ {provide: Engine, useClass: BrokenEngine, multi: true}]);
-           })
+                 }).toThrowErrorWith("Cannot mix multi providers and regular providers");
-               .toThrowErrorWith(
-                   "Cannot mix multi providers and regular providers");
                });
 
                it('should resolve forward references', () => {
@@ -595,14 +588,17 @@ export function main() {
                  var stringProvider = providers[2];
 
                  expect(engineProvider.resolvedFactories[0].factory() instanceof Engine).toBe(true);
-        expect(brokenEngineProvider.resolvedFactories[0].factory() instanceof Engine).toBe(true);
+                 expect(brokenEngineProvider.resolvedFactories[0].factory() instanceof Engine)
+                     .toBe(true);
                  expect(stringProvider.resolvedFactories[0].dependencies[0].key)
                      .toEqual(ReflectiveKey.get(Engine));
                });
 
-      it('should support overriding factory dependencies with dependency annotations', () => {
+               it('should support overriding factory dependencies with dependency annotations',
+                  () => {
                     var providers = ReflectiveInjector.resolve([
-          provide("token",
+                      provide(
+                          "token",
                           {
                             useFactory: (e) => "result",
                             deps: [[new InjectMetadata("dep"), new CustomDependencyMetadata()]]

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

@@ -2273,11 +2273,7 @@ class PublicApi {
 @Directive({
   selector: '[public-api]',
   providers: [
-    /* @ts2dart_Provider */ {
+    /* @ts2dart_Provider */ {provide: PublicApi, useExisting: PrivateImpl, deps: []}
-      provide: PublicApi,
-      useExisting: PrivateImpl,
-      deps: []
-    }
   ]
 })
 @Injectable()
@@ -2379,10 +2375,8 @@ class DirectiveProvidingInjectableInView {
 
 @Component({
   selector: 'directive-providing-injectable',
-  providers:
+  providers: [/* @ts2dart_Provider */ {provide: InjectableService, useValue: 'host'}],
-      [/* @ts2dart_Provider */ {provide: InjectableService, useValue: 'host'}],
+  viewProviders: [/* @ts2dart_Provider */ {provide: InjectableService, useValue: 'view'}],
-  viewProviders:
-      [/* @ts2dart_Provider */ {provide: InjectableService, useValue: 'view'}],
   template: ''
 })
 @Injectable()
@@ -2433,10 +2427,7 @@ class EventBus {
 @Directive({
   selector: 'grand-parent-providing-event-bus',
   providers: [
-    /* @ts2dart_Provider */ {
+    /* @ts2dart_Provider */ {provide: EventBus, useValue: new EventBus(null, "grandparent")}
-      provide: EventBus,
-      useValue: new EventBus(null, "grandparent")
-    }
   ]
 })
 class GrandParentProvidingEventBus {

tools/broccoli/trees/dart_tree.ts

@@ -71,7 +71,8 @@ function getSourceTree(options: AngularBuilderOptions) {
         '**/*.js',
         '**/*.ts',
         '**/*.dart'
-    ], [
+      ],
+      [
         'rollup-test/**/*',
         'angular1_router/**/*',
         'angular2/upgrade/**/*',