replace is.discrete() with is_discrete()

Author: teunbrand

R/grouping.R

@@ -12,7 +12,7 @@ add_group <- function(data) {
   if (empty(data)) return(data)
 
   if (is.null(data[["group"]])) {
-    disc <- vapply(data, is.discrete, logical(1))
+    disc <- vapply(data, is_discrete, logical(1))
     disc[names(disc) %in% c("label", "PANEL")] <- FALSE
 
     if (any(disc)) {

R/guide-legend.R

@@ -647,7 +647,7 @@ set_key_size <- function(key, linewidth = NULL, size = NULL, default = NULL) {
 keep_key_data <- function(key, data, aes, show) {
   # First, can we exclude based on anything else than actually checking the
   # data that we should include or drop the key?
-  if (!is.discrete(key$.value)) {
+  if (!is_discrete(key$.value)) {
     return(TRUE)
   }
   if (is_named(show)) {

R/quick-plot.R

@@ -121,7 +121,7 @@ qplot <- function(x, y, ..., data, facets = NULL, margins = FALSE,
       geom[geom == "auto"] <- "qq"
     } else if (missing(y)) {
       x <- eval_tidy(mapping$x, data, caller_env)
-      if (is.discrete(x)) {
+      if (is_discrete(x)) {
         geom[geom == "auto"] <- "bar"
       } else {
         geom[geom == "auto"] <- "histogram"

R/scale-.R

@@ -228,7 +228,7 @@ discrete_scale <- function(aesthetics, scale_name = deprecated(), palette, name
   labels <- allow_lambda(labels)
   minor_breaks <- allow_lambda(minor_breaks)
 
-  if (!is.function(limits) && (length(limits) > 0) && !is.discrete(limits)) {
+  if (!is.function(limits) && (length(limits) > 0) && !is_discrete(limits)) {
     cli::cli_warn(c(
       "Continuous limits supplied to discrete scale.",
       "i" = "Did you mean {.code limits = factor(...)} or {.fn scale_*_continuous}?"
@@ -965,7 +965,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
       return()
     }
     # Intercept error here to give examples and mention scale in call
-    if (!is.discrete(x)) {
+    if (!is_discrete(x)) {
       # These assumptions only hold for standard DiscreteRange class, so
       # we skip the error if another range class is used
       if (inherits(self$range, "DiscreteRange")) {

R/scale-discrete-.R

@@ -119,7 +119,7 @@ ScaleDiscretePosition <- ggproto("ScaleDiscretePosition", ScaleDiscrete,
   continuous_limits = NULL,
 
   train = function(self, x) {
-    if (is.discrete(x)) {
+    if (is_discrete(x)) {
       self$range$train(x, drop = self$drop, na.rm = !self$na.translate)
     } else {
       self$range_c$train(x)
@@ -156,7 +156,7 @@ ScaleDiscretePosition <- ggproto("ScaleDiscretePosition", ScaleDiscrete,
     if (inherits(x, "AsIs")) {
       return(x)
     }
-    if (is.discrete(x)) {
+    if (is_discrete(x)) {
       values <- self$palette(length(limits))
       if (!is.numeric(values)) {
         cli::cli_abort(

R/scale-expansion.R

@@ -228,7 +228,7 @@ expand_limits_discrete_trans <- function(limits, expand = expansion(0, 0),
                                          range_continuous = NULL) {
   discrete_limits <- NULL
   if (length(limits) > 0) {
-    if (is.discrete(limits)) {
+    if (is_discrete(limits)) {
       discrete_limits <- c(1, length(limits)) # for backward compatibility
     } else {
       discrete_limits <- range(limits)

R/utilities.R

@@ -287,10 +287,15 @@ empty <- function(df) {
   is.null(df) || nrow(df) == 0 || ncol(df) == 0 || is_waiver(df)
 }
 
-is.discrete <- function(x) {
+is_discrete <- function(x) {
   is.factor(x) || is.character(x) || is.logical(x)
 }
 
+is.discrete <- function(x) {
+  deprecate_warn0("4.0.0", "is.discrete()", "is_discrete()")
+  is_discrete(x)
+}
+
 check_nondata_cols <- function(data, mapping, problem = NULL, hint = NULL) {
   # We define "data" as atomic types or lists, not functions or otherwise.
   # The `inherits(x, "Vector")` check is for checking S4 classes from Bioconductor