Merge pull request #322 from lorenzwalthert/bang

- remove spaes after !! and !!! (#322).
r-lib · Feb 23, 2018 · 5982e83 · 5982e83
2 parents 15689bb + 7045a29
commit 5982e83
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/R/rules-spacing.R b/R/rules-spacing.R
@@ -242,7 +242,7 @@ set_space_after_bang_bang <- function(pd_flat) {
     (pd_flat$newlines == 0L) &
     (pd_flat$token_before == "'!'")
 
-  pd_flat$spaces[last_bang] <- 1L
+  pd_flat$spaces[last_bang] <- 0L
   pd_flat
 }
 

diff --git a/tests/testthat/spacing/bang_bang_spacing-out.R b/tests/testthat/spacing/bang_bang_spacing-out.R
@@ -1,5 +1,5 @@
-a(! !! x)
+a(! !!x)
-k(!! g)
+k(!!g)
-a(!!! x)
+a(!!!x)
-a(!! ! x)
+a(!! !x)
 a(!b)
diff --git a/tests/testthat/tidyeval/bang_bang-out.R b/tests/testthat/tidyeval/bang_bang-out.R
@@ -1,9 +1,9 @@
 nameshift <- c(SL = "Sepal.Length")
-head(dplyr::rename(iris[, 1:2], ! ! ! nameshift), 3)
+head(dplyr::rename(iris[, 1:2], ! ! !nameshift), 3)
-head(dplyr::rename(iris[, 1:2], !! ! nameshift), 3)
+head(dplyr::rename(iris[, 1:2], !! !nameshift), 3)
-head(dplyr::rename(iris[, 1:2], !!! nameshift), 3)
+head(dplyr::rename(iris[, 1:2], !!!nameshift), 3)
 my_summarise <- function(df, group_var) {
   df %>%
-    group_by(! ! group_var) %>%
+    group_by(! !group_var) %>%
     summarise(a = mean(a))
 }
diff --git a/tests/testthat/tidyeval/setting_var_names-out.R b/tests/testthat/tidyeval/setting_var_names-out.R
@@ -1,6 +1,6 @@
 mtcars %>%
   group_by(am) %>%
   summarise(
-    !! mean_nm := mean(cyl),
+    !!mean_nm := mean(cyl),
-    !! count_nm := n()
+    !!count_nm := n()
   )