Fixed strong mode errors and warnings reachable from lib/observe.dart

lib/src/list_diff.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library observe.src.list_diff;
 
 import 'dart:math' as math;
 import 'dart:collection' show UnmodifiableListView;
 import 'change_record.dart' show ChangeRecord;
 
@@ skipping 23 matching lines @@
   // we build the object. It will be "frozen" by the time it is returned the the
   // user.
   int _index, _addedCount;
 
   ListChangeRecord._(this.object, this._index, removed, this._addedCount)
       : _removed = removed,
         _unmodifiableRemoved = new UnmodifiableListView(removed);
 
   factory ListChangeRecord(List object, int index,
       {List removed, int addedCount}) {
-
     if (removed == null) removed = [];
     if (addedCount == null) addedCount = 0;
     return new ListChangeRecord._(object, index, removed, addedCount);
   }
 
   /// Returns true if the provided index was changed by this operation.
   bool indexChanged(key) {
     // If key isn't an int, or before the index, then it wasn't changed.
     if (key is! int || key < index) return false;
 
@@ skipping 17 matching lines @@
 //   'xxxx123' -> '123yyyy'
 //
 // With 1-edit updates, the shortest path would be just to update all seven
 // characters. With 2-edit updates, we delete 4, leave 3, and add 4. This
 // leaves the substring '123' intact.
 List<List<int>> _calcEditDistances(List current, int currentStart,
     int currentEnd, List old, int oldStart, int oldEnd) {
   // "Deletion" columns
   var rowCount = oldEnd - oldStart + 1;
   var columnCount = currentEnd - currentStart + 1;
-  var distances = new List(rowCount);
+  var distances = new List<List<int>>(rowCount);
 
   // "Addition" rows. Initialize null column.
   for (var i = 0; i < rowCount; i++) {
     distances[i] = new List(columnCount);
     distances[i][0] = i;
   }
 
   // Initialize null row
   for (var j = 0; j < columnCount; j++) {
     distances[0][j] = j;
@@ skipping 19 matching lines @@
 const _EDIT_ADD = 2;
 const _EDIT_DELETE = 3;
 
 // This starts at the final weight, and walks "backward" by finding
 // the minimum previous weight recursively until the origin of the weight
 // matrix.
 List<int> _spliceOperationsFromEditDistances(List<List<int>> distances) {
   var i = distances.length - 1;
   var j = distances[0].length - 1;
   var current = distances[i][j];
-  var edits = [];
+  var edits = <int>[];
   while (i > 0 || j > 0) {
     if (i == 0) {
       edits.add(_EDIT_ADD);
       j--;
       continue;
     }
     if (j == 0) {
       edits.add(_EDIT_DELETE);
       i--;
       continue;
@@ skipping 49 matching lines @@
 /// Lacking individual splice mutation information, the minimal set of
 /// splices can be synthesized given the previous state and final state of an
 /// array. The basic approach is to calculate the edit distance matrix and
 /// choose the shortest path through it.
 ///
 /// Complexity: O(l * p)
 ///   l: The length of the current array
 ///   p: The length of the old array
 List<ListChangeRecord> calcSplices(List current, int currentStart,
     int currentEnd, List old, int oldStart, int oldEnd) {
-
   var prefixCount = 0;
   var suffixCount = 0;
 
   var minLength = math.min(currentEnd - currentStart, oldEnd - oldStart);
   if (currentStart == 0 && oldStart == 0) {
     prefixCount = _sharedPrefix(current, old, minLength);
   }
 
   if (currentEnd == current.length && oldEnd == old.length) {
     suffixCount = _sharedSuffix(current, old, minLength - prefixCount);
   }
 
   currentStart += prefixCount;
   oldStart += prefixCount;
   currentEnd -= suffixCount;
   oldEnd -= suffixCount;
 
   if (currentEnd - currentStart == 0 && oldEnd - oldStart == 0) {
     return const [];
   }
 
   if (currentStart == currentEnd) {
     var splice = new ListChangeRecord(current, currentStart);
     while (oldStart < oldEnd) {
       splice._removed.add(old[oldStart++]);
     }
 
-    return [splice ];
+    return [splice];
   } else if (oldStart == oldEnd)

[Bob Nystrom, 2016/01/22 18:50:25]

Braces around the else.

[vsm, 2016/01/22 19:05:05]

Done.

-    return [new ListChangeRecord(current, currentStart,
-        addedCount: currentEnd - currentStart)];
+    return [
+    new ListChangeRecord(current, currentStart,
+        addedCount: currentEnd - currentStart)
+  ];
 
-  var ops = _spliceOperationsFromEditDistances(
-      _calcEditDistances(current, currentStart, currentEnd, old, oldStart,
-          oldEnd));
+  var ops = _spliceOperationsFromEditDistances(_calcEditDistances(
+      current, currentStart, currentEnd, old, oldStart, oldEnd));
 
   ListChangeRecord splice = null;
   var splices = <ListChangeRecord>[];
   var index = currentStart;
   var oldIndex = oldStart;
   for (var i = 0; i < ops.length; i++) {
-    switch(ops[i]) {
+    switch (ops[i]) {
       case _EDIT_LEAVE:
         if (splice != null) {
           splices.add(splice);
           splice = null;
         }
 
         index++;
         oldIndex++;
         break;
       case _EDIT_UPDATE:
@@ skipping 38 matching lines @@
   // - the loop finds where the merge should happen
   // - it applies the merge in a particular splice
   // - then continues and updates the subsequent splices with any offset diff.
   for (var i = 0; i < splices.length; i++) {
     final current = splices[i];
     current._index += insertionOffset;
 
     if (inserted) continue;
 
     var intersectCount = _intersect(
-        splice.index, splice.index + splice.removed.length,
-        current.index, current.index + current.addedCount);
+        splice.index,
+        splice.index + splice.removed.length,
+        current.index,
+        current.index + current.addedCount);
 
     if (intersectCount >= 0) {
       // Merge the two splices
 
       splices.removeAt(i);
       i--;
 
       insertionOffset -= current.addedCount - current.removed.length;
 
       splice._addedCount += current.addedCount - intersectCount;
-      var deleteCount = splice.removed.length +
-                        current.removed.length - intersectCount;
+      var deleteCount =
+          splice.removed.length + current.removed.length - intersectCount;
 
       if (splice.addedCount == 0 && deleteCount == 0) {
         // merged splice is a noop. discard.
         inserted = true;
       } else {
         var removed = current._removed;
 
         if (splice.index < current.index) {
           // some prefix of splice.removed is prepended to current.removed.
-          removed.insertAll(0,
-              splice.removed.getRange(0, current.index - splice.index));
+          removed.insertAll(
+              0, splice.removed.getRange(0, current.index - splice.index));
         }
 
         if (splice.index + splice.removed.length >
             current.index + current.addedCount) {
           // some suffix of splice.removed is appended to current.removed.
           removed.addAll(splice.removed.getRange(
               current.index + current.addedCount - splice.index,
               splice.removed.length));
         }
 
@@ skipping 13 matching lines @@
 
       var offset = splice.addedCount - splice.removed.length;
       current._index += offset;
       insertionOffset += offset;
     }
   }
 
   if (!inserted) splices.add(splice);
 }
 
-List<ListChangeRecord> _createInitialSplices(List<Object> list,
-    List<ListChangeRecord> records) {
-
+List<ListChangeRecord> _createInitialSplices(
+    List<Object> list, List<ListChangeRecord> records) {
   var splices = <ListChangeRecord>[];
   for (var record in records) {
     _mergeSplice(splices, record);
   }
   return splices;
 }
 
 /// We need to summarize change records. Consumers of these records want to
 /// apply the batch sequentially, and ensure that they can find inserted
 /// items by looking at that position in the list. This property does not
 /// hold in our record-as-you-go records. Consider:
 ///
 ///     var model = toObservable(['a', 'b']);
 ///     model.removeAt(1);
 ///     model.insertAll(0, ['c', 'd', 'e']);
 ///     model.removeRange(1, 3);
 ///     model.insert(1, 'f');
 ///
 /// Here, we inserted some records and then removed some of them.
 /// If someone processed these records naively, they would "play back" the
 /// insert incorrectly, because those items will be shifted.
-List<ListChangeRecord> projectListSplices(List list,
-    List<ListChangeRecord> records) {
+List<ListChangeRecord> projectListSplices(
+    List list, List<ListChangeRecord> records) {

[Bob Nystrom, 2016/01/22 18:50:25]

List -> List<Object>?

[vsm, 2016/01/22 19:05:05]

Done.

   if (records.length <= 1) return records;
 
-  var splices = [];
+  var splices = <ListChangeRecord>[];
   for (var splice in _createInitialSplices(list, records)) {
     if (splice.addedCount == 1 && splice.removed.length == 1) {
       if (splice.removed[0] != list[splice.index]) splices.add(splice);
       continue;
     }
 
-    splices.addAll(calcSplices(list, splice.index,
-        splice.index + splice.addedCount, splice._removed, 0,
+    splices.addAll(calcSplices(
+        list,
+        splice.index,
+        splice.index + splice.addedCount,
+        splice._removed,
+        0,
         splice.removed.length));
   }
 
   return splices;
 }