Fix check_installed() within catch-all tryCatch(error = )

Closes #1402
Part of tidyverse/ggplot2#4845

Author: lionel-

NEWS.md

@@ -1,5 +1,8 @@
 # rlang (development version)
 
+* `check_installed()` now works within catch-all `tryCatch(error = )`
+  expressions (#1402, tidyverse/ggplot2#4845).
+
 * `arg_match()` and `arg_match0()` now mention the correct call in
   case of type error (#1388).
 

R/session.R

@@ -244,12 +244,17 @@ check_installed <- function(pkg,
     "Would you like to install it?",
     "Would you like to install them?"
   )
-
-  cat(paste_line(
+  question <- paste_line(
     paste0(info(), " ", header),
     paste0(cross(), " ", question),
     .trailing = TRUE
-  ))
+  )
+
+  if (is_true(peek_option("rlang:::check_installed_test_hook"))) {
+    return(question)
+  }
+
+  cat(question)
 
   if (utils::menu(c("Yes", "No")) != 1) {
     # Pass condition in case caller sets up an `abort` restart
@@ -371,6 +376,8 @@ cnd_header.rlib_error_package_not_found <- function(cnd, ...) {
 }
 
 signal_package_not_found <- function(cnd) {
+  class(cnd) <- vec_remove(class(cnd), "error")
+
   withRestarts({
     signalCondition(cnd)
     FALSE

R/utils.R

@@ -365,3 +365,12 @@ style_rlang_run <- function(code) {
     paste0("rstudio:run:rlang::", code)
   )
 }
+
+vec_remove <- function(x, values) {
+  loc <- match(values, x, nomatch = 0)
+  if (sum(loc) == 0) {
+    x
+  } else {
+    x[-loc]
+  }
+}

tests/testthat/_snaps/session.md

@@ -186,3 +186,11 @@
       Error in `check_installed()`:
       ! `action` must take a `...` argument.
 
+# `check_installed()` works within `tryCatch(error = )` (#1402, tidyverse/ggplot2#4845)
+
+    Code
+      cat(tryCatch(error = function(cnd) NULL, check_installed("rlangFoo")))
+    Output
+      i The package `rlangFoo` is required.
+      x Would you like to install it?
+

tests/testthat/test-session.R

@@ -204,3 +204,15 @@ test_that("`action` is checked", {
     err(check_installed("foo", action = identity))
   })
 })
+
+test_that("`check_installed()` works within `tryCatch(error = )` (#1402, tidyverse/ggplot2#4845)", {
+  local_options("rlang:::check_installed_test_hook" = TRUE)
+  local_interactive()
+
+  expect_snapshot({
+    cat(tryCatch(
+      error = function(cnd) NULL,
+      check_installed("rlangFoo")
+    ))
+  })
+})