add nonstrict version of set_space_before_comment

R/rules-spacing.R

@@ -183,9 +183,18 @@ set_space_before_comments <- function(pd_flat) {
   comment_before <- lead(comment_after, default = FALSE)
   pd_flat$spaces[comment_before & (pd_flat$newlines == 0L)] <- 1L
   pd_flat
+}
 
+add_space_before_comments <- function(pd_flat) {
+  comment_after <- (pd_flat$token == "COMMENT") & (pd_flat$lag_newlines == 0L)
+  if (!any(comment_after)) return(pd_flat)
+  comment_before <- lead(comment_after, default = FALSE)
+  pd_flat$spaces[comment_before & (pd_flat$newlines == 0L)] <-
+    pmax(pd_flat$spaces[comment_before], 1L)
+  pd_flat
 }
 
+
 remove_space_after_excl <- function(pd_flat) {
   excl <- (pd_flat$token == "'!'") & (pd_flat$newlines == 0L)
   pd_flat$spaces[excl] <- 0L

R/style_guides.R

@@ -81,7 +81,7 @@ tidyverse_style <- function(scope = "tokens",
               force_one = start_comments_with_one_space),
 
       remove_space_after_unary_pm_nested,
-      set_space_before_comments,
+      if (strict) set_space_before_comments else add_space_before_comments,
       set_space_between_levels,
       set_space_between_eq_sub_and_comma,
     )

tests/testthat/spacing/comments-in.R

@@ -0,0 +1,4 @@
+a # comment
+b #comment
+c    # comment
+dejk #comment

tests/testthat/spacing/comments-out.R

@@ -0,0 +1,4 @@
+a # comment
+b # comment
+c    # comment
+dejk # comment

tests/testthat/test-spacing.R

@@ -11,3 +11,10 @@ test_that(":, ::, and :::", {
     "spacing", "colon",
     transformer = style_text), NA)
 })
+
+
+test_that("comments and strict = FALSE", {
+  expect_warning(test_collection(
+    "spacing", "comments",
+    transformer = style_text, stric = FALSE), NA)
+})