Switch to scales::Range classes

DESCRIPTION

@@ -205,7 +205,6 @@ Collate:
     'position-nudge.R'
     'position-stack.r'
     'quick-plot.r'
-    'range.r'
     'reshape-add-margins.R'
     'save.r'
     'scale-.r'

NEWS.md

@@ -1,5 +1,7 @@
 # ggplot2 (development version)
 
+* ggplot2 now uses `scales::DiscreteRange` and `scales::ContinuousRange`, which
+  are available to write scale extensions from scratch (@teunbrand, #2710).
 * For the purposes of checking required or non-missing aesthetics, character 
   vectors are no longer considered non-finite (@teunbrand, @4284).
 * Fixed bug in `coord_sf()` where graticule lines didn't obey 

R/scale-.r

@@ -126,7 +126,7 @@ continuous_scale <- function(aesthetics, scale_name, palette, name = waiver(),
     scale_name = scale_name,
     palette = palette,
 
-    range = continuous_range(),
+    range = ContinuousRange$new(),
     limits = limits,
     trans = trans,
     na.value = na.value,
@@ -211,7 +211,7 @@ discrete_scale <- function(aesthetics, scale_name, palette, name = waiver(),
     scale_name = scale_name,
     palette = palette,
 
-    range = discrete_range(),
+    range = DiscreteRange$new(),
     limits = limits,
     na.value = na.value,
     na.translate = na.translate,
@@ -280,7 +280,7 @@ binned_scale <- function(aesthetics, scale_name, palette, name = waiver(),
     scale_name = scale_name,
     palette = palette,
 
-    range = continuous_range(),
+    range = ContinuousRange$new(),
     limits = limits,
     trans = trans,
     na.value = na.value,
@@ -406,7 +406,7 @@ Scale <- ggproto("Scale", NULL,
     cli::cli_abort("Not implemented")
   },
 
-  range = ggproto(NULL, Range),
+  range = Range$new(),
   limits = NULL,
   na.value = NA,
   expand = waiver(),
@@ -580,7 +580,7 @@ has_default_transform <- function(scale) {
 #' @usage NULL
 #' @export
 ScaleContinuous <- ggproto("ScaleContinuous", Scale,
-  range = continuous_range(),
+  range = ContinuousRange$new(),
   na.value = NA_real_,
   rescaler = rescale,
   oob = censor,
@@ -763,7 +763,7 @@ ScaleContinuous <- ggproto("ScaleContinuous", Scale,
 
   clone = function(self) {
     new <- ggproto(NULL, self)
-    new$range <- continuous_range()
+    new$range <- ContinuousRange$new()
     new
   },
 
@@ -951,7 +951,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
 
   clone = function(self) {
     new <- ggproto(NULL, self)
-    new$range <- discrete_range()
+    new$range <- DiscreteRange$new()
     new
   },
 
@@ -989,7 +989,7 @@ ScaleDiscrete <- ggproto("ScaleDiscrete", Scale,
 #' @usage NULL
 #' @export
 ScaleBinned <- ggproto("ScaleBinned", Scale,
-  range = continuous_range(),
+  range = ContinuousRange$new(),
   na.value = NA_real_,
   rescaler = rescale,
   oob = squish,
@@ -1155,7 +1155,7 @@ ScaleBinned <- ggproto("ScaleBinned", Scale,
 
   clone = function(self) {
     new <- ggproto(NULL, self)
-    new$range <- continuous_range()
+    new$range <- ContinuousRange$new()
     new
   },
 

R/scale-discrete-.r

@@ -63,7 +63,7 @@ scale_x_discrete <- function(..., expand = waiver(), guide = waiver(), position
   sc <- discrete_scale(c("x", "xmin", "xmax", "xend"), "position_d", identity, ...,
     expand = expand, guide = guide, position = position, super = ScaleDiscretePosition)
 
-  sc$range_c <- continuous_range()
+  sc$range_c <- ContinuousRange$new()
   sc
 }
 #' @rdname scale_discrete
@@ -72,7 +72,7 @@ scale_y_discrete <- function(..., expand = waiver(), guide = waiver(), position
   sc <- discrete_scale(c("y", "ymin", "ymax", "yend"), "position_d", identity, ...,
     expand = expand, guide = guide, position = position, super = ScaleDiscretePosition)
 
-  sc$range_c <- continuous_range()
+  sc$range_c <- ContinuousRange$new()
   sc
 }
 
@@ -135,8 +135,8 @@ ScaleDiscretePosition <- ggproto("ScaleDiscretePosition", ScaleDiscrete,
 
   clone = function(self) {
     new <- ggproto(NULL, self)
-    new$range <- discrete_range()
-    new$range_c <- continuous_range()
+    new$range <- DiscreteRange$new()
+    new$range_c <- ContinuousRange$new()
     new
   }
 )

tests/testthat/test-range.r

@@ -1,5 +1,5 @@
 test_that("continuous ranges expand as expected", {
-  r <- continuous_range()
+  r <- ContinuousRange$new()
 
   r$train(1)
   expect_equal(r$range, c(1, 1))
@@ -9,7 +9,7 @@ test_that("continuous ranges expand as expected", {
 })
 
 test_that("discrete ranges expand as expected", {
-  r <- discrete_range()
+  r <- DiscreteRange$new()
 
   r$train("a")
   expect_equal(r$range, "a")