eq sub:

if on second line, move key also there
if on first line, leave it, might be intentional

Author: lorenzwalthert

R/rules-line-breaks.R

@@ -119,6 +119,21 @@ set_line_break_around_comma_and_or <- function(pd, strict) {
 
   pd$lag_newlines[comma_with_line_break_that_can_be_removed_before] <- 0L
   pd$lag_newlines[lag(comma_with_line_break_that_can_be_removed_before)] <- 1L
+
+  comma_with_line_break_that_can_be_moved_two_tokens_left <- which(
+    (pd$token == "EQ_SUB") &
+      (pd$lag_newlines > 0) &
+      (pd$token_before != "COMMENT") &
+      (lag(pd$token) != "'['")
+  )
+
+  pd$lag_newlines[comma_with_line_break_that_can_be_moved_two_tokens_left] <- 0L
+  token_before <- map_int(
+    comma_with_line_break_that_can_be_moved_two_tokens_left,
+    previous_non_comment,
+    pd = pd
+  )
+  pd$lag_newlines[token_before] <- 1L
   pd
 }
 

tests/testthat/line_breaks_and_other/around-eq-sub-in.R

@@ -0,0 +1,27 @@
+c(x = 2)
+
+c(x =
+    2)
+
+c(
+  x = 2)
+
+c(x
+  = 2)
+
+c(x = 2, a
+  =
+    1)
+
+
+c(x = 2, a
+  = # stuff
+    1)
+
+
+c(b=4, x # comment
+  = 2)
+
+
+c(x =# comment
+  2, c=)

tests/testthat/line_breaks_and_other/around-eq-sub-out.R

@@ -0,0 +1,39 @@
+c(x = 2)
+
+c(
+  x =
+    2
+)
+
+c(
+  x = 2
+)
+
+c(
+  x = 2
+)
+
+c(
+  x = 2,
+  a =
+    1
+)
+
+
+c(
+  x = 2,
+  a = # stuff
+    1
+)
+
+
+c(
+  b = 4, x # comment
+  = 2
+)
+
+
+c(
+  x = # comment
+    2, c =
+  )

tests/testthat/test-line_breaks_and_other.R

@@ -62,3 +62,9 @@ test_that("drop redundant line breaks in assignments", {
     transformer = style_text, scope = I(c("line_breaks", "tokens"))
   ), NA)
 })
+
+test_that("line is correctly broken around = ", {
+  expect_warning(test_collection("line_breaks_and_other", "around-eq-sub",
+    transformer = style_text
+  ), NA)
+})