Skip to content
This repository was archived by the owner on Feb 22, 2018. It is now read-only.

Commit d97788c

Browse files
vicbchirayuk
authored andcommitted
refactor(dccd): some renaming to clarify the intent
Closes #1129
1 parent 2acaa10 commit d97788c

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
@@ -858,11 +858,11 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
858858
Iterable _iterable;
859859
int _length;
860860

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

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

867867
ItemRecord<V> _previousItHead;
868868
ItemRecord<V> _itHead, _itTail;
@@ -873,7 +873,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
873873
void _revertToPreviousState() {
874874
if (!isDirty) return;
875875

876-
if (_movedItems != null) _movedItems.clear();
876+
if (_linkedRecords != null) _linkedRecords.clear();
877877
ItemRecord<V> prev;
878878
int i = 0;
879879

@@ -884,8 +884,8 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
884884
record._prev = prev;
885885
if (prev != null) prev._next = prev._nextPrevious = record;
886886

887-
if (_movedItems == null) _movedItems = new DuplicateMap();
888-
_movedItems.put(record);
887+
if (_linkedRecords == null) _linkedRecords = new DuplicateMap();
888+
_linkedRecords.put(record);
889889
}
890890

891891
prev._next = null;
@@ -1036,13 +1036,13 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
10361036
}
10371037

10381038
// Attempt to see if we have seen the item before.
1039-
record = _movedItems == null ? null : _movedItems.get(item, index);
1039+
record = _linkedRecords == null ? null : _linkedRecords.get(item, index);
10401040
if (record != null) {
10411041
// We have seen this before, we need to move it forward in the collection.
10421042
_moveAfter(record, previousRecord, index);
10431043
} else {
10441044
// Never seen it, check evicted list.
1045-
record = _removedItems == null ? null : _removedItems.get(item);
1045+
record = _unlinkedRecords == null ? null : _unlinkedRecords.get(item);
10461046
if (record != null) {
10471047
// It is an item which we have evicted earlier: reinsert it back into the list.
10481048
_reinsertAfter(record, previousRecord, index);
@@ -1081,7 +1081,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
10811081
* of 'b' rather then switch 'a' with 'b' and then add 'a' at the end.
10821082
*/
10831083
ItemRecord<V> verifyReinsertion(ItemRecord record, item, int index) {
1084-
ItemRecord<V> reinsertRecord = _removedItems == null ? null : _removedItems.get(item);
1084+
ItemRecord<V> reinsertRecord = _unlinkedRecords == null ? null : _unlinkedRecords.get(item);
10851085
if (reinsertRecord != null) {
10861086
record = _reinsertAfter(reinsertRecord, record._prev, index);
10871087
} else if (record.currentIndex != index) {
@@ -1103,7 +1103,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11031103
_addToRemovals(_unlink(record));
11041104
record = nextRecord;
11051105
}
1106-
if (_removedItems != null) _removedItems.clear();
1106+
if (_unlinkedRecords != null) _unlinkedRecords.clear();
11071107

11081108
if (_additionsTail != null) _additionsTail._nextAdded = null;
11091109
if (_movesTail != null) _movesTail._nextMoved = null;
@@ -1112,7 +1112,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11121112
}
11131113

11141114
ItemRecord<V> _reinsertAfter(ItemRecord<V> record, ItemRecord<V> prevRecord, int index) {
1115-
if (_removedItems != null) _removedItems.remove(record);
1115+
if (_unlinkedRecords != null) _unlinkedRecords.remove(record);
11161116
var prev = record._prevRemoved;
11171117
var next = record._nextRemoved;
11181118

@@ -1174,17 +1174,17 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11741174
prevRecord._next = record;
11751175
}
11761176

1177-
if (_movedItems == null) _movedItems = new DuplicateMap();
1177+
if (_linkedRecords == null) _linkedRecords = new DuplicateMap();
1178+
_linkedRecords.put(record);
11781179

1179-
_movedItems.put(record);
11801180
record.currentIndex = index;
11811181
return record;
11821182
}
11831183

11841184
ItemRecord<V> _remove(ItemRecord record) => _addToRemovals(_unlink(record));
11851185

11861186
ItemRecord<V> _unlink(ItemRecord record) {
1187-
if (_movedItems != null) _movedItems.remove(record);
1187+
if (_linkedRecords != null) _linkedRecords.remove(record);
11881188

11891189
var prev = record._prev;
11901190
var next = record._next;
@@ -1221,8 +1221,8 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
12211221

12221222
ItemRecord<V> _addToRemovals(ItemRecord<V> record) {
12231223
record.currentIndex = null;
1224-
if (_removedItems == null) _removedItems = new DuplicateMap();
1225-
_removedItems.put(record);
1224+
if (_unlinkedRecords == null) _unlinkedRecords = new DuplicateMap();
1225+
_unlinkedRecords.put(record);
12261226
record._nextRemoved = null;
12271227

12281228
if (_removalsTail == null) {

0 commit comments

Comments
 (0)