From 7bd1849531393b9df2015decf6856352b4df7ba6 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Fri, 9 Mar 2018 15:46:05 -0800 Subject: [PATCH 1/3] fix an issue when run with --preview-dart-2 --- CHANGELOG.md | 2 +- lib/dom.dart | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 029212352279c..bc2e054ce8c2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ * 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 diff --git a/lib/dom.dart b/lib/dom.dart index df9655e170d5a..8a8f74dfc46ef 100644 --- a/lib/dom.dart +++ b/lib/dom.dart @@ -969,11 +969,11 @@ class FilteredElementList extends IterableBase _filtered.getRange(start, end); // TODO(sigmund): this should be typed Element, but we currently run into a // bug where ListMixin.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.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); } From beb0b0ddff68da15a12497779c484ade31b4a604 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Fri, 9 Mar 2018 15:55:15 -0800 Subject: [PATCH 2/3] dartfmt --- lib/dom.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/dom.dart b/lib/dom.dart index 8a8f74dfc46ef..2e57f64763749 100644 --- a/lib/dom.dart +++ b/lib/dom.dart @@ -969,7 +969,8 @@ class FilteredElementList extends IterableBase _filtered.getRange(start, end); // TODO(sigmund): this should be typed Element, but we currently run into a // bug where ListMixin.indexOf() expects Object as the argument. - int indexOf(Object 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.lastIndexOf() expects Object as the argument. From 9dd8d8de7b4688e3ca6b9c5f6561122048406fa4 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Fri, 9 Mar 2018 16:01:40 -0800 Subject: [PATCH 3/3] update the changelog --- .gitignore | 1 + CHANGELOG.md | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f20a0d08751eb..3ab3a44931d94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Don’t commit the following directories created by pub. .pub +.dart_tool/ build/ packages .packages diff --git a/CHANGELOG.md b/CHANGELOG.md index bc2e054ce8c2b..25215a12b890e 100644 --- a/CHANGELOG.md +++ b/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