Fixed stackTrace count when using stackTraceBeginIndex, addresses s…

…imc/logger#114
SourceHorizon · Feb 25, 2023 · f7f4779 · f7f4779
1 parent 9a8da9c
commit f7f4779
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 15 deletions.
diff --git a/lib/src/printers/pretty_printer.dart b/lib/src/printers/pretty_printer.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:math';
 
 import 'package:logger/src/ansi_color.dart';
 import 'package:logger/src/log_printer.dart';
@@ -151,23 +152,25 @@ class PrettyPrinter extends LogPrinter {
   }
 
   String? formatStackTrace(StackTrace? stackTrace, int methodCount) {
-    var lines = stackTrace.toString().split('\n');
-    if (stackTraceBeginIndex > 0 && stackTraceBeginIndex < lines.length - 1) {
-      lines = lines.sublist(stackTraceBeginIndex);
-    }
-    var formatted = <String>[];
-    var count = 0;
-    for (var line in lines) {
-      if (_discardDeviceStacktraceLine(line) ||
-          _discardWebStacktraceLine(line) ||
-          _discardBrowserStacktraceLine(line) ||
-          line.isEmpty) {
+    List<String> lines = stackTrace
+        .toString()
+        .split('\n')
+        .where(
+          (line) =>
+              !_discardDeviceStacktraceLine(line) &&
+              !_discardWebStacktraceLine(line) &&
+              !_discardBrowserStacktraceLine(line) &&
+              line.isNotEmpty,
+        )
+        .toList();
+    List<String> formatted = [];
+
+    for (int count = 0; count < min(lines.length, methodCount); count++) {
+      var line = lines[count];
+      if (count < stackTraceBeginIndex) {
         continue;
       }
       formatted.add('#$count   ${line.replaceFirst(RegExp(r'#\d+\s+'), '')}');
-      if (++count == methodCount) {
-        break;
-      }
     }
 
     if (formatted.isEmpty) {

diff --git a/test/printers/pretty_printer_test.dart b/test/printers/pretty_printer_test.dart
@@ -3,7 +3,7 @@ import 'package:test/test.dart';
 
 void main() {
   String readMessage(List<String> log) {
-    return log.reduce((acc, val) => acc + val);
+    return log.reduce((acc, val) => "$acc\n$val");
   }
 
   final prettyPrinter = PrettyPrinter(printEmojis: false);
@@ -95,4 +95,28 @@ void main() {
       contains(expectedMessage),
     );
   });
+
+  test('stackTraceBeginIndex', () {
+    final prettyPrinter = PrettyPrinter(
+      stackTraceBeginIndex: 2,
+    );
+    final withFunction = LogEvent(
+      Level.debug,
+      "some message",
+      'some error',
+      StackTrace.current,
+    );
+
+    final actualLog = prettyPrinter.log(withFunction);
+    final actualLogString = readMessage(actualLog);
+
+    expect(
+      actualLogString,
+      allOf([
+        isNot(contains("#0   ")),
+        isNot(contains("#1   ")),
+        contains("#2   "),
+      ]),
+    );
+  });
 }