Don't use a restart to handle stop_on_error = 2L

R/conditions.R

@@ -34,7 +34,8 @@ condition_handlers <- function(watcher, on_error, on_warning, on_message) {
       switch(on_error,
         continue = invokeRestart("eval_continue"),
         stop = invokeRestart("eval_stop"),
-        error = invokeRestart("eval_error", cnd)
+        # No need to invoke a restart as we want the error to be thrown in this case.
+        error = NULL
       )
     }
   )

R/evaluate.R

@@ -151,8 +151,7 @@ evaluate <- function(input,
         handlers
       ),
       eval_continue = function() TRUE,
-      eval_stop = function() FALSE,
-      eval_error = function(cnd) {signalCondition(cnd); stop(cnd)}
+      eval_stop = function() FALSE
     )
     watcher$check_devices()
 

tests/testthat/_snaps/conditions.md

@@ -13,4 +13,15 @@
     Condition
       Error:
       ! 1
+    Output
+      <evaluation>
+      Source code: 
+        stop("1")
+      Condition: 
+        Error:
+        1
+      Source code: 
+        2
+      Text output: 
+        [1] 2