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

Commit 1ae4a78

Browse files
vicbchirayuk
authored andcommitted
refactor(dccd): some renaming to clarify the intent
Closes #1129
1 parent 173fed7 commit 1ae4a78

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;
@@ -1062,13 +1062,13 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
10621062
}
10631063

10641064
// Attempt to see if we have seen the item before.
1065-
record = _movedItems == null ? null : _movedItems.get(item, index);
1065+
record = _linkedRecords == null ? null : _linkedRecords.get(item, index);
10661066
if (record != null) {
10671067
// We have seen this before, we need to move it forward in the collection.
10681068
_moveAfter(record, previousRecord, index);
10691069
} else {
10701070
// Never seen it, check evicted list.
1071-
record = _removedItems == null ? null : _removedItems.get(item);
1071+
record = _unlinkedRecords == null ? null : _unlinkedRecords.get(item);
10721072
if (record != null) {
10731073
// It is an item which we have evicted earlier: reinsert it back into the list.
10741074
_reinsertAfter(record, previousRecord, index);
@@ -1107,7 +1107,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11071107
* of 'b' rather then switch 'a' with 'b' and then add 'a' at the end.
11081108
*/
11091109
ItemRecord<V> verifyReinsertion(ItemRecord record, item, int index) {
1110-
ItemRecord<V> reinsertRecord = _removedItems == null ? null : _removedItems.get(item);
1110+
ItemRecord<V> reinsertRecord = _unlinkedRecords == null ? null : _unlinkedRecords.get(item);
11111111
if (reinsertRecord != null) {
11121112
record = _reinsertAfter(reinsertRecord, record._prev, index);
11131113
} else if (record.currentIndex != index) {
@@ -1129,7 +1129,7 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
11291129
_addToRemovals(_unlink(record));
11301130
record = nextRecord;
11311131
}
1132-
if (_removedItems != null) _removedItems.clear();
1132+
if (_unlinkedRecords != null) _unlinkedRecords.clear();
11331133

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

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

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

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

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

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

12121212
ItemRecord<V> _unlink(ItemRecord record) {
1213-
if (_movedItems != null) _movedItems.remove(record);
1213+
if (_linkedRecords != null) _linkedRecords.remove(record);
12141214

12151215
var prev = record._prev;
12161216
var next = record._next;
@@ -1247,8 +1247,8 @@ class _CollectionChangeRecord<V> implements CollectionChangeRecord<V> {
12471247

12481248
ItemRecord<V> _addToRemovals(ItemRecord<V> record) {
12491249
record.currentIndex = null;
1250-
if (_removedItems == null) _removedItems = new DuplicateMap();
1251-
_removedItems.put(record);
1250+
if (_unlinkedRecords == null) _unlinkedRecords = new DuplicateMap();
1251+
_unlinkedRecords.put(record);
12521252
record._nextRemoved = null;
12531253

12541254
if (_removalsTail == null) {

0 commit comments

Comments
 (0)