Merge pull request #150 from lorenzwalthert/tidyeval

set space between "=" and "," (#150).

Author: lorenzwalthert

R/rules-spacing.R

@@ -213,3 +213,11 @@ remove_space_around_colons <- function(pd_flat) {
   pd_flat$spaces[col_around & (pd_flat$newlines == 0L)] <- 0L
   pd_flat
 }
+
+#' Set space between EQ_SUB and "','"
+set_space_between_eq_sub_and_comma <- function(pd) {
+  op_before <- which(pd$token == "EQ_SUB" & lead(pd$token == "','"))
+  pd$spaces[op_before] <- 1L
+  pd
+
+}

R/style_guides.R

@@ -59,7 +59,8 @@ tidyverse_style <- function(scope = "tokens",
 
       remove_space_after_unary_pm_nested,
       set_space_before_comments,
-      set_space_between_levels
+      set_space_between_levels,
+      set_space_between_eq_sub_and_comma,
     )
 
   use_raw_indention <- scope < "indention"

tests/testthat/test-tidyeval.R

@@ -9,3 +9,8 @@ test_that(":= has correct spacing", {
   expect_warning(test_collection("tidyeval", "setting_var",
                                  transformer = style_text), NA)
 })
+
+test_that("Space before comma if preceding token is EQ_SUB", {
+  expect_warning(test_collection("tidyeval", "eq_sub",
+                                 transformer = style_text), NA)
+})

tests/testthat/tidyeval/eq_sub_and_comma-in.R

@@ -0,0 +1,6 @@
+a <- function() {
+  data_frame(
+    b =,
+    c =,
+  )
+}

tests/testthat/tidyeval/eq_sub_and_comma-in_tree

@@ -0,0 +1,6 @@
+a <- function() {
+  data_frame(
+    b = ,
+    c = ,
+  )
+}