fix addAll with different comparators

appsup-dart · Feb 22, 2024 · 4196b6d · 4196b6d
1 parent 917d1e9
commit 4196b6d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lib/src/filteredmap.dart b/lib/src/filteredmap.dart
@@ -46,8 +46,7 @@ class _FilteredMap<K extends Comparable, V> extends _SortedMap<K, V>
   @override
   FilteredMap<K, V> clone() => _FilteredMap<K, V>._(
       filter,
-      TreeSet(comparator: (a, b) => Comparable.compare(a.index, b.index))
-        ..addAll(_sortedEntries),
+      TreeSet(comparator: _SortedMap._compare)..addAll(_sortedEntries),
       TreeMap.from(_map));
 
   @override

diff --git a/lib/src/sortedmap.dart b/lib/src/sortedmap.dart
@@ -158,10 +158,12 @@ class _SortedMap<K extends Comparable, V> extends MapBase<K, V>
   final TreeSet<_MapEntryWithIndex<K, V>> _sortedEntries;
   final TreeMap<K, V> _map;
 
+  static int _compare(_MapEntryWithIndex a, _MapEntryWithIndex b) =>
+      Comparable.compare(a.index, b.index);
+
   _SortedMap._(this.ordering, TreeSet<_MapEntryWithIndex<K, V>>? sortedPairs,
       TreeMap<K, V>? map)
-      : _sortedEntries = sortedPairs ??
-            TreeSet(comparator: (a, b) => Comparable.compare(a.index, b.index)),
+      : _sortedEntries = sortedPairs ?? TreeSet(comparator: _compare),
         _map = map ?? TreeMap();
 
   @override
@@ -179,8 +181,7 @@ class _SortedMap<K extends Comparable, V> extends MapBase<K, V>
   @override
   SortedMap<K, V> clone() => _SortedMap<K, V>._(
       ordering,
-      TreeSet(comparator: (a, b) => Comparable.compare(a.index, b.index))
-        ..addAll(_sortedEntries),
+      TreeSet(comparator: _compare)..addAll(_sortedEntries),
       TreeMap<K, V>.from(_map));
 
   @override

diff --git a/lib/src/treemap.dart b/lib/src/treemap.dart
@@ -9,8 +9,7 @@ class TreeMap<K extends Comparable, V> extends MapBase<K, V> {
 
   factory TreeMap.from(Map<K, V> other) => TreeMap()..addAll(other);
 
-  static int _compareKeys<K extends Comparable, V>(
-          MapEntry<K, V> a, MapEntry<K, V> b) =>
+  static int _compareKeys(MapEntry a, MapEntry b) =>
       Comparable.compare(a.key, b.key);
 
   final TreeSet<MapEntry<K, V?>> _tree = TreeSet(comparator: _compareKeys);

diff --git a/lib/src/treeset.dart b/lib/src/treeset.dart
@@ -71,7 +71,9 @@ class AvlTreeSet<V> extends TreeSet<V> {
 
   @override
   bool addAll(Iterable<V> items) {
-    if (_root == null && items is AvlTreeSet<V>) {
+    if (_root == null &&
+        items is AvlTreeSet<V> &&
+        identical((items as dynamic).comparator, comparator)) {
       _root = items._root;
       return _root != null;
     }