Skip to content

Give label_bquote() access to calling environment #4453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2021
Merged

Give label_bquote() access to calling environment #4453

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
331f106
convert param to environment
thomasp85 Apr 27, 2021
a8e2120
add test
thomasp85 Apr 28, 2021
e006e92
Fix test for old R versions
thomasp85 Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# ggplot2 (development version)

* Make sure `label_bquote()` has access to the calling environment when
evaluating the labels (@thomasp85, #4141)

* Fix bug in `annotate_logticks()` that would cause an error when used together
with `coord_flip()` (@thomasp85, #3954)
Expand Down
4 changes: 3 additions & 1 deletion R/labeller.r
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ label_bquote <- function(rows = NULL, cols = NULL,
rows_quoted <- substitute(rows)
has_warned <- FALSE

call_env <- env_parent()

fun <- function(labels) {
quoted <- resolve_labeller(rows_quoted, cols_quoted, labels)
if (is.null(quoted)) {
Expand All @@ -225,7 +227,7 @@ label_bquote <- function(rows = NULL, cols = NULL,
}
params$x <- params[[1]]
}

params <- as_environment(params, call_env)
eval(substitute(bquote(expr, params), list(expr = quoted)))
}
list(do.call("Map", c(list(f = evaluate), labels)))
Expand Down