Fix regression in colour/fill scale name redirection (#6642)

* new colour scales feed first argument to `name`

* add test

* add news bullet

* fix mismerged lines

* account for interaction with #6691

Author: teunbrand

NEWS.md

@@ -15,6 +15,8 @@
 * Improved palette fallback mechanism in scales (@teunbrand, #6669).
 * Allow `stat` in `geom_hline`, `geom_vline`, and `geom_abline`. (@sierrajohnson, #6559)
 * `stat_boxplot()` treats `width` as an optional aesthetic (@Yunuuuu, #6575)
+* Fixed regression where the first (unnamed) argument to colour/fill scales was 
+  not passed as the `name` argument (@teunbrand, #6623)
 
 # ggplot2 4.0.0
 

R/scale-colour.R

@@ -26,8 +26,8 @@
 #'   * a single string naming a palette.
 #'   * a palette function that when called with a numeric vector with values
 #'     between 0 and 1 returns the corresponding output values.
-#' @inheritDotParams continuous_scale -scale_name -trans -minor_breaks -expand
-#' @inheritDotParams binned_scale -scale_name -trans -expand
+#' @inheritDotParams continuous_scale -scale_name -trans -minor_breaks -expand -fallback.palette
+#' @inheritDotParams binned_scale -scale_name -trans -expand -fallback.palette
 #' @param type `r lifecycle::badge("superseded")` The preferred mechanism for
 #'   setting the default palette is by using the theme. For example:
 #'   `theme(palette.colour.discrete = "viridis")`.
@@ -91,7 +91,8 @@ scale_colour_continuous <- function(..., palette = NULL, aesthetics = "colour",
   }
   palette <- if (!is.null(palette)) as_continuous_pal(palette)
   continuous_scale(
-    aesthetics, palette = palette, guide = guide, na.value = na.value,
+    aesthetics = aesthetics, palette = palette, guide = guide,
+    na.value = na.value, scale_name = deprecated(),
     fallback.palette = pal_seq_gradient("#132B43", "#56B1F7"),
     ...
   )
@@ -114,7 +115,8 @@ scale_fill_continuous <- function(..., palette = NULL, aesthetics = "fill", guid
   }
   palette <- if (!is.null(palette)) as_continuous_pal(palette)
   continuous_scale(
-    aesthetics, palette = palette, guide = guide, na.value = na.value,
+    aesthetics = aesthetics, palette = palette, guide = guide,
+    na.value = na.value, scale_name = deprecated(),
     fallback.palette = pal_seq_gradient("#132B43", "#56B1F7"),
     ...
   )
@@ -137,7 +139,8 @@ scale_colour_binned <- function(..., palette = NULL, aesthetics = "colour", guid
   }
   palette <- if (!is.null(palette)) pal_binned(as_discrete_pal(palette))
   binned_scale(
-    aesthetics, palette = palette, guide = guide, na.value = na.value,
+    aesthetics = aesthetics, palette = palette, guide = guide,
+    na.value = na.value, scale_name = deprecated(),
     fallback.palette = pal_seq_gradient("#132B43", "#56B1F7"),
     ...
   )
@@ -159,7 +162,8 @@ scale_fill_binned <- function(..., palette = NULL, aesthetics = "fill", guide =
   }
   palette <- if (!is.null(palette)) pal_binned(as_discrete_pal(palette))
   binned_scale(
-    aesthetics, palette = palette, guide = guide, na.value = na.value,
+    aesthetics = aesthetics, palette = palette, guide = guide,
+    na.value = na.value, scale_name = deprecated(),
     fallback.palette = pal_seq_gradient("#132B43", "#56B1F7"),
     ...
   )
@@ -175,7 +179,7 @@ scale_fill_binned <- function(..., palette = NULL, aesthetics = "fill", guide =
 #'   * a single string naming a palette.
 #'   * a palette function that when called with a single integer argument (the
 #'     number of levels in the scale) returns the values that they should take.
-#' @inheritDotParams discrete_scale -scale_name -expand -position -minor_breaks
+#' @inheritDotParams discrete_scale -scale_name -expand -position -minor_breaks -fallback.palette
 #' @inheritParams discrete_scale
 #' @param type `r lifecycle::badge("superseded")` The preferred mechanism for
 #'   setting the default palette is by using the theme. For example:
@@ -218,7 +222,8 @@ scale_colour_discrete <- function(..., palette = NULL, aesthetics = "colour", na
   }
   palette <- if (!is.null(palette)) as_discrete_pal(palette)
   discrete_scale(
-    aesthetics, palette = palette, na.value = na.value,
+    aesthetics = aesthetics, palette = palette, na.value = na.value,
+    scale_name = deprecated(),
     fallback.palette = pal_hue(),
     ...
   )
@@ -240,7 +245,8 @@ scale_fill_discrete <- function(..., palette = NULL, aesthetics = "fill", na.val
   }
   palette <- if (!is.null(palette)) as_discrete_pal(palette)
   discrete_scale(
-    aesthetics, palette = palette, na.value = na.value,
+    aesthetics = aesthetics, palette = palette, na.value = na.value,
+    scale_name = deprecated(),
     fallback.palette = pal_hue(),
     ...
   )

tests/testthat/test-scale-colour.R

@@ -49,3 +49,22 @@ test_that("palette arguments can take alternative input", {
   expect_equal(alpha(test, 1), hex)
 
 })
+
+test_that("`name` is directed correctly (#6623)", {
+  # The desired behaviour is that the first argument passed to scales is the
+  # 'name' argument.
+
+  scales <- list(
+    scale_colour_continuous,
+    scale_colour_discrete,
+    scale_colour_binned,
+    scale_fill_continuous,
+    scale_fill_discrete,
+    scale_fill_binned
+  )
+
+  for (scale in scales) {
+    p <- scale("foobar")
+    expect_equal(p$name, "foobar")
+  }
+})