actualy restore old behavior for strict = FALSE and non-comment

lorenzwalthert · lorenzwalthert · commit 0d845ef3ce9d · 2022-10-04T21:09:30.000+02:00
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -159,7 +159,7 @@ style_line_break_around_curly <- function(strict, pd) {
     pd$lag_newlines[to_break] <- ifelse(
       pd$token[to_break] == "COMMENT",
       pmin(1L, pd$lag_newlines[to_break]),
-      1L
+      if (strict) 1L else pmax(1L, pd$lag_newlines[to_break])
     )
   } else {
     is_else <- pd$token == "ELSE"

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ style_line_break_around_curly <- function(strict, pd) {`
`159`	`159`	`pd$lag_newlines[to_break] <- ifelse(`
`160`	`160`	`pd$token[to_break] == "COMMENT",`
`161`	`161`	`pmin(1L, pd$lag_newlines[to_break]),`
`162`		`- 1L`
	`162`	`+ if (strict) 1L else pmax(1L, pd$lag_newlines[to_break])`
`163`	`163`	`)`
`164`	`164`	`} else {`
`165`	`165`	`is_else <- pd$token == "ELSE"`