rename is.waiver() -> is_waiver() for consistency

teunbrand · teunbrand · commit 2a3875c4e413 · 2025-04-10T13:00:38.000+02:00
diff --git a/NAMESPACE b/NAMESPACE
@@ -473,7 +473,6 @@ export(is.facet)
 export(is.ggplot)
 export(is.ggproto)
 export(is.theme)
-export(is.waiver)
 export(is_coord)
 export(is_facet)
 export(is_geom)
@@ -489,6 +488,7 @@ export(is_scale)
 export(is_stat)
 export(is_theme)
 export(is_theme_element)
+export(is_waiver)
 export(label_both)
 export(label_bquote)
 export(label_context)
diff --git a/NEWS.md b/NEWS.md
@@ -87,7 +87,7 @@ This is a small release focusing on fixing regressions from 3.5.0 and
   @yutannihilation's prior work, #3120)
 * When discrete breaks have names, they'll be used as labels by default 
   (@teunbrand, #6147).
-* The helper function `is.waiver()` is now exported to help extensions to work
+* The helper function `is_waiver()` is now exported to help extensions to work
   with `waiver()` objects (@arcresu, #6173).
 * Date(time) scales now throw appropriate errors when `date_breaks`, 
   `date_minor_breaks` or `date_labels` are not strings (@RodDalBen, #5880)
diff --git a/R/axis-secondary.R b/R/axis-secondary.R
@@ -129,7 +129,7 @@ is.sec_axis <- function(x) {
 }
 
 set_sec_axis <- function(sec.axis, scale) {
-  if (!is.waiver(sec.axis)) {
+  if (!is_waiver(sec.axis)) {
     if (scale$is_discrete()) {
       if (!identical(.subset2(sec.axis, "trans"), identity)) {
         cli::cli_abort("Discrete secondary axes must have the {.fn identity} transformation.")
@@ -182,9 +182,9 @@ AxisSecondary <- ggproto("AxisSecondary", NULL,
     if (!is.function(transform)) {
       cli::cli_abort("Transformation for secondary axes must be a function.")
     }
-    if (is.derived(self$name) && !is.waiver(scale$name)) self$name <- scale$name
+    if (is.derived(self$name) && !is_waiver(scale$name)) self$name <- scale$name
     if (is.derived(self$breaks)) self$breaks <- scale$breaks
-    if (is.waiver(self$breaks)) {
+    if (is_waiver(self$breaks)) {
       if (scale$is_discrete()) {
         self$breaks <- setNames(nm = scale$get_breaks())
       } else {
diff --git a/R/coord-sf.R b/R/coord-sf.R
@@ -116,7 +116,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
     x_breaks <- graticule$degree[graticule$type == "E"]
     if (is.null(scale_x$labels)) {
       x_labels <- rep(NA, length(x_breaks))
-    } else if (is.waiver(scale_x$labels)) {
+    } else if (is_waiver(scale_x$labels)) {
       x_labels <- graticule$degree_label[graticule$type == "E"]
       needs_autoparsing[graticule$type == "E"] <- TRUE
     } else {
@@ -141,7 +141,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,
     y_breaks <- graticule$degree[graticule$type == "N"]
     if (is.null(scale_y$labels)) {
       y_labels <- rep(NA, length(y_breaks))
-    } else if (is.waiver(scale_y$labels)) {
+    } else if (is_waiver(scale_y$labels)) {
       y_labels <- graticule$degree_label[graticule$type == "N"]
       needs_autoparsing[graticule$type == "N"] <- TRUE
     } else {
@@ -553,7 +553,7 @@ coord_sf <- function(xlim = NULL, ylim = NULL, expand = TRUE,
                      ndiscr = 100, default = FALSE, clip = "on",
                      reverse = "none") {
 
-  if (is.waiver(label_graticule) && is.waiver(label_axes)) {
+  if (is_waiver(label_graticule) && is_waiver(label_axes)) {
     # if both `label_graticule` and `label_axes` are set to waive then we
     # use the default of labels on the left and at the bottom
     label_graticule <- ""
@@ -640,13 +640,13 @@ sf_breaks <- function(scale_x, scale_y, bbox, crs) {
       bbox[is.na(bbox)] <- c(-180, -90, 180, 90)[is.na(bbox)]
     }
 
-    if (!(is.waiver(scale_x$breaks) && is.null(scale_x$n.breaks))) {
+    if (!(is_waiver(scale_x$breaks) && is.null(scale_x$n.breaks))) {
       x_breaks <- scale_x$get_breaks(limits = bbox[c(1, 3)])
       finite <- is.finite(x_breaks)
       x_breaks <- if (any(finite)) x_breaks[finite] else NULL
     }
 
-    if (!(is.waiver(scale_y$breaks) && is.null(scale_y$n.breaks))) {
+    if (!(is_waiver(scale_y$breaks) && is.null(scale_y$n.breaks))) {
       y_breaks <- scale_y$get_breaks(limits = bbox[c(2, 4)])
       finite <- is.finite(y_breaks)
       y_breaks <- if (any(finite)) y_breaks[finite] else NULL
diff --git a/R/facet-null.R b/R/facet-null.R
@@ -30,9 +30,9 @@ FacetNull <- ggproto("FacetNull", Facet,
     layout_null()
   },
   map_data = function(data, layout, params) {
-    # Need the is.waiver check for special case where no data, but aesthetics
+    # Need the is_waiver check for special case where no data, but aesthetics
     # are mapped to vectors
-    if (is.waiver(data))
+    if (is_waiver(data))
       return(data_frame0(PANEL = factor()))
 
     if (empty(data))
diff --git a/R/guide-axis-theta.R b/R/guide-axis-theta.R
@@ -196,7 +196,7 @@ GuideAxisTheta <- ggproto(
     }
 
     # Resolve text angle
-    if (is.waiver(params$angle) || is.null(params$angle)) {
+    if (is_waiver(params$angle) || is.null(params$angle)) {
       angle <- elements$text$angle
     } else {
       angle <- flip_text_angle(params$angle - rad2deg(key$theta))
@@ -272,7 +272,7 @@ GuideAxisTheta <- ggproto(
     }
 
     # Resolve text angle
-    if (is.waiver(params$angle %||% waiver())) {
+    if (is_waiver(params$angle %||% waiver())) {
       angle <- elements$text$angle
     } else {
       angle <- flip_text_angle(params$angle - rad2deg(key$theta))
diff --git a/R/guide-bins.R b/R/guide-bins.R
@@ -341,7 +341,7 @@ GuideBins <- ggproto(
 
 parse_binned_breaks <- function(scale, breaks = scale$get_breaks()) {
 
-  if (is.waiver(scale$labels) || is.function(scale$labels)) {
+  if (is_waiver(scale$labels) || is.function(scale$labels)) {
     breaks <- breaks[!is.na(breaks)]
   }
   if (length(breaks) == 0) {
diff --git a/R/guide-custom.R b/R/guide-custom.R
@@ -96,7 +96,7 @@ GuideCustom <- ggproto(
     # Render title
     params <- replace_null(params, position = position, direction = direction)
     elems <- GuideLegend$setup_elements(params, self$elements, theme)
-    if (!is.waiver(params$title) && !is.null(params$title)) {
+    if (!is_waiver(params$title) && !is.null(params$title)) {
       title <- self$build_title(params$title, elems, params)
     } else {
       title <- zeroGrob()
diff --git a/R/labels.R b/R/labels.R
@@ -189,7 +189,7 @@ labs <- function(..., title = waiver(), subtitle = waiver(), caption = waiver(),
     tag = tag, alt = allow_lambda(alt), alt_insight = alt_insight,
     dictionary = dictionary, .ignore_empty = "all")
 
-  is_waive <- vapply(args, is.waiver, logical(1))
+  is_waive <- vapply(args, is_waiver, logical(1))
   args <- args[!is_waive]
   # remove duplicated arguments
   args <- args[!duplicated(names(args))]
diff --git a/R/layer.R b/R/layer.R
@@ -248,7 +248,7 @@ Layer <- ggproto("Layer", NULL,
   },
 
   layer_data = function(self, plot_data) {
-    if (is.waiver(self$data)) {
+    if (is_waiver(self$data)) {
       data <- plot_data
     } else if (is.function(self$data)) {
       data <- self$data(plot_data)
@@ -258,7 +258,7 @@ Layer <- ggproto("Layer", NULL,
     } else {
       data <- self$data
     }
-    if (is.null(data) || is.waiver(data)) data else unrowname(data)
+    if (is.null(data) || is_waiver(data)) data else unrowname(data)
   },
 
   # hook to allow a layer access to the final layer data
diff --git a/R/layout.R b/R/layout.R
@@ -291,7 +291,7 @@ Layout <- ggproto("Layout", NULL,
         } else {
           switch(label, x = ".bottom", y = ".right")
         }
-        if (is.null(labels[[label]][[i]]) || is.waiver(labels[[label]][[i]]))
+        if (is.null(labels[[label]][[i]]) || is_waiver(labels[[label]][[i]]))
           return(zeroGrob())
 
         element_render(
diff --git a/R/scale-.R b/R/scale-.R
@@ -777,7 +777,7 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
     # don't support conversion to numeric (#5304)
     if (zero_range(as.numeric(transformation$transform(limits)))) {
       breaks <- limits[1]
-    } else if (is.waiver(self$breaks)) {
+    } else if (is_waiver(self$breaks)) {
       if (!is.null(self$n.breaks) && trans_support_nbreaks(transformation)) {
         breaks <- transformation$breaks(limits, self$n.breaks)
       } else {
@@ -819,7 +819,7 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
     b <- b[is.finite(b)]
 
     transformation <- self$get_transformation()
-    if (is.waiver(self$minor_breaks)) {
+    if (is_waiver(self$minor_breaks)) {
       if (is.null(b)) {
         breaks <- NULL
       } else {
@@ -866,7 +866,7 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
       )
     }
 
-    if (is.waiver(self$labels)) {
+    if (is_waiver(self$labels)) {
       labels <- transformation$format(breaks)
     } else if (is.function(self$labels)) {
       labels <- self$labels(breaks)
@@ -1053,7 +1053,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
       )
     }
 
-    if (is.waiver(self$breaks)) {
+    if (is_waiver(self$breaks)) {
       breaks <- limits
     } else if (is.function(self$breaks)) {
       breaks <- self$breaks(limits)
@@ -1117,7 +1117,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
       )
     }
 
-    if (is.waiver(labels)) {
+    if (is_waiver(labels)) {
       if (!is.null(names(breaks))) {
         labels <- names(breaks)
       } else if (is.numeric(breaks)) {
@@ -1273,7 +1273,7 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
         "Invalid {.arg breaks} specification. Use {.code NULL}, not {.code NA}.",
         call = self$call
       )
-    } else if (is.waiver(self$breaks)) {
+    } else if (is_waiver(self$breaks)) {
       if (self$nice.breaks) {
         if (!is.null(self$n.breaks) && trans_support_nbreaks(transformation)) {
           breaks <- transformation$breaks(limits, n = self$n.breaks)
@@ -1368,7 +1368,7 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
         "Invalid {.arg labels} specification. Use {.code NULL}, not {.code NA}.",
         call = self$call
       )
-    } else if (is.waiver(self$labels)) {
+    } else if (is_waiver(self$labels)) {
       labels <- transformation$format(breaks)
     } else if (is.function(self$labels)) {
       labels <- self$labels(breaks)
diff --git a/R/scale-continuous.R b/R/scale-continuous.R
@@ -149,21 +149,21 @@ ScaleContinuousPosition <- ggproto("ScaleContinuousPosition", ScaleContinuous,
   },
   break_info = function(self, range = NULL) {
     breaks <- ggproto_parent(ScaleContinuous, self)$break_info(range)
-    if (!(is.waiver(self$secondary.axis) || self$secondary.axis$empty())) {
+    if (!(is_waiver(self$secondary.axis) || self$secondary.axis$empty())) {
       self$secondary.axis$init(self)
       breaks <- c(breaks, self$secondary.axis$break_info(breaks$range, self))
     }
     breaks
   },
   sec_name = function(self) {
-    if (is.waiver(self$secondary.axis)) {
+    if (is_waiver(self$secondary.axis)) {
       waiver()
     } else {
       self$secondary.axis$name
     }
   },
   make_sec_title = function(self, ...) {
-    if (!is.waiver(self$secondary.axis)) {
+    if (!is_waiver(self$secondary.axis)) {
       self$secondary.axis$make_title(...)
     } else {
       ggproto_parent(ScaleContinuous, self)$make_sec_title(...)
diff --git a/R/scale-date.R b/R/scale-date.R
@@ -318,15 +318,15 @@ datetime_scale <- function(aesthetics, transform, trans = deprecated(),
   if (is.character(breaks)) breaks <- breaks_width(breaks)
   if (is.character(minor_breaks)) minor_breaks <- breaks_width(minor_breaks)
 
-  if (!is.waiver(date_breaks)) {
+  if (!is_waiver(date_breaks)) {
     check_string(date_breaks)
     breaks <- breaks_width(date_breaks)
   }
-  if (!is.waiver(date_minor_breaks)) {
+  if (!is_waiver(date_minor_breaks)) {
     check_string(date_minor_breaks)
     minor_breaks <- breaks_width(date_minor_breaks)
   }
-  if (!is.waiver(date_labels)) {
+  if (!is_waiver(date_labels)) {
     check_string(date_labels)
     if (transform == "hms") {
       labels <- label_time(date_labels)
@@ -404,21 +404,21 @@ ScaleContinuousDatetime <- ggproto("ScaleContinuousDatetime", ScaleContinuous,
   },
   break_info = function(self, range = NULL) {
     breaks <- ggproto_parent(ScaleContinuous, self)$break_info(range)
-    if (!(is.waiver(self$secondary.axis) || self$secondary.axis$empty())) {
+    if (!(is_waiver(self$secondary.axis) || self$secondary.axis$empty())) {
       self$secondary.axis$init(self)
       breaks <- c(breaks, self$secondary.axis$break_info(breaks$range, self))
     }
     breaks
   },
   sec_name = function(self) {
-    if (is.waiver(self$secondary.axis)) {
+    if (is_waiver(self$secondary.axis)) {
       waiver()
     } else {
       self$secondary.axis$name
     }
   },
   make_sec_title = function(self, ...) {
-    if (!is.waiver(self$secondary.axis)) {
+    if (!is_waiver(self$secondary.axis)) {
       self$secondary.axis$make_title(...)
     } else {
       ggproto_parent(ScaleContinuous, self)$make_sec_title(...)
@@ -458,21 +458,21 @@ ScaleContinuousDate <- ggproto("ScaleContinuousDate", ScaleContinuous,
   },
   break_info = function(self, range = NULL) {
     breaks <- ggproto_parent(ScaleContinuous, self)$break_info(range)
-    if (!(is.waiver(self$secondary.axis) || self$secondary.axis$empty())) {
+    if (!(is_waiver(self$secondary.axis) || self$secondary.axis$empty())) {
       self$secondary.axis$init(self)
       breaks <- c(breaks, self$secondary.axis$break_info(breaks$range, self))
     }
     breaks
   },
   sec_name = function(self) {
-    if (is.waiver(self$secondary.axis)) {
+    if (is_waiver(self$secondary.axis)) {
       waiver()
     } else {
       self$secondary.axis$name
     }
   },
   make_sec_title = function(self, ...) {
-    if (!is.waiver(self$secondary.axis)) {
+    if (!is_waiver(self$secondary.axis)) {
       self$secondary.axis$make_title(...)
     } else {
       ggproto_parent(ScaleContinuous, self)$make_sec_title(...)
diff --git a/R/scale-discrete-.R b/R/scale-discrete-.R
@@ -185,7 +185,7 @@ ScaleDiscretePosition <- ggproto("ScaleDiscretePosition", ScaleDiscrete,
   },
 
   sec_name = function(self) {
-    if (is.waiver(self$secondary.axis)) {
+    if (is_waiver(self$secondary.axis)) {
       waiver()
     } else {
       self$secondary.axis$name
diff --git a/R/scale-manual.R b/R/scale-manual.R
@@ -171,7 +171,7 @@ manual_scale <- function(aesthetic, values = NULL, breaks = waiver(),
   }
 
   # order values according to breaks
-  if (is.vector(values) && is.null(names(values)) && !is.waiver(breaks) &&
+  if (is.vector(values) && is.null(names(values)) && !is_waiver(breaks) &&
       !is.null(breaks) && !is.function(breaks)) {
     if (length(breaks) <= length(values)) {
       names(values) <- breaks
diff --git a/R/scale-view.R b/R/scale-view.R
@@ -45,7 +45,7 @@ view_scale_primary <- function(scale, limits = scale$get_limits(),
 view_scale_secondary <- function(scale, limits = scale$get_limits(),
                                  continuous_range = scale$dimension(limits = limits)) {
 
-  if (is.null(scale$secondary.axis) || is.waiver(scale$secondary.axis) || scale$secondary.axis$empty()) {
+  if (is.null(scale$secondary.axis) || is_waiver(scale$secondary.axis) || scale$secondary.axis$empty()) {
     # if there is no second axis, return the primary scale with no guide
     # this guide can be overridden using guides()
     primary_scale <- view_scale_primary(scale, limits, continuous_range)
diff --git a/R/utilities.R b/R/utilities.R
@@ -12,7 +12,7 @@ scales::alpha
 }
 
 "%|W|%" <- function(a, b) {
-  if (!is.waiver(a)) a else b
+  if (!is_waiver(a)) a else b
 }
 
 # Check required aesthetics are present
@@ -183,7 +183,7 @@ should_stop <- function(expr) {
 #' calling function should just use the default value.  It is used in certain
 #' functions to distinguish between displaying nothing (`NULL`) and
 #' displaying a default value calculated elsewhere (`waiver()`).
-#' `is.waiver()` reports whether an object is a waiver.
+#' `is_waiver()` reports whether an object is a waiver.
 #'
 #' @export
 #' @keywords internal
@@ -192,7 +192,12 @@ waiver <- function() structure(list(), class = "waiver")
 #' @param x An object to test
 #' @export
 #' @rdname waiver
-is.waiver <- function(x) inherits(x, "waiver")
+is_waiver <- function(x) inherits(x, "waiver")
+
+is.waiver <- function(x) {
+  deprecate_warn0("4.0.0", "is.waiver()", "is_waiver()")
+  is_waiver(x)
+}
 
 pal_binned <- function(palette) {
   force(palette)
@@ -279,7 +284,7 @@ snake_class <- function(x) {
 }
 
 empty <- function(df) {
-  is.null(df) || nrow(df) == 0 || ncol(df) == 0 || is.waiver(df)
+  is.null(df) || nrow(df) == 0 || ncol(df) == 0 || is_waiver(df)
 }
 
 is.discrete <- function(x) {
diff --git a/man/waiver.Rd b/man/waiver.Rd

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ GuideBins <- ggproto(`
`341`	`341`
`342`	`342`	`parse_binned_breaks <- function(scale, breaks = scale$get_breaks()) {`
`343`	`343`
`344`		`- if (is.waiver(scale$labels) \|\| is.function(scale$labels)) {`
	`344`	`+ if (is_waiver(scale$labels) \|\| is.function(scale$labels)) {`
`345`	`345`	`breaks <- breaks[!is.na(breaks)]`
`346`	`346`	`}`
`347`	`347`	`if (length(breaks) == 0) {`