Fix regression in guide_bins(reverse) (#6185)

* bump NA to back of key

* add test

* add news bullet

* Fix interaction between #5912 and #6072

Author: teunbrand

NEWS.md

@@ -1,5 +1,6 @@
 # ggplot2 (development version)
 
+* Fixed regression in `guide_bins(reverse = TRUE)` (@teunbrand, #6183).
 * New function family for setting parts of a theme. For example, you can now use 
   `theme_sub_axis(line, text, ticks, ticks.length, line)` as a substitute for
   `theme(axis.line, axis.text, axis.ticks, axis.ticks.length, axis.line)`. This

R/geom-violin.R

@@ -118,7 +118,7 @@ geom_violin <- function(mapping = NULL, data = NULL,
     check_numeric(draw_quantiles)
 
     # Pass on to stat when stat accepts 'quantiles'
-    stat <- check_subclass(stat, "Stat", current_call(), caller_env())
+    stat <- validate_subclass(stat, "Stat", current_call(), caller_env())
     if ("quantiles" %in% stat$parameters()) {
       extra$quantiles <- draw_quantiles
     }

R/guide-bins.R

@@ -211,7 +211,10 @@ GuideBins <- ggproto(
     params$show.limits <- show.limits
 
     if (params$reverse) {
-      key <- key[rev(seq_len(nrow(key))), , drop = FALSE]
+      ord <- seq_len(nrow(key))
+      key <- vec_slice(key, rev(ord))
+      # Put NA back in the trailing position
+      key[params$aesthetic] <- vec_slice(key[params$aesthetic], c(ord[-1], ord[1]))
       key$.value <- 1 - key$.value
     }
 

tests/testthat/_snaps/guides/reversed-guide-bins.svg

@@ -411,6 +411,22 @@ test_that("guides title and text are positioned correctly", {
   expect_doppelganger("legends with all title justifications", p)
 })
 
+test_that("bin guide can be reversed", {
+
+  p <- ggplot(data.frame(x = c(0, 100)), aes(x, x, colour = x, fill = x)) +
+    geom_point() +
+    guides(
+      colour = guide_bins(reverse = TRUE, show.limits = TRUE,  order = 1),
+      fill   = guide_bins(
+        reverse = TRUE, show.limits = FALSE, order = 2,
+        override.aes = list(shape = 21)
+      )
+    )
+
+  expect_doppelganger("reversed guide_bins", p)
+
+})
+
 test_that("bin guide can be styled correctly", {
   df <- data_frame(x = c(1, 2, 3),
                    y = c(6, 5, 7))