Improve visibility handling in trace formatting

Author: lionel-

R/trace.R

@@ -373,7 +373,7 @@ format.rlang_trace <- function(x,
                                srcrefs = NULL) {
   switch(
     arg_match(simplify),
-    none = trace_format(x, max_frames, dir, srcrefs),
+    none = trace_format_full(x, max_frames, dir, srcrefs),
     collapse = trace_format_collapse(x, max_frames, dir, srcrefs),
     branch = trace_format_branch(x, max_frames, dir, srcrefs)
   )
@@ -391,6 +391,12 @@ trace_format <- function(trace, max_frames, dir, srcrefs) {
   cli_tree(trace_as_tree(trace, dir = dir, srcrefs = srcrefs))
 }
 
+trace_format_full <- function(trace, max_frames, dir, srcrefs) {
+  if (length(trace$visible)) {
+    trace$visible <- TRUE
+  }
+  trace_format(trace, max_frames, dir, srcrefs)
+}
 trace_format_collapse <- function(trace, max_frames, dir, srcrefs) {
   trace <- trace_simplify_collapse(trace)
   trace_format(trace, max_frames, dir, srcrefs)
@@ -766,7 +772,7 @@ trace_simplify_collapse <- function(trace) {
     }
   }
 
-  trace$visible <- visible
+  trace$visible <- visible & old_visible
   trace$parent <- parents
 
   trace

tests/testthat/_snaps/trace.md

@@ -1086,3 +1086,31 @@
      3. h()
      4. [ evalq() ] with 1 more call
 
+# trailing `FALSE` visibility is handled
+
+    Code
+      # Full
+      print(trace, simplify = "none", dir = dir, srcrefs = srcrefs)
+    Output
+          x
+       1. \-f()
+       2.   \-g()
+       3.     \-h()
+       4.       \-foo()
+       5.         \-bar()
+    Code
+      # Collapsed
+      print(trace, simplify = "collapse", dir = dir, srcrefs = srcrefs)
+    Output
+          x
+       1. \-f()
+       2.   \-g()
+       3.     \-h()
+    Code
+      # Branch
+      print(trace, simplify = "branch", dir = dir, srcrefs = srcrefs)
+    Output
+       1. f()
+       2. g()
+       3. h()
+

tests/testthat/test-trace.R

@@ -721,3 +721,12 @@ test_that("can detect namespace and scope from call", {
     trace_context("foo", ":::")
   )
 })
+
+test_that("trailing `FALSE` visibility is handled", {
+  trace <- new_trace(
+    alist(f(), g(), h(), foo(), bar()),
+    parent = 0:4,
+    visible = c(TRUE, TRUE, TRUE, FALSE, FALSE)
+  )
+  expect_snapshot_trace(trace)
+})