Use withCallingHandler when wrapping errors

instead of tryCatch to ensure that the error is handled correctly. This is considered best practice (More information error when `quarto_run()` fails #184).

Author: cderv

R/quarto.R

@@ -97,8 +97,12 @@ quarto_available <- function(min = NULL, max = NULL, error = FALSE) {
     error = function(e) NULL
   )
   if (!is.null(quarto_version)) {
-    if (!is.null(min)) is_above <- quarto_version >= min
-    if (!is.null(max)) is_below <- quarto_version <= max
+    if (!is.null(min)) {
+      is_above <- quarto_version >= min
+    }
+    if (!is.null(max)) {
+      is_below <- quarto_version <= max
+    }
     found <- is_above && is_below
   }
   if (!found && error) {
@@ -134,50 +138,19 @@ quarto_run <- function(
   if (!quarto_available(min = "1.8.13")) {
     custom_env <- c("current", QUARTO_R = R.home("bin"))
   }
-  res <- tryCatch(
-    {
-      processx::run(
-        quarto_bin,
-        args = args,
-        echo = echo,
-        error_on_status = TRUE,
-        echo_cmd = echo_cmd,
-        env = custom_env,
-        ...
-      )
-    },
-    error = function(e) {
-      if (!inherits(e, "system_command_status_error")) {
-        cli::cli_abort(
-          c("!" = "Error running quarto CLI from R."),
-          call = .call,
-          parent = e
-        )
-      } else {
-        msg <- c(x = "Error returned by quarto CLI.")
-        # if there is an error message from quarto CLI, add it to the message
-        if (e$stderr != "") {
-          quarto_error_msg <- xfun::split_lines(e$stderr)
-          names(quarto_error_msg) <- rep(" ", length(quarto_error_msg))
-          msg <- c(
-            msg,
-            " " = paste0(rep("-", nchar(msg)), collapse = ""),
-            quarto_error_msg
-          )
-        }
-
-        # if `--quiet` has been set, quarto CLI won't report any error (e$stderr will be empty)
-        # So remind user to run without `--quiet` to see the full error message
-        if (cli_arg_quiet() %in% args)
-          msg <- c(
-            msg,
-            "i" = "Rerun with `quiet = FALSE` to see the full error message."
-          )
-
-        cli::cli_abort(msg, call = .call, parent = e)
-      }
-    }
+  res <- withCallingHandlers(
+    processx::run(
+      quarto_bin,
+      args = args,
+      echo = echo,
+      error_on_status = TRUE,
+      echo_cmd = echo_cmd,
+      env = custom_env,
+      ...
+    ),
+    error = function(cnd) wrap_quarto_error(cnd, args, .call = .call)
   )
+
   invisible(res)
 }
 
@@ -223,16 +196,20 @@ is_using_quarto <- function(dir = ".", verbose = FALSE) {
     0
   has_qmd <- length(list.files(dir, pattern = "\\.qmd$", full.names = TRUE)) > 0
   if (has_quarto_yml) {
-    if (verbose) cli::cli_inform("A {.file _quarto.yml} has been found.")
+    if (verbose) {
+      cli::cli_inform("A {.file _quarto.yml} has been found.")
+    }
     return(TRUE)
   } else if (has_qmd) {
-    if (verbose)
+    if (verbose) {
       cli::cli_inform("At least one file {.code *.qmd} has been found.")
+    }
     return(TRUE)
   }
   # not a directory using Quarto
-  if (verbose)
+  if (verbose) {
     cli::cli_inform("No {.file _quarto.yml} or {.code *.qmd} has been found.")
+  }
   return(FALSE)
 }
 
@@ -274,7 +251,9 @@ quarto_binary_sitrep <- function(verbose = TRUE, debug = FALSE) {
   quarto_found <- normalizePath(quarto_found, mustWork = FALSE)
 
   same_config <- TRUE
-  if (debug) verbose <- TRUE
+  if (debug) {
+    verbose <- TRUE
+  }
 
   # Quarto R package situation ----
   if (verbose) {
@@ -326,3 +305,41 @@ quarto_binary_sitrep <- function(verbose = TRUE, debug = FALSE) {
 
   return(same_config)
 }
+
+
+wrap_quarto_error <- function(cnd, args, .call = rlang::caller_env()) {
+  if (!inherits(commandArgs(), "system_command_status_error")) {
+    cli::cli_abort(
+      c("!" = "Error running quarto CLI from R."),
+      call = .call,
+      parent = cnd
+    )
+  } else {
+    msg <- c(x = "Error running quarto cli.")
+    # if there is an error message from quarto CLI, add it to the message
+    if (cnd$stderr != "") {
+      quarto_error_msg <- xfun::split_lines(cnd$stderr)
+      names(quarto_error_msg) <- rep(" ", length(quarto_error_msg))
+      msg <- c(
+        msg,
+        " " = paste0(rep("-", nchar(msg)), collapse = ""),
+        quarto_error_msg
+      )
+    }
+
+    # if `--quiet` has been set, quarto CLI won't report any error (cnd$stderr will be empty)
+    # So remind user to run without `--quiet` to see the full error message
+    if (cli_arg_quiet() %in% args) {
+      msg <- c(
+        msg,
+        "i" = "Rerun with `quiet = FALSE` to see the full error message."
+      )
+    }
+
+    cli::cli_abort(
+      msg,
+      call = .call,
+      parent = cnd,
+    )
+  }
+}