Skip to content

Commit 5f19b47

Browse files
committed
refactor(dccd): some renaming to clarify the intent
1 parent 21ae4e3 commit 5f19b47

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

lib/change_detection/dirty_checking_change_detector.dart

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -871,11 +871,11 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
871871
Iterable _iterable;
872872
int _length;
873873

874-
/// Keeps track of moved items.
875-
DuplicateMap _movedItems;
874+
/// Keeps track of the used records at any point in time (during & across `_check()` calls)
875+
DuplicateMap _linkedRecords;
876876

877-
/// Keeps track of removed items.
878-
DuplicateMap _removedItems;
877+
/// Keeps track of the removed records at any point in time during `_check()` calls.
878+
DuplicateMap _unlinkedRecords;
879879

880880
ItemRecord<V> _previousItHead;
881881
ItemRecord<V> _itHead, _itTail;
@@ -886,7 +886,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
886886
void _revertToPreviousState() {
887887
if (!isDirty) return;
888888

889-
if (_movedItems != null) _movedItems.clear();
889+
if (_linkedRecords != null) _linkedRecords.clear();
890890
ItemRecord<V> prev;
891891
int i = 0;
892892

@@ -897,8 +897,8 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
897897
record._prev = prev;
898898
if (prev != null) prev._next = prev._nextPrevious = record;
899899

900-
if (_movedItems == null) _movedItems = new DuplicateMap();
901-
_movedItems.put(record);
900+
if (_linkedRecords == null) _linkedRecords = new DuplicateMap();
901+
_linkedRecords.put(record);
902902
}
903903

904904
prev._next = null;
@@ -1063,13 +1063,13 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
10631063
}
10641064

10651065
// Attempt to see if we have seen the item before.
1066-
record = _movedItems == null ? null : _movedItems.get(item, index);
1066+
record = _linkedRecords == null ? null : _linkedRecords.get(item, index);
10671067
if (record != null) {
10681068
// We have seen this before, we need to move it forward in the collection.
10691069
_moveAfter(record, previousRecord, index);
10701070
} else {
10711071
// Never seen it, check evicted list.
1072-
record = _removedItems == null ? null : _removedItems.get(item);
1072+
record = _unlinkedRecords == null ? null : _unlinkedRecords.get(item);
10731073
if (record != null) {
10741074
// It is an item which we have evicted earlier: reinsert it back into the list.
10751075
_reinsertAfter(record, previousRecord, index);
@@ -1108,7 +1108,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11081108
* of 'b' rather then switch 'a' with 'b' and then add 'a' at the end.
11091109
*/
11101110
ItemRecord<V> verifyReinsertion(ItemRecord record, item, int index) {
1111-
ItemRecord<V> reinsertRecord = _removedItems == null ? null : _removedItems.get(item);
1111+
ItemRecord<V> reinsertRecord = _unlinkedRecords == null ? null : _unlinkedRecords.get(item);
11121112
if (reinsertRecord != null) {
11131113
record = _reinsertAfter(reinsertRecord, record._prev, index);
11141114
} else if (record.currentIndex != index) {
@@ -1130,7 +1130,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11301130
_addToRemovals(_unlink(record));
11311131
record = nextRecord;
11321132
}
1133-
if (_removedItems != null) _removedItems.clear();
1133+
if (_unlinkedRecords != null) _unlinkedRecords.clear();
11341134

11351135
if (_additionsTail != null) _additionsTail._nextAdded = null;
11361136
if (_movesTail != null) _movesTail._nextMoved = null;
@@ -1139,7 +1139,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11391139
}
11401140

11411141
ItemRecord<V> _reinsertAfter(ItemRecord<V> record, ItemRecord<V> prevRecord, int index) {
1142-
if (_removedItems != null) _removedItems.remove(record);
1142+
if (_unlinkedRecords != null) _unlinkedRecords.remove(record);
11431143
var prev = record._prevRemoved;
11441144
var next = record._nextRemoved;
11451145

@@ -1201,17 +1201,17 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
12011201
prevRecord._next = record;
12021202
}
12031203

1204-
if (_movedItems == null) _movedItems = new DuplicateMap();
1204+
if (_linkedRecords == null) _linkedRecords = new DuplicateMap();
1205+
_linkedRecords.put(record);
12051206

1206-
_movedItems.put(record);
12071207
record.currentIndex = index;
12081208
return record;
12091209
}
12101210

12111211
ItemRecord<V> _remove(ItemRecord record) => _addToRemovals(_unlink(record));
12121212

12131213
ItemRecord<V> _unlink(ItemRecord record) {
1214-
if (_movedItems != null) _movedItems.remove(record);
1214+
if (_linkedRecords != null) _linkedRecords.remove(record);
12151215

12161216
var prev = record._prev;
12171217
var next = record._next;
@@ -1250,8 +1250,8 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
12501250
}
12511251

12521252
ItemRecord<V> _addToRemovals(ItemRecord<V> record) {
1253-
if (_removedItems == null) _removedItems = new DuplicateMap();
1254-
_removedItems.put(record);
1253+
if (_unlinkedRecords == null) _unlinkedRecords = new DuplicateMap();
1254+
_unlinkedRecords.put(record);
12551255
record.currentIndex = null;
12561256
record._nextRemoved = null;
12571257

0 commit comments

Comments
 (0)