Facets catch wrapped errors better (#5671)

teunbrand · web-flow · commit cf43adc9d008 · 2024-02-27T16:51:38.000+01:00
* replace `tryCatch()` with `try_fetch()`

* add news bullet
diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,8 @@
 
 * Fixed bug where discrete scales could not map aesthetics only consisting of
   `NA`s (#5623)
+* Facet evaluation is better at dealing with inherited errors 
+  (@teunbrand, #5670).
 
 # ggplot2 3.5.0
 
diff --git a/R/facet-.R b/R/facet-.R
@@ -477,7 +477,7 @@ eval_facet <- function(facet, data, possible_columns = NULL) {
   mask <- new_data_mask(env)
   mask$.data <- as_data_pronoun(mask)
 
-  tryCatch(
+  try_fetch(
     eval_tidy(facet, mask),
     ggplot2_missing_facet_var = function(e) NULL
   )

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ eval_facet <- function(facet, data, possible_columns = NULL) {`
`477`	`477`	`mask <- new_data_mask(env)`
`478`	`478`	`mask$.data <- as_data_pronoun(mask)`
`479`	`479`
`480`		`- tryCatch(`
	`480`	`+ try_fetch(`
`481`	`481`	`eval_tidy(facet, mask),`
`482`	`482`	`ggplot2_missing_facet_var = function(e) NULL`
`483`	`483`	`)`