Merge pull request #793 from lorenzwalthert/issue-792

- Remove line breaks between `}` and `else` (#792).

NEWS.md

@@ -49,6 +49,7 @@
 
 ## Minor changes and fixes
 
+* line breaks between `}` and `else` are removed (#793).
 * styler won't format code chunks with explicit `tidy = FALSE` in an Rmd or Rnw 
   code header anymore. This can be handy when the code can't be parsed, e.g.
   within a learnr tutorial (#790).

R/rules-line-breaks.R

@@ -113,6 +113,12 @@ style_line_break_around_curly <- function(strict, pd) {
       1L,
       pmax(1L, pd$lag_newlines[to_break])
     )
+  } else {
+    is_else <- pd$token == "ELSE"
+    if (any(pd$token_before[is_else] == "'}'")) {
+      pd$lag_newlines[is_else] <- 0L
+      pd$spaces[c(is_else, FALSE)[-1]] <- 1L
+    }
   }
   pd
 }

tests/testthat/indention_multiple/if_else_curly-in.R

@@ -27,3 +27,13 @@ if (TRUE) {
 4
 }
 }
+
+# rather space than brace thing, but
+foo <- function(x) {
+  if (TRUE) {
+    1
+  }
+  else {
+    2
+  }
+}

tests/testthat/indention_multiple/if_else_curly-out.R

@@ -27,3 +27,12 @@
     4
   }
 }
+
+# rather space than brace thing, but
+foo <- function(x) {
+  if (TRUE) {
+    1
+  } else {
+    2
+  }
+}