chain error a bit differently so that system_command_status_error are wrapped before wrapping all errors

Author: cderv

R/quarto.R

@@ -148,7 +148,16 @@ quarto_run <- function(
       env = custom_env,
       ...
     ),
-    error = function(e) wrap_quarto_error(e, args, .call = .call)
+    system_command_status_error = function(e) {
+      wrap_quarto_error(e, args, .call = .call)
+    },
+    error = function(e) {
+      cli::cli_abort(
+        c("!" = "Error running quarto CLI from R."),
+        call = .call,
+        parent = e
+      )
+    }
   )
 
   invisible(res)
@@ -308,38 +317,30 @@ quarto_binary_sitrep <- function(verbose = TRUE, debug = FALSE) {
 
 
 wrap_quarto_error <- function(cnd, args, .call = rlang::caller_env()) {
-  if (!inherits(cnd, "system_command_status_error")) {
-    cli::cli_abort(
-      c("!" = "Error running quarto CLI from R."),
-      call = .call,
-      parent = cnd
+  msg <- c(x = "Error returned by 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
     )
-  } else {
-    msg <- c(x = "Error returned by 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(
+  # 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,
-      call = .call,
-      parent = cnd,
+      "i" = "Rerun with `quiet = FALSE` to see the full error message."
     )
   }
+
+  cli::cli_abort(
+    msg,
+    call = .call,
+    parent = cnd,
+  )
 }

tests/testthat/_snaps/quarto.md

@@ -4,6 +4,8 @@
       quarto_run(c("rend", "--quiet"))
     Condition
       Error:
+      ! Error running quarto CLI from R.
+      Caused by error:
       x Error returned by quarto CLI.
       i Rerun with `quiet = FALSE` to see the full error message.
       Caused by error:
@@ -15,6 +17,8 @@
       quarto_inspect()
     Condition
       Error in `quarto_inspect()`:
+      ! Error running quarto CLI from R.
+      Caused by error in `quarto_inspect()`:
       x Error returned by quarto CLI.
         -----------------------------
         ERROR: Book chapter 'intro.qmd' not found