Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 7 additions & 19 deletions pkgs/html/lib/dom.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,6 @@ class FilteredElementList extends IterableBase<Element>

@override
void forEach(void Function(Element) action) {
// Preserve snapshot iteration when callbacks mutate the DOM.
_filtered.forEach(action);
}

Expand All @@ -1052,8 +1051,7 @@ class FilteredElementList extends IterableBase<Element>
}

@override
String join([String separator = '']) =>
_childNodes.whereType<Element>().join(separator);
String join([String separator = '']) => _filtered.join(separator);

@override
void add(Element element) {
Expand Down Expand Up @@ -1200,23 +1198,13 @@ class FilteredElementList extends IterableBase<Element>
}

@override
bool get isEmpty => _childNodes.whereType<Element>().isEmpty;
bool get isEmpty => _filtered.isEmpty;

@override
int get length => _childNodes.whereType<Element>().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<Element> get iterator => _filtered.iterator;
Expand All @@ -1241,13 +1229,13 @@ class FilteredElementList extends IterableBase<Element>
}

@override
Element get first => _childNodes.whereType<Element>().first;
Element get first => _filtered.first;

@override
Element get last => _childNodes.whereType<Element>().last;
Element get last => _filtered.last;

@override
Element get single => _childNodes.whereType<Element>().single;
Element get single => _filtered.single;
}

// http://dom.spec.whatwg.org/#dom-node-textcontent
Expand Down
35 changes: 0 additions & 35 deletions pkgs/html/test/dom_mutation_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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 = <Element>[];
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(','), '<html b>,<html i>');
});
}
7 changes: 0 additions & 7 deletions pkgs/markdown/test/util_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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()', () {
Expand All @@ -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');
});
});

Expand Down
Loading