Merge pull request #3440 from krlmlr/f-#3023-vars-null

- Support `.vars = NULL` (same as `.vars = vars()`) in scoped verbs (#3023).
tidyverse · Mar 17, 2018 · d618b3f · d618b3f
2 parents affdf61 + b0d0201
commit d618b3f
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/R/colwise.R b/R/colwise.R
@@ -40,8 +40,8 @@
 #'   supply functions like `mean()` directly rather than in a
 #'   lambda-formula.
 #' @param .vars A list of columns generated by [vars()],
-#'   or a character vector of column names, or a numeric vector of column
-#'   positions.
+#'   a character vector of column names, a numeric vector of column
+#'   positions, or `NULL`.
 #' @param .predicate A predicate function to be applied to the columns
 #'   or a logical vector. The variables for which `.predicate` is or
 #'   returns `TRUE` are selected. This argument is passed to
@@ -126,7 +126,9 @@ tbl_at_vars <- function(tbl, vars, include_group_vars = FALSE) {
     tibble_vars <- tbl_nongroup_vars(tbl)
   }
 
-  if (is_character(vars)) {
+  if (is_null(vars)) {
+    character()
+  } else if (is_character(vars)) {
     vars
   } else if (is_integerish(vars)) {
     tibble_vars[vars]

diff --git a/man/arrange_all.Rd b/man/arrange_all.Rd
diff --git a/man/filter_all.Rd b/man/filter_all.Rd
diff --git a/man/group_by_all.Rd b/man/group_by_all.Rd
diff --git a/man/scoped.Rd b/man/scoped.Rd
diff --git a/man/select_all.Rd b/man/select_all.Rd
diff --git a/man/summarise_all.Rd b/man/summarise_all.Rd
diff --git a/tests/testthat/test-colwise-mutate.R b/tests/testthat/test-colwise-mutate.R
@@ -44,6 +44,9 @@ expect_classes <- function(tbl, expected) {
 }
 
 test_that("can select colwise", {
+  columns <- iris %>% mutate_at(NULL, as.character)
+  expect_classes(columns, "nnnnf")
+
   columns <- iris %>% mutate_at(vars(starts_with("Petal")), as.character)
   expect_classes(columns, "nnccf")