Merge branch 'r-lib:main' into 963_change_defaults

Author: IndrajeetPatil

NEWS.md

@@ -32,6 +32,9 @@ editor_options:
 -   `{` is not put on a new line after `=` and in `function() {` for some edge
     cases (#939).
 
+-   `while ({})` statements are now handled the same way as function statements
+    with regards to breaking lines (#967).
+
 -   Parsing of {roxygen2} example comments now also works for edge cases when
     there is no literal code immediately following after the end of the example
     section (#940).

R/rules-line-breaks.R

@@ -65,8 +65,8 @@ set_line_break_before_curly_opening <- function(pd) {
       ~ next_terminal(pd[.x, ], vars = "token_after")$token_after
     ) != "'{'"
     last_expr_idx <- max(which(pd$token == "expr"))
-    is_last_expr <- ifelse(pd$token[1] == "IF",
-      # rule not applicable for IF
+    is_last_expr <- ifelse(pd$token[1] %in% c("IF", "WHILE"),
+      # rule not applicable for if and while
       TRUE, (line_break_to_set_idx + 1L) == last_expr_idx
     )
 

tests/testthat/line_breaks_and_other/braces-fun-calls2-in.R

@@ -76,3 +76,29 @@ tetst(
     x
   }, 1 + +1
 )
+
+while ({
+  x
+}) {
+  f()
+}
+
+while ({
+  x
+}
+) {
+  f()
+}
+
+while (
+  {
+  x
+}) {
+  f()
+}
+
+while (
+  {x
+}) {
+  f()
+}

tests/testthat/line_breaks_and_other/braces-fun-calls2-out.R

@@ -84,3 +84,27 @@ tetst(
   },
   1 + +1
 )
+
+while ({
+  x
+}) {
+  f()
+}
+
+while ({
+  x
+}) {
+  f()
+}
+
+while ({
+  x
+}) {
+  f()
+}
+
+while ({
+  x
+}) {
+  f()
+}