| Index: third_party/pkg/route_hierarchical/lib/client.dart
|
| diff --git a/third_party/pkg/route_hierarchical/lib/client.dart b/third_party/pkg/route_hierarchical/lib/client.dart
|
| index 45cbd0212cb30ee93e2c8671bc541d8b4f4b2a2a..14d737fa8dc03b6d3f52227c4e872411953a28e6 100644
|
| --- a/third_party/pkg/route_hierarchical/lib/client.dart
|
| +++ b/third_party/pkg/route_hierarchical/lib/client.dart
|
| @@ -517,12 +517,11 @@ class Router {
|
| }
|
|
|
| List _matchingRoutes(String path, RouteImpl baseRoute) {
|
| - var routes = baseRoute._routes.values
|
| - .where((r) => r.path.match(path) != null)
|
| - .toList();
|
| -
|
| - return sortRoutes ?
|
| - (routes..sort((r1, r2) => r1.path.compareTo(r2.path))) : routes;
|
| + var routes = baseRoute._routes.values.toList();
|
| + if (sortRoutes) {
|
| + routes.sort((r1, r2) => r1.path.compareTo(r2.path));
|
| + }
|
| + return routes.where((r) => r.path.match(path) != null).toList();
|
| }
|
|
|
| List<_Match> _matchingTreePath(String path, RouteImpl baseRoute) {
|
| @@ -613,15 +612,14 @@ class Router {
|
| return params;
|
| }
|
|
|
| - List<String> _parseKeyVal(kvPair) {
|
| - if (kvPair.isEmpty) {
|
| - return const ['', ''];
|
| - }
|
| - var splitPoint = kvPair.indexOf('=');
|
| -
|
| - return (splitPoint == -1) ?
|
| - [kvPair, '']
|
| - : [kvPair.substring(0, splitPoint), kvPair.substring(splitPoint + 1)];
|
| + List<String> _parseKeyVal(keyValPair) {
|
| + if (keyValPair.isEmpty) return const ['', ''];
|
| + var splitPoint = keyValPair.indexOf('=') == -1 ?
|
| + keyValPair.length : keyValPair.indexOf('=') + 1;
|
| + var key = keyValPair.substring(0, splitPoint +
|
| + (keyValPair.indexOf('=') == -1 ? 0 : -1));
|
| + var value = keyValPair.substring(splitPoint);
|
| + return [key, value];
|
| }
|
|
|
| void _unsetAllCurrentRoutes(RouteImpl r) {
|
|
|