Fix data masking in complete|expand.grouped_df()

R/complete.R

@@ -99,8 +99,8 @@ complete.grouped_df <- function(data, ..., fill = list(), explicit = TRUE) {
     complete(
       data = dplyr::pick(everything()),
       ...,
-      fill = fill,
-      explicit = explicit
+      fill = .env$fill,
+      explicit = .env$explicit
     )
   )
 

R/expand.R

@@ -106,7 +106,7 @@ expand.grouped_df <- function(data, ..., .name_repair = "check_unique") {
     expand(
       data = dplyr::pick(everything()),
       ...,
-      .name_repair = .name_repair
+      .name_repair = .env$.name_repair
     )
   )
 

tests/testthat/test-complete.R

@@ -201,3 +201,29 @@ test_that("validates its inputs", {
     complete(mtcars, explicit = 1)
   })
 })
+
+test_that("works when `fill` is a column name in a grouped df (#1575)", {
+  df <- tibble(
+    g = c(1, NA),
+    fill = factor(1:2, levels = 1:3)
+  )
+  gdf <- dplyr::group_by(df, g)
+
+  expect_identical(
+    complete(gdf, fill)$g,
+    c(1, 1, 1, NA, NA, NA)
+  )
+})
+
+test_that("works when `explicit` is a column name in a grouped df (#1575)", {
+  df <- tibble(
+    g = c(1, NA),
+    explicit = factor(1:2, levels = 1:3)
+  )
+  gdf <- dplyr::group_by(df, g)
+
+  expect_identical(
+    complete(gdf, explicit)$g,
+    c(1, 1, 1, NA, NA, NA)
+  )
+})

tests/testthat/test-expand.R

@@ -177,6 +177,19 @@ test_that("expand() retains `NA` data in factors (#1275)", {
   )
 })
 
+test_that("expand() works on grouped data with `.name_repair` column (#1575)", {
+  df <- tibble(
+    g = c(1, NA),
+    .name_repair := factor(1:2, levels = 1:3)
+  )
+  gdf <- dplyr::group_by(df, g)
+
+  expect_identical(
+    expand(gdf, .name_repair)$g,
+    c(1, 1, 1, NA, NA, NA)
+  )
+})
+
 # ------------------------------------------------------------------------------
 
 test_that("crossing checks for bad inputs", {