Improves how error is capture, displayed, and returned

mlverse · May 2, 2024 · f366992 · f366992
1 parent c83da30
commit f366992
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/R/app-server.R b/R/app-server.R
@@ -99,8 +99,7 @@ app_server <- function(input, output, session) {
     error <- ch_r_error()
     if (!is.null(error)) {
       stopApp()
-      print(error)
-      abort("Streaming returned error")
+      abort(error)
     }
   })
 }

diff --git a/R/ch-r.R b/R/ch-r.R
@@ -46,11 +46,13 @@ ch_r_output <- function() {
 
 ch_r_error <- function() {
   out <- NULL
-  if (!is.null(ch_env$r_session)) {
-    read_session <- ch_env$r_session$read()
-    if (!is.null(read_session)) {
-      out <- read_session$error
+  err <- ch_env$r_session$read_error()
+  if (err != "") {
+    error_marker <- "! {error}"
+    if(substr(err, 1, nchar(error_marker)) == error_marker) {
+      err <- substr(err, nchar(error_marker) + 1, nchar(err))
     }
+    out <- err
   }
   out
 }
diff --git a/R/chattr.R b/R/chattr.R
@@ -45,6 +45,10 @@ chattr <- function(prompt = NULL,
       ret <- c(ret, curr_text)
       ide_paste_text(curr_text)
     }
+    error <- ch_r_error()
+    if (!is.null(error)) {
+      abort(error)
+    }
   } else {
     ret <- ch_submit(
       defaults = defaults,