Fix tidyverse#6289

Author: teunbrand

R/scale-colour.R

@@ -90,7 +90,9 @@ scale_colour_continuous <- function(..., palette = NULL, aesthetics = "colour",
                                     guide = "colourbar", na.value = "grey50",
                                     type = getOption("ggplot2.continuous.colour")) {
 
-  if (!is.null(type) && is.null(palette)) {
+  has_old_args <- any(names(enexprs(...)) %in% c("low", "high"))
+
+  if (has_old_args || !is.null(type) && is.null(palette)) {
     scale <- scale_backward_compatibility(
       ..., guide = guide, na.value = na.value, scale = type,
       aesthetic = "colour", type = "continuous"
@@ -110,7 +112,9 @@ scale_fill_continuous <- function(..., palette = NULL, aesthetics = "fill", guid
                                   na.value = "grey50",
                                   type = getOption("ggplot2.continuous.fill")) {
 
-  if (!is.null(type) && is.null(palette)) {
+  has_old_args <- any(names(enexprs(...)) %in% c("low", "high"))
+
+  if (has_old_args || !is.null(type) && is.null(palette)) {
     scale <- scale_backward_compatibility(
       ..., guide = guide, na.value = na.value, scale = type,
       aesthetic = "fill", type = "continuous"
@@ -129,7 +133,10 @@ scale_fill_continuous <- function(..., palette = NULL, aesthetics = "fill", guid
 scale_colour_binned <- function(..., palette = NULL, aesthetics = "colour", guide = "coloursteps",
                                 na.value = "grey50",
                                 type = getOption("ggplot2.binned.colour")) {
-  if (!is.null(type) && is.null(palette)) {
+
+  has_old_args <- any(names(enexprs(...)) %in% c("low", "high"))
+
+  if (has_old_args || !is.null(type) && is.null(palette)) {
     scale <- scale_backward_compatibility(
       ..., guide = guide, na.value = na.value, scale = type,
       aesthetic = "colour", type = "binned"
@@ -148,7 +155,9 @@ scale_colour_binned <- function(..., palette = NULL, aesthetics = "colour", guid
 scale_fill_binned <- function(..., palette = NULL, aesthetics = "fill", guide = "coloursteps",
                               na.value = "grey50",
                               type = getOption("ggplot2.binned.fill")) {
-  if (!is.null(type) && is.null(palette)) {
+  has_old_args <- any(names(enexprs(...)) %in% c("low", "high"))
+
+  if (has_old_args || !is.null(type) && is.null(palette)) {
     scale <- scale_backward_compatibility(
       ..., guide = guide, na.value = na.value, scale = type,
       aesthetic = "fill", type = "binned"
@@ -212,7 +221,10 @@ scale_fill_binned <- function(..., palette = NULL, aesthetics = "fill", guide =
 #' theme_set(old)
 scale_colour_discrete <- function(..., palette = NULL, aesthetics = "colour", na.value = "grey50",
                                   type = getOption("ggplot2.discrete.colour")) {
-  if (!is.null(type) && is.null(palette)) {
+
+  has_old_args <- any(names(enexprs(...)) %in% c("h", "c", "l", "h.start", "direction"))
+
+  if (has_old_args || !is.null(type) && is.null(palette)) {
     scale <- scale_backward_compatibility(
       ..., na.value = na.value, scale = type,
       aesthetic = "colour", type = "discrete"
@@ -230,7 +242,10 @@ scale_colour_discrete <- function(..., palette = NULL, aesthetics = "colour", na
 #' @export
 scale_fill_discrete <- function(..., palette = NULL, aesthetics = "fill", na.value = "grey50",
                                 type = getOption("ggplot2.discrete.fill")) {
-  if (!is.null(type) && is.null(palette)) {
+
+  has_old_args <- any(names(enexprs(...)) %in% c("h", "c", "l", "h.start", "direction"))
+
+  if (has_old_args || !is.null(type) && is.null(palette)) {
     scale <- scale_backward_compatibility(
       ..., na.value = na.value, scale = type,
       aesthetic = "fill", type = "discrete"