Clarify context() call implementation

r-lib · Aug 21, 2024 · e615901 · e615901
1 parent cc9f3d2
commit e615901
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/conditions.R b/R/conditions.R
@@ -54,7 +54,7 @@ sanitize_call <- function(cnd) {
   if (identical(cnd$call, quote(withVisible(do)))) {
     cnd$call <- NULL
   }
-  if (identical(cnd$call, quote(eval(as.call(list(context)), envir)))) {
+  if (identical(cnd$call, quote(eval(substitute(context()), envir)))) {
     cnd$call <- NULL
   }
 

diff --git a/R/evaluate.R b/R/evaluate.R
@@ -170,9 +170,9 @@ evaluate <- function(input,
     }
   }
 
-  # Here we use `eval()` to create an unwinding scope for `envir`.
-  # We call ourselves back immediately once the scope is created.
-  eval(as.call(list(context)), envir)
+  # Here we use `eval()` to create an unwinding scope for `envir`, using
+  # an inlined call to `context()`.
+  eval(substitute(context()), envir)
   watcher$capture_output()
 
   # Always capture last plot, even if incomplete