diff --git a/pkgs/html/lib/dom.dart b/pkgs/html/lib/dom.dart
index 583686ade..d7d8e98b1 100644
--- a/pkgs/html/lib/dom.dart
+++ b/pkgs/html/lib/dom.dart
@@ -1030,7 +1030,6 @@ class FilteredElementList extends IterableBase
@override
void forEach(void Function(Element) action) {
- // Preserve snapshot iteration when callbacks mutate the DOM.
_filtered.forEach(action);
}
@@ -1052,8 +1051,7 @@ class FilteredElementList extends IterableBase
}
@override
- String join([String separator = '']) =>
- _childNodes.whereType().join(separator);
+ String join([String separator = '']) => _filtered.join(separator);
@override
void add(Element element) {
@@ -1200,23 +1198,13 @@ class FilteredElementList extends IterableBase
}
@override
- bool get isEmpty => _childNodes.whereType().isEmpty;
+ bool get isEmpty => _filtered.isEmpty;
@override
- int get length => _childNodes.whereType().length;
+ int get length => _filtered.length;
@override
- Element operator [](int index) {
- if (index < 0) throw RangeError.index(index, this);
- var position = 0;
- for (final node in _childNodes) {
- if (node is Element) {
- if (position == index) return node;
- position++;
- }
- }
- throw RangeError.index(index, this);
- }
+ Element operator [](int index) => _filtered[index];
@override
Iterator get iterator => _filtered.iterator;
@@ -1241,13 +1229,13 @@ class FilteredElementList extends IterableBase
}
@override
- Element get first => _childNodes.whereType().first;
+ Element get first => _filtered.first;
@override
- Element get last => _childNodes.whereType().last;
+ Element get last => _filtered.last;
@override
- Element get single => _childNodes.whereType().single;
+ Element get single => _filtered.single;
}
// http://dom.spec.whatwg.org/#dom-node-textcontent
diff --git a/pkgs/html/test/dom_mutation_test.dart b/pkgs/html/test/dom_mutation_test.dart
index 23f9ef004..a06f1f19f 100644
--- a/pkgs/html/test/dom_mutation_test.dart
+++ b/pkgs/html/test/dom_mutation_test.dart
@@ -123,39 +123,4 @@ void main() {
expect(target.text, 'חדש' 'טקסט');
});
});
-
- test('children.forEach is safe when callbacks remove children', () {
- final parent = Element.tag('div');
- final one = Element.tag('b');
- final two = Element.tag('i');
- parent.nodes.addAll([one, Text('text'), two]);
- final visited = [];
- void visitAndRemove(Element child) {
- visited.add(child);
- child.remove();
- }
-
- parent.children.forEach(visitAndRemove);
- expect(visited, [one, two]);
- expect(parent.children, isEmpty);
- expect(one.parentNode, isNull);
- expect(two.parentNode, isNull);
- });
-
- test('live children traversal ignores non-elements and preserves order', () {
- final parent = Element.tag('div')
- ..append(Text('before'))
- ..append(Element.tag('b'))
- ..append(Comment('comment'))
- ..append(Element.tag('i'))
- ..append(Text('after'));
- expect(parent.children.length, 2);
- expect(parent.children.first.localName, 'b');
- expect(parent.children.last.localName, 'i');
- expect(parent.children.map((e) => e.localName), ['b', 'i']);
- expect(parent.children.reversed.map((e) => e.localName), ['i', 'b']);
- expect(parent.children[0].localName, 'b');
- expect(parent.children[1].localName, 'i');
- expect(parent.children.join(','), ',');
- });
}
diff --git a/pkgs/markdown/test/util_test.dart b/pkgs/markdown/test/util_test.dart
index 2c54e61bf..6db001b41 100644
--- a/pkgs/markdown/test/util_test.dart
+++ b/pkgs/markdown/test/util_test.dart
@@ -47,11 +47,6 @@ void main() {
expect(Line(input).isBlankLine, isFalse, reason: input);
}
});
-
- test('large blank and nonblank lines are classified correctly', () {
- expect(Line(' ' * 20000).isBlankLine, isTrue);
- expect(Line(' ' * 20000 + 'x').isBlankLine, isFalse);
- });
});
group('String.dedent()', () {
@@ -68,8 +63,6 @@ void main() {
expect(' text'.dedent().text, 'text');
expect('text'.dedent().text, 'text');
expect('\u00a0 text'.dedent().text, '\u00a0 text');
- expect(' \ttext'.dedent(0).text, ' \ttext');
- expect(' x'.dedent(-1).text, ' x');
});
});