update compute_layer from ggplot2 source

LKremer · Nov 30, 2023 · 1855039 · 1855039
1 parent 8f0a857
commit 1855039
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -16,6 +16,7 @@ LazyData: true
 Depends:
     R (>= 3.2)
 Imports:
+    cli,
     ggplot2
 Suggests:
     viridis,

diff --git a/R/geom_pointdensity.R b/R/geom_pointdensity.R
@@ -81,10 +81,13 @@ StatPointdensity <- ggproto("StatPointdensity", Stat,
                               args <- c(list(data = quote(data), scales = quote(scales)), params)
                               ggplot2:::dapply(data, "PANEL", function(data) {
                                 scales <- layout$get_scales(data$PANEL[1])
-                                tryCatch(do.call(self$compute_panel, args), error = function(e) {
-                                  warning(glue::glue("Computation failed in `{ggplot2:::snake_class(self)}()`:\n{e$message}"))
-                                  ggplot2:::new_data_frame()
-                                })
+                                rlang::try_fetch(
+                                  rlang::inject(self$compute_panel(data = data, scales = scales, !!!params)),
+                                  error = function(cnd) {
+                                   cli::cli_warn("Computation failed in {.fn {ggplot2:::snake_class(self)}}", parent = cnd)
+                                    ggplot2:::data_frame0()
+                                  }
+                                )
                               })
                             },