refactor: remove ts2dart annotations

modules/@angular/forms/src/directives.ts

@@ -44,18 +44,17 @@ export {NgSelectOption, SelectControlValueAccessor} from './directives/select_co
 export {NgSelectMultipleOption, SelectMultipleControlValueAccessor} from './directives/select_multiple_control_value_accessor';
 export {MaxLengthValidator, MinLengthValidator, PatternValidator, RequiredValidator} from './directives/validators';
 
-export const SHARED_FORM_DIRECTIVES: Type[] = /*@ts2dart_const*/[
+export const SHARED_FORM_DIRECTIVES: Type[] = [
   NgSelectOption, NgSelectMultipleOption, DefaultValueAccessor, NumberValueAccessor,
   CheckboxControlValueAccessor, SelectControlValueAccessor, SelectMultipleControlValueAccessor,
   RadioControlValueAccessor, NgControlStatus, RequiredValidator, MinLengthValidator,
   MaxLengthValidator, PatternValidator
 ];
 
-export const TEMPLATE_DRIVEN_DIRECTIVES: Type[] = /*@ts2dart_const*/[NgModel, NgModelGroup, NgForm];
+export const TEMPLATE_DRIVEN_DIRECTIVES: Type[] = [NgModel, NgModelGroup, NgForm];
 
-export const REACTIVE_DRIVEN_DIRECTIVES: Type[] = /*@ts2dart_const*/[
-  FormControlDirective, FormGroupDirective, FormControlName, FormGroupName, FormArrayName
-];
+export const REACTIVE_DRIVEN_DIRECTIVES: Type[] =
+    [FormControlDirective, FormGroupDirective, FormControlName, FormGroupName, FormArrayName];
 
 /**
  *
@@ -74,15 +73,14 @@ export const REACTIVE_DRIVEN_DIRECTIVES: Type[] = /*@ts2dart_const*/[
  * ```
  * @experimental
  */
-export const FORM_DIRECTIVES: Type[][] =
-    /*@ts2dart_const*/[TEMPLATE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
+export const FORM_DIRECTIVES: Type[][] = [TEMPLATE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
 
 /**
  * @experimental
  */
 
 export const REACTIVE_FORM_DIRECTIVES: Type[][] =
-    /*@ts2dart_const*/[REACTIVE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
+    [REACTIVE_DRIVEN_DIRECTIVES, SHARED_FORM_DIRECTIVES];
 
 /**
  * Internal module used for sharing directives between FormsModule and ReactiveFormsModule

modules/@angular/forms/src/directives/checkbox_value_accessor.ts

@@ -10,7 +10,7 @@ import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core';
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const CHECKBOX_VALUE_ACCESSOR: any = /*@ts2dart_const*/ {
+export const CHECKBOX_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => CheckboxControlValueAccessor),
   multi: true

modules/@angular/forms/src/directives/control_value_accessor.ts

@@ -41,5 +41,4 @@ export interface ControlValueAccessor {
  * See {@link DefaultValueAccessor} for how to implement one.
  * @experimental
  */
-export const NG_VALUE_ACCESSOR: OpaqueToken =
-    /*@ts2dart_const*/ new OpaqueToken('NgValueAccessor');
+export const NG_VALUE_ACCESSOR: OpaqueToken = new OpaqueToken('NgValueAccessor');

modules/@angular/forms/src/directives/default_value_accessor.ts

@@ -12,12 +12,11 @@ import {isBlank} from '../facade/lang';
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const DEFAULT_VALUE_ACCESSOR: any = /*@ts2dart_const*/
-    /* @ts2dart_Provider */ {
-      provide: NG_VALUE_ACCESSOR,
-      useExisting: forwardRef(() => DefaultValueAccessor),
-      multi: true
-    };
+export const DEFAULT_VALUE_ACCESSOR: any = {
+  provide: NG_VALUE_ACCESSOR,
+  useExisting: forwardRef(() => DefaultValueAccessor),
+  multi: true
+};
 
 /**
  * The default accessor for writing a value and listening to changes that is used by the

modules/@angular/forms/src/directives/ng_form.ts

@@ -21,8 +21,10 @@ import {NgModel} from './ng_model';
 import {NgModelGroup} from './ng_model_group';
 import {composeAsyncValidators, composeValidators, setUpControl, setUpFormContainer} from './shared';
 
-export const formDirectiveProvider: any =
-    /*@ts2dart_const*/ {provide: ControlContainer, useExisting: forwardRef(() => NgForm)};
+export const formDirectiveProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => NgForm)
+};
 
 /**
  * If `NgForm` is bound in a component, `<form>` elements in that component will be

modules/@angular/forms/src/directives/ng_model.ts

@@ -23,11 +23,10 @@ import {composeAsyncValidators, composeValidators, controlPath, isPropertyUpdate
 import {TemplateDrivenErrors} from './template_driven_errors';
 import {AsyncValidatorFn, ValidatorFn} from './validators';
 
-export const formControlBinding: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: NgControl,
-      useExisting: forwardRef(() => NgModel)
-    };
+export const formControlBinding: any = {
+  provide: NgControl,
+  useExisting: forwardRef(() => NgModel)
+};
 
 /**
  * Binds a domain model to a form control.

modules/@angular/forms/src/directives/ng_model_group.ts

@@ -16,11 +16,10 @@ import {ControlContainer} from './control_container';
 import {NgForm} from './ng_form';
 import {TemplateDrivenErrors} from './template_driven_errors';
 
-export const modelGroupProvider: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: ControlContainer,
-      useExisting: forwardRef(() => NgModelGroup)
-    };
+export const modelGroupProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => NgModelGroup)
+};
 
 /**
  * Creates and binds a model group to a DOM element.

modules/@angular/forms/src/directives/number_value_accessor.ts

@@ -12,7 +12,7 @@ import {NumberWrapper, isBlank} from '../facade/lang';
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const NUMBER_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const NUMBER_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => NumberValueAccessor),
   multi: true

modules/@angular/forms/src/directives/radio_control_value_accessor.ts

@@ -15,7 +15,7 @@ import {isPresent} from '../facade/lang';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 import {NgControl} from './ng_control';
 
-export const RADIO_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const RADIO_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => RadioControlValueAccessor),
   multi: true

modules/@angular/forms/src/directives/reactive_directives/form_array_name.ts

@@ -19,11 +19,10 @@ import {AsyncValidatorFn, ValidatorFn} from '../validators';
 import {FormGroupDirective} from './form_group_directive';
 import {FormGroupName} from './form_group_name';
 
-export const formArrayNameProvider: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: ControlContainer,
-      useExisting: forwardRef(() => FormArrayName)
-    };
+export const formArrayNameProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => FormArrayName)
+};
 
 /**
  * Syncs an existing form array to a DOM element.

modules/@angular/forms/src/directives/reactive_directives/form_control_directive.ts

@@ -18,11 +18,10 @@ import {NgControl} from '../ng_control';
 import {composeAsyncValidators, composeValidators, isPropertyUpdated, selectValueAccessor, setUpControl} from '../shared';
 import {AsyncValidatorFn, ValidatorFn} from '../validators';
 
-export const formControlBinding: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: NgControl,
-      useExisting: forwardRef(() => FormControlDirective)
-    };
+export const formControlBinding: any = {
+  provide: NgControl,
+  useExisting: forwardRef(() => FormControlDirective)
+};
 
 /**
  * Binds an existing {@link FormControl} to a DOM element.

modules/@angular/forms/src/directives/reactive_directives/form_control_name.ts

@@ -25,11 +25,10 @@ import {FormGroupDirective} from './form_group_directive';
 import {FormGroupName} from './form_group_name';
 
 
-export const controlNameBinding: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: NgControl,
-      useExisting: forwardRef(() => FormControlName)
-    };
+export const controlNameBinding: any = {
+  provide: NgControl,
+  useExisting: forwardRef(() => FormControlName)
+};
 
 /**
  * Syncs an existing form control with the specified name to a DOM element.

modules/@angular/forms/src/directives/reactive_directives/form_group_directive.ts

@@ -23,11 +23,10 @@ import {composeAsyncValidators, composeValidators, setUpControl, setUpFormContai
 import {FormArrayName} from './form_array_name';
 import {FormGroupName} from './form_group_name';
 
-export const formDirectiveProvider: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: ControlContainer,
-      useExisting: forwardRef(() => FormGroupDirective)
-    };
+export const formDirectiveProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => FormGroupDirective)
+};
 
 /**
  * Binds an existing form group to a DOM element.

modules/@angular/forms/src/directives/reactive_directives/form_group_name.ts

@@ -16,11 +16,10 @@ import {ReactiveErrors} from '../reactive_errors';
 
 import {FormGroupDirective} from './form_group_directive';
 
-export const formGroupNameProvider: any =
-    /*@ts2dart_const*/ /* @ts2dart_Provider */ {
-      provide: ControlContainer,
-      useExisting: forwardRef(() => FormGroupName)
-    };
+export const formGroupNameProvider: any = {
+  provide: ControlContainer,
+  useExisting: forwardRef(() => FormGroupName)
+};
 
 /**
  * Syncs an existing form group to a DOM element.

modules/@angular/forms/src/directives/select_control_value_accessor.ts

@@ -13,7 +13,7 @@ import {StringWrapper, isBlank, isPresent, isPrimitive, looseIdentical} from '..
 
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor';
 
-export const SELECT_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const SELECT_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => SelectControlValueAccessor),
   multi: true

modules/@angular/forms/src/directives/validators.ts

@@ -35,9 +35,9 @@ import {NG_VALIDATORS, Validators} from '../validators';
  */
 export interface Validator { validate(c: AbstractControl): {[key: string]: any}; }
 
-const REQUIRED = /*@ts2dart_const*/ Validators.required;
+const REQUIRED = Validators.required;
 
-export const REQUIRED_VALIDATOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const REQUIRED_VALIDATOR: any = {
   provide: NG_VALIDATORS,
   useValue: REQUIRED,
   multi: true
@@ -81,7 +81,7 @@ export interface AsyncValidatorFn {
  *
  * {@example common/forms/ts/validators/validators.ts region='min'}
  */
-export const MIN_LENGTH_VALIDATOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const MIN_LENGTH_VALIDATOR: any = {
   provide: NG_VALIDATORS,
   useExisting: forwardRef(() => MinLengthValidator),
   multi: true
@@ -114,7 +114,7 @@ export class MinLengthValidator implements Validator {
  *
  * {@example common/forms/ts/validators/validators.ts region='max'}
  */
-export const MAX_LENGTH_VALIDATOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const MAX_LENGTH_VALIDATOR: any = {
   provide: NG_VALIDATORS,
   useExisting: forwardRef(() => MaxLengthValidator),
   multi: true
@@ -142,7 +142,7 @@ export class MaxLengthValidator implements Validator {
 }
 
 
-export const PATTERN_VALIDATOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ {
+export const PATTERN_VALIDATOR: any = {
   provide: NG_VALIDATORS,
   useExisting: forwardRef(() => PatternValidator),
   multi: true

modules/@angular/forms/src/form_providers.ts

@@ -18,14 +18,13 @@ import {FormBuilder} from './form_builder';
  * Shorthand set of providers used for building Angular forms.
  * @experimental
  */
-export const FORM_PROVIDERS: Type[] = /*@ts2dart_const*/[RadioControlRegistry];
+export const FORM_PROVIDERS: Type[] = [RadioControlRegistry];
 
 /**
  * Shorthand set of providers used for building reactive Angular forms.
  * @experimental
  */
-export const REACTIVE_FORM_PROVIDERS: Type[] =
-    /*@ts2dart_const*/[FormBuilder, RadioControlRegistry];
+export const REACTIVE_FORM_PROVIDERS: Type[] = [FormBuilder, RadioControlRegistry];
 
 /**
  * The ng module for forms.

modules/@angular/forms/src/validators.ts

@@ -24,7 +24,7 @@ import {AbstractControl} from './model';
  * {@example core/forms/ts/ng_validators/ng_validators.ts region='ng_validators'}
  * @experimental
  */
-export const NG_VALIDATORS: OpaqueToken = /*@ts2dart_const*/ new OpaqueToken('NgValidators');
+export const NG_VALIDATORS: OpaqueToken = new OpaqueToken('NgValidators');
 
 /**
  * Providers for asynchronous validators to be used for {@link FormControl}s
@@ -36,8 +36,7 @@ export const NG_VALIDATORS: OpaqueToken = /*@ts2dart_const*/ new OpaqueToken('Ng
  *
  * @experimental
  */
-export const NG_ASYNC_VALIDATORS: OpaqueToken =
-    /*@ts2dart_const*/ new OpaqueToken('NgAsyncValidators');
+export const NG_ASYNC_VALIDATORS: OpaqueToken = new OpaqueToken('NgAsyncValidators');
 
 /**
  * Provides a set of validators used by form controls.

modules/@angular/forms/test/model_spec.ts

@@ -15,7 +15,7 @@ import {isPresent} from '../src/facade/lang';
 import {PromiseWrapper} from '../src/facade/promise';
 
 export function main() {
-  function asyncValidator(expected: any /** TODO #9100 */, timeouts = /*@ts2dart_const*/ {}) {
+  function asyncValidator(expected: any /** TODO #9100 */, timeouts = {}) {
     return (c: any /** TODO #9100 */) => {
       var completer = PromiseWrapper.completer();
       var t = isPresent((timeouts as any /** TODO #9100 */)[c.value]) ?

modules/@angular/forms/test/reactive_integration_spec.ts

@@ -1455,13 +1455,7 @@ function loginIsEmptyGroupValidator(c: FormGroup) {
 
 @Directive({
   selector: '[login-is-empty-validator]',
-  providers: [
-    /* @ts2dart_Provider */ {
-      provide: NG_VALIDATORS,
-      useValue: loginIsEmptyGroupValidator,
-      multi: true
-    }
-  ]
+  providers: [{provide: NG_VALIDATORS, useValue: loginIsEmptyGroupValidator, multi: true}]
 })
 class LoginIsEmptyValidator {
 }