OLD | NEW |
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 import 'dart:collection'; | 5 import 'dart:collection'; |
6 import 'dart:math' as math; | 6 import 'dart:math' as math; |
7 | 7 |
8 import 'chain.dart'; | 8 import 'chain.dart'; |
9 import 'frame.dart'; | 9 import 'frame.dart'; |
10 import 'lazy_trace.dart'; | 10 import 'lazy_trace.dart'; |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 // internal frames. They only ever show up in stack chains and are | 254 // internal frames. They only ever show up in stack chains and are |
255 // always surrounded by other traces that are actually useful, so we can | 255 // always surrounded by other traces that are actually useful, so we can |
256 // just get rid of them. | 256 // just get rid of them. |
257 // TODO(nweiz): Get rid of this logic some time after issue 22009 is | 257 // TODO(nweiz): Get rid of this logic some time after issue 22009 is |
258 // fixed. | 258 // fixed. |
259 if (!frame.member.contains('<async>')) return false; | 259 if (!frame.member.contains('<async>')) return false; |
260 return frame.line == null; | 260 return frame.line == null; |
261 }; | 261 }; |
262 } | 262 } |
263 | 263 |
264 var newFrames = []; | 264 var newFrames = <Frame>[]; |
265 for (var frame in frames.reversed) { | 265 for (var frame in frames.reversed) { |
266 if (frame is UnparsedFrame || !predicate(frame)) { | 266 if (frame is UnparsedFrame || !predicate(frame)) { |
267 newFrames.add(frame); | 267 newFrames.add(frame); |
268 } else if (newFrames.isEmpty || !predicate(newFrames.last)) { | 268 } else if (newFrames.isEmpty || !predicate(newFrames.last)) { |
269 newFrames.add(new Frame( | 269 newFrames.add(new Frame( |
270 frame.uri, frame.line, frame.column, frame.member)); | 270 frame.uri, frame.line, frame.column, frame.member)); |
271 } | 271 } |
272 } | 272 } |
273 | 273 |
274 if (terse) { | 274 if (terse) { |
(...skipping 14 matching lines...) Expand all Loading... |
289 var longest = frames.map((frame) => frame.location.length) | 289 var longest = frames.map((frame) => frame.location.length) |
290 .fold(0, math.max); | 290 .fold(0, math.max); |
291 | 291 |
292 // Print out the stack trace nicely formatted. | 292 // Print out the stack trace nicely formatted. |
293 return frames.map((frame) { | 293 return frames.map((frame) { |
294 if (frame is UnparsedFrame) return "$frame\n"; | 294 if (frame is UnparsedFrame) return "$frame\n"; |
295 return '${padRight(frame.location, longest)} ${frame.member}\n'; | 295 return '${padRight(frame.location, longest)} ${frame.member}\n'; |
296 }).join(); | 296 }).join(); |
297 } | 297 } |
298 } | 298 } |
OLD | NEW |