More tweaking

Author: hadley

R/expect-condition.R

@@ -586,19 +586,18 @@ check_condition_dots <- function(
     return()
   }
 
-  # pretty adversarial: expect_error(foo(), NULL, "error", 1)
-  dots_names <- ...names()
-  if (is.null(dots_names)) {
-    cli::cli_abort(
-      "Found unnamed arguments in {.arg ...} to be passed to {.fn grepl}, but no {.arg regexp}.",
-      call = error_call
-    )
+  dot_names <- ...names()
+  if (is.null(dot_names)) {
+    dot_names <- rep("", ...length())
   }
+  unnamed <- dot_names == ""
+  dot_names[unnamed] <- paste0("..", seq_along(dot_names)[unnamed])
+
   cli::cli_abort(
     c(
-      "Found arguments in {.arg ...} to be passed to {.fn grepl}, but no {.arg regexp}.",
-      "*" = "First problematic argument:",
-      "i" = dots_names[which(nzchar(dots_names))[1L]]
+      "Can't supply {.arg ...} unless {.arg regexp} is set.",
+      "*" = "Unusued arguments: {.arg {dot_names}}.",
+      i = "{.arg ...} is passed to {.fn grepl} if and only if the {.arg regexp} argument is used."
     ),
     call = error_call
   )

tests/testthat/_snaps/expect-condition.md

@@ -35,9 +35,23 @@
       expect_condition(stop("Hi!"), foo = "bar")
     Condition
       Error in `expect_condition()`:
-      ! Found arguments in `...` to be passed to `grepl()`, but no `regexp`.
-      * First problematic argument:
-      i foo
+      ! Can't supply `...` unless `regexp` is set.
+      * Unusued arguments: `foo`.
+      i `...` is passed to `grepl()` if and only if the `regexp` argument is used.
+    Code
+      expect_condition(stop("Hi!"), , , "bar")
+    Condition
+      Error in `expect_condition()`:
+      ! Can't supply `...` unless `regexp` is set.
+      * Unusued arguments: `..1`.
+      i `...` is passed to `grepl()` if and only if the `regexp` argument is used.
+    Code
+      expect_condition(stop("Hi!"), , , "bar", foo = "bar")
+    Condition
+      Error in `expect_condition()`:
+      ! Can't supply `...` unless `regexp` is set.
+      * Unusued arguments: `..1` and `foo`.
+      i `...` is passed to `grepl()` if and only if the `regexp` argument is used.
     Code
       expect_condition(stop("Hi!"), "x", foo = "bar")
     Condition

tests/testthat/test-expect-condition.R

@@ -243,6 +243,8 @@ test_that("can match parent conditions (#1493)", {
 test_that("unused arguments generate an error", {
   expect_snapshot(error = TRUE, {
     expect_condition(stop("Hi!"), foo = "bar")
+    expect_condition(stop("Hi!"), , , "bar")
+    expect_condition(stop("Hi!"), , , "bar", foo = "bar")
     expect_condition(stop("Hi!"), "x", foo = "bar")
   })
 })