Improve consistency of pipe call numbering in backtraces

Author: lionel-

R/trace.R

@@ -641,13 +641,11 @@ branch_uncollapse_pipe <- function(trace) {
     # Assign the pipe frame as dummy ids for uncollapsed frames
     pipe_ids <- rep(trace$ids[idx], pointer)
 
-    pipe_indices <- idx
-    n_pipe_calls <- length(pipe_calls)
-    if (n_pipe_calls > 1L) {
-      n_collapsed <- attr(pipe, "collapsed")
-      rest_indices <- rep(idx + n_collapsed + 1L, n_pipe_calls - 1L)
-      pipe_indices <- c(pipe_indices, rest_indices)
-    }
+    # This assigns the same frame number to all pipe calls that have
+    # already returned
+    n_collapsed <- attr(pipe, "collapsed")
+    pipe_indices <- rep(idx, length(pipe_calls) - 1L)
+    pipe_indices <- c(pipe_indices, idx + n_collapsed + 1L)
 
     # Add the number of uncollapsed frames to children's
     # ancestry. This assumes a backtrace branch.

tests/testthat/test-trace-collapse-magrittr-before-after1.txt

@@ -18,5 +18,5 @@ Collapsed:
  10.   └─rlang:::T(.)
 
 Branch:
- 1. rlang:::F(NA %>% T())
- 2. rlang:::T(.)
+  1. rlang:::F(NA %>% T())
+ 10. rlang:::T(.)

tests/testthat/test-trace-collapse-magrittr-before-after2.txt

@@ -18,5 +18,5 @@ Collapsed:
  10.     └─rlang:::f()
 
 Branch:
-  1. rlang:::C(.)
+  9. rlang:::C(.)
  10. rlang:::f()

tests/testthat/test-trace-collapse-magrittr-before-after3.txt

@@ -21,5 +21,5 @@ Collapsed:
 
 Branch:
   1. rlang:::F(NA %>% C())
-  2. rlang:::C(.)
+ 10. rlang:::C(.)
  11. rlang:::f()

tests/testthat/test-trace-collapse-magrittr-children.txt

@@ -21,7 +21,7 @@ Collapsed:
 
 Branch:
   1. rlang:::F(.)
-  9. rlang:::G(.)
+  1. rlang:::G(.)
   9. rlang:::H(.)
  10. rlang:::f()
  11. rlang:::h()

tests/testthat/test-trace-collapse-magrittr-complete-leading2.txt

@@ -17,5 +17,5 @@ Collapsed:
 
 Branch:
  1. rlang:::F(NA)
- 9. rlang:::F(.)
+ 1. rlang:::F(.)
  9. rlang:::T(.)

tests/testthat/test-trace-collapse-magrittr-complete1.txt

@@ -16,4 +16,4 @@ Collapsed:
  9.   └─rlang:::T(.)
 
 Branch:
- 1. rlang:::T(.)
+ 9. rlang:::T(.)

tests/testthat/test-trace-collapse-magrittr-incomplete-leading2.txt

@@ -16,5 +16,5 @@ Collapsed:
 
 Branch:
  1. rlang:::F(NA)
- 8. rlang:::F(.)
+ 1. rlang:::F(.)
  8. rlang:::T(.)

tests/testthat/test-trace-collapse-magrittr.txt

@@ -17,5 +17,5 @@ Collapsed:
 
 Branch:
  1. rlang:::f(.)
- 9. rlang:::g(., 1, 2)
+ 1. rlang:::g(., 1, 2)
  9. rlang:::h(3, ., 4)

tests/testthat/test-trace-collapse-magrittr2.txt

@@ -17,5 +17,5 @@ Collapsed:
 
 Branch:
  1. rlang:::f(NULL)
- 9. rlang:::g(., list(.))
+ 1. rlang:::g(., list(.))
  9. rlang:::h(3, ., list(.))