desc() inside arrange() checks the number of arguments. (tidyverse#5929)

closes tidyverse#5921
DavisVaughan · Jun 25, 2021 · a5fef45 · a5fef45
1 parent 91c66a3
commit a5fef45
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/R/arrange.R b/R/arrange.R
@@ -94,11 +94,13 @@ arrange_rows <- function(.data, dots) {
   })
 
   quosures <- map(dots, function(quosure) {
-    if (quo_is_call(quosure, "desc")) {
-      quosure <- new_quosure(
-        node_cadr(quo_get_expr(quosure)),
-        quo_get_env(quosure)
-      )
+    if (quo_is_call(quosure, "desc", ns = c("", "dplyr"))) {
+      expr <- quo_get_expr(quosure)
+      if (!has_length(expr, 2L)) {
+        abort("`desc()` expects exactly one argument.")
+      }
+
+      quosure <- new_quosure(node_cadr(expr), quo_get_env(quosure))
     }
     quosure
   })

diff --git a/tests/testthat/_snaps/arrange.md b/tests/testthat/_snaps/arrange.md
@@ -26,3 +26,11 @@
       i `..1 = rep(x, 2)`.
       i `..1` must be size 1, not 2.
 
+# desc() inside arrange() checks the number of arguments (#5921)
+
+    Code
+      df <- data.frame(x = 1, y = 2)
+      arrange(df, desc(x, y))
+    Error <rlang_error>
+      `desc()` expects exactly one argument.
+
diff --git a/tests/testthat/test-arrange.r b/tests/testthat/test-arrange.r
@@ -178,3 +178,12 @@ test_that("arrange() preserves the call stack on error (#5308)", {
 
   expect_true(some(stack, is_call, "foobar"))
 })
+
+test_that("desc() inside arrange() checks the number of arguments (#5921)", {
+  expect_snapshot(error = TRUE, {
+    df <- data.frame(x = 1, y = 2)
+
+    arrange(df, desc(x, y))
+  })
+})
+