refactor: code cleanup

Closes dart-archive#1061

Author: vicb

lib/core/annotation_src.dart

@@ -15,8 +15,7 @@ typedef void DirectiveBinderFn(DirectiveBinder module);
 
 RegExp _ATTR_NAME = new RegExp(r'\[([^\]]+)\]$');
 
-Directive cloneWithNewMap(Directive annotation, map)
-    => annotation._cloneWithNewMap(map);
+Directive cloneWithNewMap(Directive annotation, map) => annotation._cloneWithNewMap(map);
 
 String mappingSpec(DirectiveAnnotation annotation) => annotation._mappingSpec;
 
@@ -219,7 +218,8 @@ abstract class Directive {
     this.exportExpressionAttrs: const []
   });
 
-  toString() => selector;
+  String toString() => selector;
+
   Directive _cloneWithNewMap(newMap);
 }
 

lib/core/formatter.dart

@@ -24,7 +24,7 @@ class FormatterMap {
     });
   }
 
-  call(String name) => _injector.get(this[name]);
+  Function call(String name) => _injector.get(this[name]);
 
   Type operator[](String name) {
     Type formatterType = _map[name];

lib/core/interpolate.dart

@@ -61,8 +61,7 @@ class Interpolate implements Function {
           // formatter
           expParts.add(_wrapInQuotes(template.substring(index, startIdx)));
         }
-        expParts.add('(' + template.substring(startIdx + startLen, endIdx) +
-        '|stringify)');
+        expParts.add('(' + template.substring(startIdx + startLen, endIdx) + '|stringify)');
 
         index = endIdx + endLen;
         hasInterpolation = true;

lib/core/scope.dart

@@ -217,7 +217,7 @@ class Scope {
       } else if (expression.startsWith(':')) {
         expression = expression.substring(1);
         fn = (value, last) {
-          if (value != null)  reactionFn(value, last);
+          if (value != null) reactionFn(value, last);
         };
       }
     }

lib/core_dom/common.dart

@@ -1,8 +1,6 @@
 part of angular.core.dom_internal;
 
-List<dom.Node> cloneElements(elements) {
-  return elements.map((el) => el.clone(true)).toList();
-}
+List<dom.Node> cloneElements(elements) => elements.map((el) => el.clone(true)).toList();
 
 class MappingParts {
   final String attrName;
@@ -23,7 +21,7 @@ class DirectiveRef {
   final Directive annotation;
   final String value;
   final AST valueAST;
-  final mappings = new List<MappingParts>();
+  final mappings = <MappingParts>[];
 
   DirectiveRef(this.element, type, this.annotation, this.typeKey, [ this.value, this.valueAST ])
       : type = type,

lib/core_dom/directive_map.dart

@@ -4,13 +4,13 @@ class DirectiveTypeTuple {
   final Directive directive;
   final Type type;
   DirectiveTypeTuple(this.directive, this.type);
-  toString() => '@$directive#$type';
+  String toString() => '@$directive#$type';
 }
 
 @Injectable()
 class DirectiveMap {
   final Map<String, List<DirectiveTypeTuple>> map = new HashMap<String, List<DirectiveTypeTuple>>();
-  DirectiveSelectorFactory _directiveSelectorFactory;
+  final DirectiveSelectorFactory _directiveSelectorFactory;
   FormatterMap _formatters;
   DirectiveSelector _selector;
 
@@ -20,10 +20,10 @@ class DirectiveMap {
                this._directiveSelectorFactory) {
     (injector as ModuleInjector).types.forEach((type) {
       metadataExtractor(type)
-      .where((annotation) => annotation is Directive)
-      .forEach((Directive directive) {
-        map.putIfAbsent(directive.selector, () => []).add(new DirectiveTypeTuple(directive, type));
-      });
+          .where((annotation) => annotation is Directive)
+          .forEach((Directive dir) {
+            map.putIfAbsent(dir.selector, () => []).add(new DirectiveTypeTuple(dir, type));
+          });
     });
   }
 
@@ -39,8 +39,8 @@ class DirectiveMap {
   }
 
   void forEach(fn(K, Type)) {
-    map.forEach((_, types) {
-      types.forEach((tuple) {
+    map.values.forEach((List<DirectiveTypeTuple> types) {
+      types.forEach((DirectiveTypeTuple tuple) {
         fn(tuple.directive, tuple.type);
       });
     });

lib/core_dom/element_binder.dart

@@ -91,7 +91,7 @@ class ElementBinder {
     }
   }
 
-  _bindOneWay(tasks, ast, scope, AST dstAST, controller) {
+  void _bindOneWay(tasks, ast, scope, AST dstAST, controller) {
     var taskId = (tasks != null) ? tasks.registerTask() : 0;
 
     scope.watchAST(ast, (v, _) {

lib/core_dom/node_cursor.dart

@@ -45,5 +45,5 @@ class NodeCursor {
 
   NodeCursor remove() => new NodeCursor([elements.removeAt(index)..remove()]);
 
-  toString() => "[NodeCursor: $elements $index]";
+  String toString() => "[NodeCursor: $elements $index]";
 }