Merge 87b4cdb into dc4c4cf

lorenzwalthert · Jan 16, 2022 · e0ef588 · e0ef588
2 parents dc4c4cf + 87b4cdb
commit e0ef588
Show file tree

Hide file tree

Showing 222 changed files with 2,426 additions and 1,873 deletions.
diff --git a/tests/testmanual/addins/r-valid.R b/tests/testmanual/addins/r-valid.R
@@ -1 +1,3 @@
-1+ 1
+1 + 1 # tst
+# flush
+#more
diff --git a/tests/testthat/alignment/named-in.R b/tests/testthat/alignment/named-in.R
@@ -24,25 +24,25 @@ call(
 
 # algorithm: not aligned (spacing around =). human: aligned (fix: spacing around =).
 call(
-  x  =1,   kdd  =  2,
-  xy =2,   n    = 33,
+  x = 1, kdd = 2,
+  xy = 2, n = 33,
 )
 
 # algorithm: not aligned. human: not aligned.
 call(
-  x  = 1,   kdd  =  2,
+  x = 1, kdd = 2,
   xy = 2, n = 33,
 )
 
 # algorithm: not aligned. human: not aligned.
 call(
-  x  =  1,   kdd  =  2,
+  x = 1, kdd = 2,
   xy = 22, n = 33,
 )
 
 # algorithm: not aligned. human: not aligned.
 call(
-  x  = 1, d = 2,
+  x = 1, d = 2,
   xy = 22, n = 33,
 )
 
@@ -63,7 +63,6 @@ call(
 # algorithm: aligned. human: aligned.
 call(
   x  = 1, n = 33, z = "333",
-
   xy = 2,
 )
 
@@ -107,8 +106,8 @@ call(
 # if all col1 arguments are named, col1 must also be aligned
 # not aligned
 fell(
-  x =   1,
-  y =  23,
+  x = 1,
+  y = 23,
   zz = NULL
 )
 
@@ -122,8 +121,8 @@ fell(
 # aligned but comma in the wrong line
 call(
   a  =  2,
-  bb =  3
-,)
+  bb =  3,
+)
 
 
 # aligned (comments)
@@ -155,15 +154,15 @@ call(
 
 # not aligned (comments)
 call(
-  a =  2, x = 111,
-  bb =  3, # hi
+  a = 2, x = 111,
+  bb = 3, # hi
 )
 
 # not aligned (comments)
 call(
   # another one
-  a =  2, x = 111,
-  bb =  3,
+  a = 2, x = 111,
+  bb = 3,
   # hi
 )
 
@@ -173,8 +172,7 @@ call(
 # the extra spaces before `=` as of 29a010064257fa1a9caf32d182e7ee62008de98a.
 call(
   x  = 95232,
-  y  = f(
-  ),
+  y  = f(),
 )
 
 
@@ -187,9 +185,9 @@ ca(
 
 # not aligned (left after `=`)
 ca(
-  x  = 23200,
+  x = 23200,
   y2 = "hi",
-  m  =  c(rm.na = 7)
+  m = c(rm.na = 7)
 )
 
 # aligned =, first all named

diff --git a/tests/testthat/alignment/tribble-in.R b/tests/testthat/alignment/tribble-in.R
@@ -5,22 +5,22 @@ tribble(
 )
 
 tribble(
-  ~x,       ~d,
+  ~x, ~d,
   "axa'fa", 1:6,
-  "b",    4:6
+  "b", 4:6
 )
 
 
 tribble(
-  ~x,       ~d,
+  ~x, ~d,
   "axa'fa", 1:6,
-"b",      4:6
+  "b", 4:6
 )
 
 tribble(
-  ~x,       ~d,
-"axa'fa",  1:6,
-  "b",      4:6
+  ~x, ~d,
+  "axa'fa", 1:6,
+  "b", 4:6
 )
 
 # has EQ_SUB which don't match, not tribble-like

diff --git a/tests/testthat/curly-curly/mixed-in.R b/tests/testthat/curly-curly/mixed-in.R
@@ -5,28 +5,17 @@
 call({{ x }})
 
 # removing line breaks
-call({{
-  x
-}})
+call({{ x }})
 
-call({
-  {x
-}})
+call({{ x }})
 
-call({
-  {x}}
-)
+call({{ x }})
 
-call({
-  {x}
-  })
+call({{ x }})
 
 call(
-  {
-  {x
-  }
-    }
-  )
+  {{ x }}
+)
 
 ##  ............................................................................
 ##  spaces                                                                  ####
@@ -35,33 +24,37 @@ call(
 call({{ x }})
 
 # removing spaces between braces
-call({ { x }})
-call({ { x }} )
-call( { { x }})
-call( { { x } })
+call({{ x }})
+call({{ x }})
+call({{ x }})
+call({{ x }})
 
 # inserting spaces within {{
-call({{x }})
-call({{x}})
-call({{ x}})
+call({{ x }})
+call({{ x }})
+call({{ x }})
 
 # not removing spaces within {{
 call({{ x }})
 
 
 # combine spaces and line breaks
-call({{ x}
-  })
+call({{ x }})
 
-call({
-  { x}})
+call({{ x }})
 
 # not applicable when only one curly brace
 {
   y
 }
-{ 1 + 1}
-{{1 + a} + 1} # not curly-culry!
+{
+  1 + 1
+}
+{
+  {
+    1 + a
+  } + 1
+} # not curly-culry!
 
 
 ##  ............................................................................
@@ -71,30 +64,37 @@ call("test", {
 })
 
 call(
-  "test", {
-  1
-})
-
-call("test",
-     {
+  "test",
+  {
     1
-  })
+  }
+)
 
 call("test", {
-  1 }
-)
+  1
+})
 
-call({
+call("test", {
   1
-}, a + b, { 33 / f(c)})
+})
+
+call(
+  {
+    1
+  },
+  a + b,
+  {
+    33 / f(c)
+  }
+)
 
-call({{ x }}, {{ y}})
-call({{ x }}, {{ y}
-  })
+call({{ x }}, {{ y }})
+call({{ x }}, {{ y }})
 call(
-  {{ x }}, {{ y}})
+  {{ x }}, {{ y }}
+)
 
 call(
   {{ x }},
-  {{ y}} := 3, f(bk)
+  {{ y }} := 3, f(bk)
 )
diff --git a/tests/testthat/fun_dec/fun_dec_scope_spaces-in.R b/tests/testthat/fun_dec/fun_dec_scope_spaces-in.R
@@ -1,12 +1,11 @@
 a <- function(x, #
-y
-) {
+              y) {
   x - 1
 }
 
 
 a <- function(x, #
-  y) #
+              y) #
 {
   x
 }
@@ -23,5 +22,4 @@ function(a =
 
 function(a =
            b,
-         c
-) {}
+         c) {}
diff --git a/tests/testthat/fun_dec/fun_dec_scope_spaces-out.R b/tests/testthat/fun_dec/fun_dec_scope_spaces-out.R
@@ -1,12 +1,11 @@
 a <- function(x, #
-y
-) {
+              y) {
   x - 1
 }
 
 
 a <- function(x, #
-  y) #
+              y) #
 {
   x
 }
