Skip to content

Commit 91df2a3

Browse files
remove spaces in square subsetting expressions
1 parent 4140c6d commit 91df2a3

File tree

5 files changed

+96
-2
lines changed

5 files changed

+96
-2
lines changed

R/rules-spacing.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ remove_space_before_opening_paren <- function(pd_flat) {
171171
}
172172

173173
remove_space_after_opening_paren <- function(pd_flat) {
174-
paren_after <- pd_flat$token == "'('"
174+
paren_after <- pd_flat$token %in% c("'('", "'['", "LBB")
175175
if (!any(paren_after)) {
176176
return(pd_flat)
177177
}
@@ -180,7 +180,7 @@ remove_space_after_opening_paren <- function(pd_flat) {
180180
}
181181

182182
remove_space_before_closing_paren <- function(pd_flat) {
183-
paren_after <- pd_flat$token == "')'"
183+
paren_after <- pd_flat$token %in% c("')'", "']'")
184184
if (!any(paren_after)) {
185185
return(pd_flat)
186186
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
a[[2]]
2+
a[[2 ]]
3+
4+
a[[ 2]]
5+
6+
a[[ 2 ]]
7+
8+
9+
a[2]
10+
a[2 ]
11+
12+
a[ 2]
13+
14+
a[ 2 ]

tests/testthat/spacing/spacing-square-in_tree

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
a[[2]]
2+
a[[2]]
3+
4+
a[[2]]
5+
6+
a[[2]]
7+
8+
9+
a[2]
10+
a[2]
11+
12+
a[2]
13+
14+
a[2]

tests/testthat/test-spacing.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,10 @@ test_that("spacing around tilde", {
6262
transformer = style_text, strict = TRUE), NA)
6363
})
6464

65+
test_that("spacing around square brackets / braces", {
66+
expect_warning(test_collection(
67+
"spacing", "spacing-square",
68+
transformer = style_text, strict = TRUE), NA)
69+
})
6570

6671

0 commit comments

Comments
 (0)