fix

r-lib · Dec 7, 2024 · bf5c500 · bf5c500
1 parent e4da5ae
commit bf5c500
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/R/rules-spaces.R b/R/rules-spaces.R
@@ -344,8 +344,8 @@ set_space_after_bang_bang <- function(pd_flat) {
 remove_space_around_dollar <- function(pd_flat) {
   dollar_after <- (pd_flat$token == "'$'") & (pd_flat$lag_newlines == 0L)
   dollar_before <- lead(dollar_after, default = FALSE)
-  pd_flat$spaces[dollar_after] <- 0L
   pd_flat$spaces[dollar_before] <- 0L
+  pd_flat$spaces[dollar_after] <- 0L
   pd_flat
 }
 

diff --git a/tests/testthat/indention_operators/dollar_R6-in.R b/tests/testthat/indention_operators/dollar_R6-in.R
@@ -1,4 +1,4 @@
-  x$
+  x$  add(10)$
    add(10)  $  add(10)  $
 add(10)$sum +
 3
diff --git a/tests/testthat/indention_operators/dollar_R6-out.R b/tests/testthat/indention_operators/dollar_R6-out.R
@@ -1,4 +1,4 @@
-x$
+x$add(10)$
   add(10)$add(10)$
   add(10)$sum +
   3
diff --git a/tests/testthat/spacing/dollar-in.R b/tests/testthat/spacing/dollar-in.R
@@ -0,0 +1,5 @@
+mtcars $wt
+
+mtcars$ wt
+
+mtcars $ wt
diff --git a/tests/testthat/spacing/dollar-out.R b/tests/testthat/spacing/dollar-out.R
@@ -0,0 +1,5 @@
+mtcars$wt
+
+mtcars$wt
+
+mtcars$wt
diff --git a/tests/testthat/test-spacing.R b/tests/testthat/test-spacing.R
@@ -76,3 +76,10 @@ test_that("spacing around square brackets / braces", {
     transformer = style_text, strict = TRUE
   ), NA)
 })
+
+test_that("spacing around dollar", {
+  expect_warning(test_collection(
+    "spacing", "dollar",
+    transformer = style_text, strict = TRUE
+  ), NA)
+})