Merge pull request #68 from lorenzwalthert/indent_multiple

fixing indent multiple - one more time

Author: lorenzwalthert

R/edge_random-out.R

@@ -19,7 +19,6 @@ set_unindention_child <- function(pd, token = "')'", unindent_by) {
     filter(!candidate)
   candidates$child <- map(candidates$child,
                           unindent_child,
-                          token = token,
                           unindent_by = abs(pd$indent[closing] - pd$indent[closing-1]))
 
   bind_rows(candidates, non_candidates) %>%
@@ -32,7 +31,7 @@ set_unindention_child <- function(pd, token = "')'", unindent_by) {
 #' @param pd A parse table.
 #' @param token The token the unindention should be based on.
 #' @param unindent_by By how many spaces one level of indention is reversed.
-unindent_child <- function(pd, token = "')'", unindent_by = 2) {
+unindent_child <- function(pd, token = c("')'", "'}'"), unindent_by = 2) {
   closing <- which(pd$token %in% token)
   if (!("indent" %in% names(pd))) {
     pd$indent <- 0

R/unindent.R

@@ -13,3 +13,8 @@
 ))
   )
 }
+
+
+(((
+  1 + 2) * (3 + 4 # FIXME only one indention here
+)))

R/edge_mixed-in.R renamed to tests/testthat/indention_multiple/edge_mixed-in.R

@@ -13,3 +13,8 @@
     ))
   )
 }
+
+
+(((
+    1 + 2) * (3 + 4 # FIXME only one indention here
+  )))

R/edge_mixed-out.R renamed to tests/testthat/indention_multiple/edge_mixed-out.R

@@ -0,0 +1,14 @@
+{{({{{{{{{{(( # FIXME spaces between brackets don't vanish
+  19
+))}}}}}}}})}}
+
+
+   (
+  c("x", "y", "z", "sin(x)")
+   )
+
+
+   {
+  c("x", "y", "z", "sin(x)")
+}
+

tests/testthat/indention_multiple/edge_random-in.R

@@ -1,7 +1,8 @@
-{{({{{{{{{{((
+{{({{{{{{{{(( # FIXME spaces between brackets don't vanish
   19
 ))}}}}}}}})}}
 
+
 (
   c("x", "y", "z", "sin(x)")
 )

R/edge_random-in.R renamed to tests/testthat/indention_multiple/edge_random-out.R

@@ -10,6 +10,6 @@
       call1(2, 3),
       {
         sin(cos(pi))
-      } ) # FIXME space between curly and round bracket must be removed
+    } ) # FIXME space between curly and round bracket must be removed
   }
 }