Pass around calls

Author: teunbrand

R/scale-.R

@@ -887,7 +887,7 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
     c("aesthetics", "scale_name", "super", "call", "position")
   ),
 
-  update_params = function(self, params, default = FALSE) {
+  update_params = function(self, params, default = FALSE, call = NULL) {
 
     if ("trans" %in% names(params)) {
       # We're using the old transform to revert the limits to input data, so
@@ -896,7 +896,7 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
         self$limits <- self$trans$inverse(self$limits)
       }
     }
-    ggproto_parent(Scale, self)$update_params(params, default = default)
+    ggproto_parent(Scale, self)$update_params(params, default = default, call = call)
     return()
   },
 

R/scale-partial.R

@@ -3,7 +3,7 @@
 scale_x <- function(...) scale_partial(aesthetic = "x", ...)
 scale_y <- function(...) scale_partial(aesthetic = "y", ...)
 
-scale_partial <- function(aesthetic, ..., call = caller_env()) {
+scale_partial <- function(aesthetic, ..., call = caller_call()) {
 
   check_string(aesthetic, allow_empty = FALSE)
   aesthetic <- standardise_aes_names(aesthetic)
@@ -21,8 +21,11 @@ scale_partial <- function(aesthetic, ..., call = caller_env()) {
   )
   args[lambdas] <- lapply(args[lambdas], allow_lambda)
 
+  call <- call %||% current_call()
+
   ggproto(
     NULL, ScalePartial,
+    call = call,
     aesthetics = aesthetic,
     params = args
   )
@@ -33,8 +36,9 @@ ScalePartial <- ggproto(
 
   aesthetics = character(),
   params = list(),
+  call = NULL,
 
-  update_params = function(self, params, default = FALSE) {
+  update_params = function(self, params, default = FALSE, call = self$call) {
     self$params <- defaults(params, self$params)
   },
 

R/scales-.R

@@ -36,7 +36,7 @@ ScalesList <- ggproto("ScalesList", NULL,
       # `default = TRUE` here because upon adding a partial scale,
       # we need to override parameters, regardless of whether `prev_scale` is
       # a full or partial scale.
-      prev_scale$update_params(scale$params, default = TRUE)
+      prev_scale$update_params(scale$params, default = TRUE, call = scale$call)
       self$scales <- c(self$scales[!prev_aes], list(prev_scale))
       return()
     }
@@ -45,7 +45,8 @@ ScalesList <- ggproto("ScalesList", NULL,
       if (!default) {
         scale <- scale$clone()
       }
-      scale$update_params(prev_scale$params, default = default)
+      scale$update_params(prev_scale$params, default = default,
+                          call = prev_scale$call)
       self$scales <- c(self$scales[!prev_aes], list(scale))
       return()
     }