Differentiate between first and subsequent entries for the same funct…

…ion (#44)
r-lib · Feb 17, 2021 · 8c91a38 · 8c91a38
1 parent e0e1169
commit 8c91a38
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/R/debug.R b/R/debug.R
@@ -28,9 +28,10 @@ debug <- function(msg, pkg = environmentName(topenv(parent.frame()))) {
 
   if (tolower(Sys.getenv("DEBUGME_SHOW_STACK", "yes")) != "no") {
     level <- update_debug_call_stack_and_compute_level()
+    continuation <- isTRUE(attr(level, "continuation"))
     if (level > 0) {
       indent <- paste0(
-        c(" " , rep(" ", (level - 1) * 2), "+-"),
+        c(" " , rep(" ", (level - 1) * 2), if (continuation) " -" else "+-"),
         collapse = "")
     }
   }
@@ -81,8 +82,13 @@ update_debug_call_stack_and_compute_level <- function() {
   frames <- sys.frames()
 
   for (call in debug_data$debug_call_stack) {
-    if (call$nframe < nframe &&
+    if (call$nframe <= nframe &&
       call$id == env_address(frames[[call$nframe]])) {
+
+      if (call$nframe == nframe) {
+        return(structure(call$level, continuation = TRUE))
+      }
+
       level <- call$level + 1L
       break
     }
@@ -101,7 +107,7 @@ update_debug_call_stack_and_compute_level <- function() {
     debug_data$debug_call_stack <- list(call)
   }
 
-  level
+  structure(level, continuation = FALSE)
 }
 
 

diff --git a/tests/testthat/test-debug.R b/tests/testthat/test-debug.R
@@ -23,9 +23,9 @@ test_that("debug indent", {
   expect_match(out, 'debugme +-f1', fixed = TRUE)
   expect_match(out, 'debugme   +-f2.1', fixed = TRUE)
   expect_match(out, 'debugme     +-f3', fixed = TRUE)
-  expect_match(out, 'debugme   +-f2.2', fixed = TRUE)
+  expect_match(out, 'debugme    -f2.2', fixed = TRUE)
   expect_match(out, 'debugme +-f2.1', fixed = TRUE)
-  expect_match(out, 'debugme +-f2.2', fixed = TRUE)
+  expect_match(out, 'debugme  -f2.2', fixed = TRUE)
   expect_match(out, 'debugme f0.2', fixed = TRUE)
 
   out <- withr::with_envvar(