Merge pull request #98 from mlverse/updates

Updates
mlverse · May 2, 2024 · 5ed63d0 · 5ed63d0
2 parents cd96c9a + 4c91123
commit 5ed63d0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 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-defaults.R b/R/chattr-defaults.R
@@ -68,10 +68,12 @@ chattr_defaults <- function(type = "default",
       type <- "console"
     } else {
       type <- ui_current()
-      if (type == "markdown") type <- "notebook"
+
     }
   }
 
+  if (type == "markdown") type <- "notebook"
+
   if (force) {
     ch_env$defaults <- NULL
   }

diff --git a/R/chattr.R b/R/chattr.R
@@ -43,7 +43,15 @@ chattr <- function(prompt = NULL,
     while (ch_r_state() == "busy") {
       curr_text <- ch_r_output()
       ret <- c(ret, curr_text)
-      ide_paste_text(curr_text)
+      if(ui_current() == "markdown") {
+        cat(curr_text)
+      } else {
+        ide_paste_text(curr_text)
+      }
+    }
+    error <- ch_r_error()
+    if (!is.null(error)) {
+      abort(error)
     }
   } else {
     ret <- ch_submit(