ignore mulit-line for / while condition without braces for strict = F…

…ALSE
r-lib · Aug 5, 2019 · 5f1be90 · 5f1be90
1 parent d718c49
commit 5f1be90
Show file tree

Hide file tree

Showing 8 changed files with 416 additions and 190 deletions.
diff --git a/R/indent.R b/R/indent.R
@@ -95,16 +95,8 @@ indent_without_paren_for_while_fun <- function(pd, indent_by) {
   if (is_curly_expr(pd$child[[nrow]])) {
     return(pd)
   }
-  if (pd$token[1] == "FOR") {
-    is_multi_line <- pd_is_multi_line(
-      pd$child[[which(pd$token == "forcond")]]
-    )
-  } else if (pd$token[1] %in% c("WHILE", "FUNCTION")) {
-    start <- which(pd$token == "'('")
-    end <- which(pd$token == "')'")
-    is_multi_line <- any(pd[seq2(start, end),]$multi_line)
-  }
-  if (pd$token[1] %in% tokens && !is_multi_line) {
+  browser()
+  if (pd$token[1] %in% tokens) {
     other_trigger_tokens <- c(
       math_token,
       logical_token,

diff --git a/tests/testthat/indention_operators/while_for_if_without_curly_non_strict-in.R b/tests/testthat/indention_operators/while_for_if_without_curly_non_strict-in.R
@@ -10,14 +10,17 @@ if (x)
 for (i in 1:3) #
   print(i)
 
+# FIXME
 for (i in
      1:3) #
   print(i)
 
+# FIXME
 for (i in #
      1:3) #
   print(i)
 
+# FIXME
 for (#
   i in #
   1:3#
@@ -36,18 +39,21 @@ while ( # test
   x > 3) # another
   return(FALSE)
 
+# FIXME
 while (
   2 > #here
   3 #
 ) #
   FALSE
 
+# FIXME
 while (
   2 > #here
   3 #
 )
   FALSE
 
+# FIXME
 while (
   2 > #here
   3

diff --git a/tests/testthat/indention_operators/while_for_if_without_curly_non_strict-in_tree b/tests/testthat/indention_operators/while_for_if_without_curly_non_strict-in_tree
diff --git a/tests/testthat/indention_operators/while_for_if_without_curly_non_strict-out.R b/tests/testthat/indention_operators/while_for_if_without_curly_non_strict-out.R
@@ -10,19 +10,22 @@ if (x)
 for (i in 1:3) #
   print(i)
 
+# FIXME
 for (i in
   1:3) #
-  print(i)
+print(i)
 
+# FIXME
 for (i in #
   1:3) #
-  print(i)
+print(i)
 
+# FIXME
 for ( #
   i in #
   1:3 #
 ) #
-  print(i)
+print(i)
 
 
 while (x > 3) #
@@ -40,19 +43,19 @@ while (
   2 > # here
     3 #
 ) #
-  FALSE
+FALSE
 
 while (
   2 > # here
     3 #
 )
-  FALSE
+FALSE
 
 while (
   2 > # here
     3
 ) #
-  FALSE
+FALSE
 
 while ( #
   2 >

diff --git a/tests/testthat/indention_operators/while_for_without_curly_same_line_non_strict-in.R b/tests/testthat/indention_operators/while_for_without_curly_same_line_non_strict-in.R
@@ -0,0 +1,31 @@
+while(x == 2) h(
+  2
+)
+
+while(x == 2) h( # comment
+  2
+)
+
+while(x == 2 &&
+      2 + 2 == 2) h(
+  2
+)
+
+
+for(x in 1:22) h(
+  2
+)
+
+for(x in 1:22) h( # comment
+  2
+)
+
+for(k in f(
+  2:22
+)) h(
+        2
+      )
+
+for(k in f(
+  2:22 # comment
+)) h(2)
diff --git a/tests/testthat/indention_operators/while_for_without_curly_same_line_non_strict-in_tree b/tests/testthat/indention_operators/while_for_without_curly_same_line_non_strict-in_tree
diff --git a/tests/testthat/indention_operators/while_for_without_curly_same_line_non_strict-out.R b/tests/testthat/indention_operators/while_for_without_curly_same_line_non_strict-out.R
@@ -0,0 +1,31 @@
+while (x == 2) h(
+  2
+)
+
+while (x == 2) h( # comment
+  2
+)
+
+while (x == 2 &&
+  2 + 2 == 2) h(
+  2
+)
+
+
+for (x in 1:22) h(
+  2
+)
+
+for (x in 1:22) h( # comment
+  2
+)
+
+for (k in f(
+  2:22
+)) h(
+  2
+)
+
+for (k in f(
+  2:22 # comment
+)) h(2)
diff --git a/tests/testthat/test-indention_operators.R b/tests/testthat/test-indention_operators.R
@@ -22,6 +22,9 @@ test_that("while / for / if without curly brackets", {
   expect_warning(test_collection("indention_operators",
                                  "while_for_if_without_curly_non_strict",
                                  transformer = style_text, strict = FALSE), NA)
+  expect_warning(test_collection("indention_operators",
+                                 "while_for_without_curly_same_line_non_strict",
+                                 transformer = style_text, strict = FALSE), NA)
 })
 
 test_that("function multiline without curly brackets", {