firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix stack filtering (#49956)

Browse Source
This commit is contained in:
Dan Field 2020-02-04 14:23:03 -08:00 committed by GitHub
parent 64b82f50ad
commit ccf5d641c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/foundation/assertions.dart
View File

@ -126,7 +126,7 @@ class RepetitiveStackFrameFilter extends StackFilter {
@override
void filter(List<StackFrame> stackFrames, List<String> reasons) {
for (int index = 0; index < stackFrames.length; index += 1) {
for (int index = 0; index < stackFrames.length - numFrames; index += 1) {
if (_matchesFrames(stackFrames.skip(index).take(numFrames).toList())) {
reasons.setRange(index, index + numFrames, _replacements);
index += numFrames - 1;
@ -135,6 +135,9 @@ class RepetitiveStackFrameFilter extends StackFilter {
}
bool _matchesFrames(List<StackFrame> stackFrames) {
if (stackFrames.length < numFrames) {
return false;
}
for (int index = 0; index < stackFrames.length; index++) {
if (!frames[index].matches(stackFrames[index])) {
return false;

20
packages/flutter/test/foundation/assertions_test.dart
View File

@ -428,4 +428,24 @@ void main() {
expect(trace, isNotNull);
expect(trace.value, stack);
});
test('RepetitiveStackFrameFilter does not go out of range', () {
const RepetitiveStackFrameFilter filter = RepetitiveStackFrameFilter(
frames: <PartialStackFrame>[
PartialStackFrame(className: 'TestClass', method: 'test1', package: 'package:test/blah.dart'),
PartialStackFrame(className: 'TestClass', method: 'test2', package: 'package:test/blah.dart'),
PartialStackFrame(className: 'TestClass', method: 'test3', package: 'package:test/blah.dart'),
],
replacement: 'test',
);
final List<String> reasons = List<String>(2);
filter.filter(
const <StackFrame>[
StackFrame(className: 'TestClass', method: 'test1', packageScheme: 'package', package: 'test', packagePath: 'blah.dart', line: 1, column: 1, number: 0, source: ''),
StackFrame(className: 'TestClass', method: 'test2', packageScheme: 'package', package: 'test', packagePath: 'blah.dart', line: 1, column: 1, number: 0, source: ''),
],
reasons,
);
expect(reasons, List<String>(2));
});
}