Merge pull request #904 from lorenzwalthert/issue-900

`~` should cause indention too
r-lib · Mar 7, 2022 · b70aebe · b70aebe
2 parents b9c4ffd + 67539e3
commit b70aebe
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -47,6 +47,7 @@
   there are comments and line breaks under certain circumstances (#905). 
 * rules that add tokens don't break stylerignore sequences anymore (#891).
 * Alignment detection respects stylerignore (#850).
+* `~` causes now indention, like `+`, `-`, `|` etc. (#902).
 * `Warning: Unknown or uninitialised column:` was fixed (#885).
 * Unaligned expressions with quoted key (e.g. `c("x" = 2)`) are now correctly
   detected (#881).

diff --git a/R/relevel.R b/R/relevel.R
@@ -28,7 +28,7 @@ flatten_operators_one <- function(pd_nested) {
   pd_token_left <- c(special_token, "PIPE", math_token, "'$'")
   pd_token_right <- c(
     special_token, "PIPE", "LEFT_ASSIGN", if (parser_version_get() > 1) "EQ_ASSIGN",
-    "'+'", "'-'"
+    "'+'", "'-'", "'~'"
   )
   pd_nested %>%
     flatten_pd(pd_token_left, left = TRUE) %>%

diff --git a/R/rules-indention.R b/R/rules-indention.R
@@ -38,7 +38,8 @@ indent_op <- function(pd,
                         "PIPE",
                         "LEFT_ASSIGN",
                         "EQ_ASSIGN",
-                        "'$'"
+                        "'$'",
+                        "'~'"
                       )) {
   indent_indices <- compute_indent_indices(pd, token)
   pd$indent[indent_indices] <- pd$indent[indent_indices] + indent_by

diff --git a/man/update_indention.Rd b/man/update_indention.Rd
diff --git a/tests/testthat/indention_operators/tilde-in.R b/tests/testthat/indention_operators/tilde-in.R
@@ -0,0 +1,7 @@
+y ~
+x+
+y
+
+
+x ~
+  1 + (x|b)
diff --git a/tests/testthat/indention_operators/tilde-in_tree b/tests/testthat/indention_operators/tilde-in_tree
diff --git a/tests/testthat/indention_operators/tilde-out.R b/tests/testthat/indention_operators/tilde-out.R
@@ -0,0 +1,7 @@
+y ~
+  x +
+  y
+
+
+x ~
+  1 + (x | b)
diff --git a/tests/testthat/test-indention_operators.R b/tests/testthat/test-indention_operators.R
@@ -141,6 +141,14 @@ test_that("indents eq_formals correctly with various levels of scope", {
   ), NA)
 })
 
+test_that("tilde causes indention and is flattened out", {
+  expect_warning(test_collection("indention_operators",
+    "tilde",
+    transformer = style_text
+  ), NA)
+})
+
+
 test_that("overall", {
   expect_warning(test_collection("indention_operators",
     "overall",
-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    y ~
+    x+
+    y
+    x ~
++ (x|b)