adapt tests

Author: lorenzwalthert

R/rules-line_break.R

@@ -52,7 +52,7 @@ add_line_break_after_pipe <- function(pd) {
 
 #' Set line break for multi-line function calls
 #' @param pd A parse table.
-#' @param except_token A character vector with tokens before "'('" that do not
+#' @param except A character vector with tokens before "'('" that do not
 #' @name set_line_break_if_call_is_multi_line
 #' @importFrom rlang seq2
 NULL

man/set_line_break_if_call_is_multi_line.Rd

@@ -1,7 +1,7 @@
 b<-function(x   ){
   x <- c(1,
                    2+     3,
-         sin(pi) ) # FIXME add tidyverse-comliant rule to break after '('
+         sin(pi) )
 
   if(x > 10){
 return("done")

man/set_space_between_eq_sub_and_comma.Rd

@@ -1,7 +1,9 @@
 b <- function(x) {
-  x <- c(1,
-         2 + 3,
-         sin(pi)) # FIXME add tidyverse-comliant rule to break after '('
+  x <- c(
+    1,
+    2 + 3,
+    sin(pi)
+  )
 
   if (x > 10) {
     return("done")

tests/testthat/indention_curly_brackets/multi_line_curly_round_spacing-in.R

@@ -6,7 +6,8 @@ test_that("this is a text", {
   {
     call(
       12, 1 + 1,
-      26)
+      26
+    )
   }
 }))
 

tests/testthat/indention_curly_brackets/multi_line_curly_round_spacing-in_tree

@@ -3,10 +3,12 @@
     (({
       {
         {
-          c(99,
+          c(
+            99,
             1 + 1, {
               "within that suff"
-          })
+            }
+          )
         }
       }
     }))

tests/testthat/indention_curly_brackets/multi_line_curly_round_spacing-out.R

@@ -20,12 +20,14 @@ a <- function(x) {
       26 ^ 2, # FIXME ^ operator has to be surrounded by one space (or none?!), never multiple
       8,
       7
-  )))
+    ))
+  )
 
   call(
     1, 2,
     23 + Inf - 99, call(
       16
-  ))
+    )
+  )
 }
 # comments everywhere

tests/testthat/indention_multiple/curly_and_round-out.R

@@ -1,3 +1,3 @@
-c(call(2), 1, # choosed first function name (c) such that indention is 2.
+c(call(2), 1, # comment
 29
  )

tests/testthat/indention_multiple/edge_mixed-out.R

@@ -1,3 +1,4 @@
-c(call(2), 1, # choosed first function name (c) such that indention is 2.
+c(
+  call(2), 1, # comment
   29
 )

tests/testthat/indention_multiple/overall-out.R

@@ -1,12 +1,14 @@
-switch(engine,
-       pdftex = {
+switch(
+  engine,
+  pdftex = {
     if (any) {
       x
     }
   },
-       new = (
-         2
-     )) # FIXME: Add line break between parens (#125)
+  new = (
+    2
+  )
+) # FIXME: Add line break between parens (#125)
 
 {
   a <-

tests/testthat/indention_multiple/round_closing_on_same_line-in.R

@@ -3,8 +3,10 @@
 ) %>%
   j()
 
-a <- c(x, y,
-       z) %>%
+a <- c(
+  x, y,
+  z
+) %>%
   k()
 
 a + (

tests/testthat/indention_multiple/round_closing_on_same_line-in_tree

@@ -2,6 +2,7 @@ call(call( # comment
   3, 4
 ))
 
-call(call(1, # comment
-          3
+call(call(
+  1, # comment
+  3
 ))

tests/testthat/indention_multiple/round_closing_on_same_line-out.R

@@ -2,30 +2,39 @@ call(call(
   2
 ))
 
-call(call(1,
-          2))
+call(call(
+  1,
+  2
+))
 # multi-line: no indention based on first vall
 call(a(b(c({
 }))))
 
+call(
+  call(
+    2
+  ),
+  5
+)
+
+
 call(call(
-  2),
-     5)
-
-
-call(call(1,
-          2, c(
-            3
-        )))
-
-call(1,
-     call2(3, 4, call(3,
-                      4, call(5, 6, call(
-                        2
-                      )
-                      )
-     )
-     )
+  1,
+  2, c(
+    3
+  )
+))
+
+call(
+  1,
+  call2(3, 4, call(
+    3,
+    4, call(5, 6, call(
+      2
+    )
+    )
+  )
+  )
 )
 
 # comment lala