Merge pull request flutter#68 from dart-lang/preview_dart_2_fix

fix an issue when run with --preview-dart-2

Author: devoncarew

.gitignore

@@ -1,5 +1,6 @@
 # Don’t commit the following directories created by pub.
 .pub
+.dart_tool/
 build/
 packages
 .packages

CHANGELOG.md

@@ -1,12 +1,17 @@
+## 0.13.3
+
+ * Update the signatures of `FilteredElementList.indexOf` and
+   `FilteredElementList.lastIndexOf` to include type annotations.
+
 ## 0.13.2+2
 
-* Update signature for implementations of `Iterable.singleWhere` to include 
-  optional argument.
-   
+ * Update signature for implementations of `Iterable.singleWhere` to include
+   optional argument.
+
 ## 0.13.2+1
 
-* Changed the implementation of `Set` and `List` classes to use base classes
-  from `dart:collection`.
+ * Changed the implementation of `Set` and `List` classes to use base classes
+   from `dart:collection`.
 
 ## 0.13.2
 

lib/dom.dart

@@ -969,11 +969,12 @@ class FilteredElementList extends IterableBase<Element>
       _filtered.getRange(start, end);
   // TODO(sigmund): this should be typed Element, but we currently run into a
   // bug where ListMixin<E>.indexOf() expects Object as the argument.
-  int indexOf(element, [int start = 0]) => _filtered.indexOf(element, start);
+  int indexOf(Object element, [int start = 0]) =>
+      _filtered.indexOf(element, start);
 
   // TODO(sigmund): this should be typed Element, but we currently run into a
   // bug where ListMixin<E>.lastIndexOf() expects Object as the argument.
-  int lastIndexOf(element, [int start]) {
+  int lastIndexOf(Object element, [int start]) {
     if (start == null) start = length - 1;
     return _filtered.lastIndexOf(element, start);
   }