@@ -23,5 +22,4 @@ function(a =
 
 function(a =
            b,
-         c
-) {}
+         c) {}
diff --git a/tests/testthat/fun_dec/line_break_fun_dec-in.R b/tests/testthat/fun_dec/line_break_fun_dec-in.R
@@ -29,20 +29,18 @@ a <- function(x,
 }
 
 a <- function(x,
-
               y) {
   x - 1
 }
 
 
-a <- function(
-              x,
+a <- function(x,
               y) {
   x - 1
 }
 
 a <- function( #
-  x,
-  y) {
+              x,
+              y) {
   x - 1
 }
diff --git a/tests/testthat/indention_curly_brackets/multi_line_curly_only-in.R b/tests/testthat/indention_curly_brackets/multi_line_curly_only-in.R
@@ -1,4 +1,6 @@
-      {
-         {1 + 3}
-{2 + sin(pi)}
-      }
+{{
+  1 + 3
+}
+{
+  2 + sin(pi)
+}}
diff --git a/tests/testthat/indention_curly_brackets/multi_line_curly_only-out.R b/tests/testthat/indention_curly_brackets/multi_line_curly_only-out.R
@@ -1,8 +1,6 @@
-{
-  {
-    1 + 3
-  }
-  {
-    2 + sin(pi)
-  }
+{{
+  1 + 3
 }
+{
+  2 + sin(pi)
+}}
diff --git a/tests/testthat/indention_curly_brackets/multi_line_curly_round_only-in.R b/tests/testthat/indention_curly_brackets/multi_line_curly_round_only-in.R
@@ -1,9 +1,11 @@
 a <- function(x) {
-x <- c(1,
-       2 + 3,
-sin(pi))
+  x <- c(
+    1,
+    2 + 3,
+    sin(pi)
+  )
 
-if(x > 10) {
+  if (x > 10) {
     return("done")
-                }
-        }
+  }
+}