Use info bullet in chained errors

r-lib · Oct 14, 2022 · 1822141 · 1822141
1 parent c9c8539
commit 1822141
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/R/conditions.R b/R/conditions.R
@@ -19,9 +19,9 @@ with_chained_errors <- function(expr, action, call, eval_expr = NULL) {
         msg <- ""
       } else {
         code <- as_label(eval_expr)
-        msg <- cli::format_inline("Problem while evaluating {.code {code}}.")
+        msg <- cli::format_inline("In argument: {.code {code}}.")
       }
-      abort(msg, call = call, parent = cnd)
+      cli::cli_abort(c("i" = msg), call = call, parent = cnd)
     }
   )
 }

diff --git a/man/all_of.Rd b/man/all_of.Rd
diff --git a/tests/testthat/_snaps/eval-select.md b/tests/testthat/_snaps/eval-select.md
@@ -92,7 +92,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `f(base = TRUE)`.
+      i In argument: `f(base = TRUE)`.
       Caused by error in `h()`:
       ! foo
       ---
@@ -107,7 +107,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `f(base = FALSE)`.
+      i In argument: `f(base = FALSE)`.
       Caused by error in `h()`:
       ! foo
       ---
@@ -124,7 +124,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `1 + ""`.
+      i In argument: `1 + ""`.
       Caused by error in `1 + ""`:
       ! non-numeric argument to binary operator
     Code
@@ -133,7 +133,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `f()`.
+      i In argument: `f()`.
       Caused by error in `1 + ""`:
       ! non-numeric argument to binary operator
 
diff --git a/tests/testthat/_snaps/eval-walk.md b/tests/testthat/_snaps/eval-walk.md
@@ -61,7 +61,7 @@
       select_loc(iris, eval_tidy(foobar))
     Condition
       Error in `select_loc()`:
-      ! Problem while evaluating `eval_tidy(foobar)`.
+      i In argument: `eval_tidy(foobar)`.
       Caused by error:
       ! object 'foobar' not found
 

diff --git a/tests/testthat/_snaps/helpers-vector.md b/tests/testthat/_snaps/helpers-vector.md
@@ -4,7 +4,7 @@
       select_loc(letters2, all_of(c("a", "bar", "c")), strict = FALSE)
     Condition
       Error in `select_loc()`:
-      ! Problem while evaluating `all_of(c("a", "bar", "c"))`.
+      i In argument: `all_of(c("a", "bar", "c"))`.
       Caused by error in `all_of()`:
       ! Can't subset elements that don't exist.
       x Element `bar` doesn't exist.
@@ -28,7 +28,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `all_of(TRUE)`.
+      i In argument: `all_of(TRUE)`.
       Caused by error in `all_of()`:
       ! Must subset elements with a valid subscript vector.
       x Subscript has the wrong type `logical`.
@@ -38,7 +38,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `any_of(TRUE)`.
+      i In argument: `any_of(TRUE)`.
       Caused by error in `any_of()`:
       ! Must subset elements with a valid subscript vector.
       x Subscript has the wrong type `logical`.
@@ -48,7 +48,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `any_of(is.factor)`.
+      i In argument: `any_of(is.factor)`.
       Caused by error in `any_of()`:
       ! Must subset elements with a valid subscript vector.
       x Subscript has the wrong type `function`.
@@ -58,7 +58,7 @@
     Output
       <error/rlang_error>
       Error in `select_loc()`:
-      ! Problem while evaluating `all_of(is.factor)`.
+      i In argument: `all_of(is.factor)`.
       Caused by error in `all_of()`:
       ! Must subset elements with a valid subscript vector.
       x Subscript has the wrong type `function`.

diff --git a/tests/testthat/_snaps/vars-pull.md b/tests/testthat/_snaps/vars-pull.md
@@ -106,7 +106,7 @@
     Output
       <error/rlang_error>
       Error:
-      ! Problem while evaluating `f(base = TRUE)`.
+      i In argument: `f(base = TRUE)`.
       Caused by error in `h()`:
       ! foo
       ---
@@ -121,7 +121,7 @@
     Output
       <error/rlang_error>
       Error:
-      ! Problem while evaluating `f(base = FALSE)`.
+      i In argument: `f(base = FALSE)`.
       Caused by error in `h()`:
       ! foo
       ---