Skip to content

Commit bf5c500

Browse files
fix
1 parent e4da5ae commit bf5c500

File tree

6 files changed

+20
-3
lines changed

6 files changed

+20
-3
lines changed

R/rules-spaces.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ set_space_after_bang_bang <- function(pd_flat) {
344344
remove_space_around_dollar <- function(pd_flat) {
345345
dollar_after <- (pd_flat$token == "'$'") & (pd_flat$lag_newlines == 0L)
346346
dollar_before <- lead(dollar_after, default = FALSE)
347-
pd_flat$spaces[dollar_after] <- 0L
348347
pd_flat$spaces[dollar_before] <- 0L
348+
pd_flat$spaces[dollar_after] <- 0L
349349
pd_flat
350350
}
351351

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
x$
1+
x$ add(10)$
22
add(10) $ add(10) $
33
add(10)$sum +
44
3
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
x$
1+
x$add(10)$
22
add(10)$add(10)$
33
add(10)$sum +
44
3

tests/testthat/spacing/dollar-in.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mtcars $wt
2+
3+
mtcars$ wt
4+
5+
mtcars $ wt

tests/testthat/spacing/dollar-out.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mtcars$wt
2+
3+
mtcars$wt
4+
5+
mtcars$wt

tests/testthat/test-spacing.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,10 @@ test_that("spacing around square brackets / braces", {
7676
transformer = style_text, strict = TRUE
7777
), NA)
7878
})
79+
80+
test_that("spacing around dollar", {
81+
expect_warning(test_collection(
82+
"spacing", "dollar",
83+
transformer = style_text, strict = TRUE
84+
), NA)
85+
})

0 commit comments

Comments
 (0)