Index: packages/quiver/lib/pattern.dart |
diff --git a/packages/quiver/lib/pattern.dart b/packages/quiver/lib/pattern.dart |
index 937b0a06a61074799b1b58de0659e16893e8ddcb..31a7cfb98561a3da5fece98648aea76bfe98c33a 100644 |
--- a/packages/quiver/lib/pattern.dart |
+++ b/packages/quiver/lib/pattern.dart |
@@ -50,7 +50,7 @@ class _MultiPattern extends Pattern { |
{Iterable<Pattern> this.exclude}); |
Iterable<Match> allMatches(String str, [int start = 0]) { |
- var _allMatches = []; |
+ final _allMatches = <Match>[]; |
for (var pattern in include) { |
var matches = pattern.allMatches(str, start); |
if (_hasMatch(matches)) { |
@@ -61,15 +61,15 @@ class _MultiPattern extends Pattern { |
} |
} |
} |
- _allMatches.add(matches); |
+ _allMatches.addAll(matches); |
} |
} |
- return _allMatches.expand((x) => x); |
+ return _allMatches; |
} |
Match matchAsPrefix(String str, [int start = 0]) { |
- return allMatches(str).firstWhere((match) => match.start == start, |
- orElse: () => null); |
+ return allMatches(str) |
+ .firstWhere((match) => match.start == start, orElse: () => null); |
} |
} |