Fix formals of compute_layer()

NEWS.md

@@ -134,6 +134,9 @@ core developer team.
     this can be used to have inwards ticks on the x-axis (`axis.ticks.length.x`) and
     outwards ticks on the y-axis (`axis.ticks.length.y`) (@pank, #2935).
 
+* The arguments of `Stat*$compute_layer()` and `Position*$compute_layer()` are
+  now renamed to always match the ones of `Stat$compute_layer()` and
+  `Position$compute_layer()` (@yutannihilation, #3202).
 
 # ggplot2 3.1.0
 

R/position-identity.r

@@ -11,7 +11,7 @@ position_identity <- function() {
 #' @usage NULL
 #' @export
 PositionIdentity <- ggproto("PositionIdentity", Position,
-  compute_layer = function(data, params, scales) {
+  compute_layer = function(self, data, params, layout) {
     data
   }
 )

R/position-jitter.r

@@ -72,7 +72,7 @@ PositionJitter <- ggproto("PositionJitter", Position,
     )
   },
 
-  compute_layer = function(data, params, panel) {
+  compute_layer = function(self, data, params, layout) {
     trans_x <- if (params$width > 0) function(x) jitter(x, amount = params$width)
     trans_y <- if (params$height > 0) function(x) jitter(x, amount = params$height)
 

R/position-nudge.R

@@ -45,7 +45,7 @@ PositionNudge <- ggproto("PositionNudge", Position,
     list(x = self$x, y = self$y)
   },
 
-  compute_layer = function(data, params, panel) {
+  compute_layer = function(self, data, params, layout) {
     # transform only the dimensions for which non-zero nudging is requested
     if (any(params$x != 0)) {
       if (any(params$y != 0)) {

R/stat-bindot.r

@@ -14,13 +14,13 @@ StatBindot <- ggproto("StatBindot", Stat,
     params
   },
 
-  compute_layer = function(self, data, params, panels) {
+  compute_layer = function(self, data, params, layout) {
     data <- remove_missing(data, params$na.rm,
       params$binaxis,
       snake_class(self),
       finite = TRUE
     )
-    ggproto_parent(Stat, self)$compute_layer(data, params, panels)
+    ggproto_parent(Stat, self)$compute_layer(data, params, layout)
   },
 
   compute_panel = function(self, data, scales, na.rm = FALSE, binwidth = NULL,

R/stat-identity.r

@@ -33,7 +33,7 @@ stat_identity <- function(mapping = NULL, data = NULL,
 #' @usage NULL
 #' @export
 StatIdentity <- ggproto("StatIdentity", Stat,
-  compute_layer = function(data, scales, params) {
+  compute_layer = function(self, data, params, layout) {
     data
   }
 )