From 8d75bbce685324362b540cb51b79b7dfd551d956 Mon Sep 17 00:00:00 2001 From: rikbellens Date: Thu, 29 Feb 2024 09:29:11 +0100 Subject: [PATCH] fix: class signature of SortedMap --- lib/src/filteredmap.dart | 4 +--- lib/src/sortedmap.dart | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/lib/src/filteredmap.dart b/lib/src/filteredmap.dart index dca7b10..ba21023 100644 --- a/lib/src/filteredmap.dart +++ b/lib/src/filteredmap.dart @@ -74,8 +74,6 @@ class FilteredMapView extends MapBase @override final Filter filter; - - /// Creates a FilteredMapView from a SortedMap. FilteredMapView._(this._baseMap, {required Pair start, @@ -160,7 +158,7 @@ class FilteredMapView extends MapBase } @override - Iterable> subentries( + Iterable subkeys( {required Pair start, required Pair end, int? limit, diff --git a/lib/src/sortedmap.dart b/lib/src/sortedmap.dart index bd6cf99..b24e9fe 100644 --- a/lib/src/sortedmap.dart +++ b/lib/src/sortedmap.dart @@ -86,15 +86,6 @@ abstract class SortedMap implements Map { /// Gets the keys within the desired bounds and limit. Iterable subkeys( - {required Pair start, - required Pair end, - int? limit, - bool reversed = false}) => - subentries(start: start, end: end, limit: limit, reversed: reversed) - .map((v) => v.key); - - /// Gets the entries within the desired bounds and limit. - Iterable> subentries( {required Pair start, required Pair end, int? limit, @@ -282,7 +273,6 @@ class _SortedMap extends MapBase return it.current.key; } - @override Iterable> subentries( {required Pair start, required Pair end, @@ -298,6 +288,15 @@ class _SortedMap extends MapBase limitFromStart: !reversed); return v; } + + @override + Iterable subkeys( + {required Pair start, + required Pair end, + int? limit, + bool reversed = false}) => + subentries(start: start, end: end, limit: limit, reversed: reversed) + .map((v) => v.key); } /// An unmodifiable sorted map.