Merge pull request #318 from lorenzwalthert/named-arguments

- Named arguments and line breaks (#318).

Author: lorenzwalthert

R/rules-line_break.R

@@ -73,12 +73,27 @@ set_line_break_after_opening_if_call_is_multi_line <-
   if (!is_multi_line) {
     return(pd)
   }
+  break_pos <- find_line_break_position_in_multiline_call(pd)
+
   exception_pos <- c(
     which(pd$token %in% except_token_after),
-    if_else(pd$child[[1]]$text[1] %in% except_text_before, 3L, NA)
+    if_else(pd$child[[1]]$text[1] %in% except_text_before, break_pos, NA)
   )
-  pd$lag_newlines[setdiff(3, exception_pos)] <- 1L
+  pd$lag_newlines[setdiff(break_pos, exception_pos)] <- 1L
   pd
+  }
+
+
+#' Find index of the token before which the line should be broken
+#'
+#' Given a multi-line function call parse table, this function finds the
+#' position of the first named argument and breaks returns the index of it.
+#' If there is no named argument, the line is broken right after the opening
+#' parenthesis.
+#' @inheritParams set_line_break_if_call_is_multi_line
+find_line_break_position_in_multiline_call <- function(pd) {
+  candidate <- (which(pd$token == "EQ_SUB") - 1L)[1]
+  ifelse(is.na(candidate), 3L, candidate)
 }
 
 

man/find_line_break_position_in_multiline_call.Rd

@@ -0,0 +1,18 @@
+call(3,
+     b = 2, c
+)
+
+gs(3, b = 2,
+   c)
+
+call(3, b = 2, c)
+
+map(data, fun,
+    x = 3, z = 33)
+
+map2(dat1, data2, fun, x, y,
+     z)
+
+map2(dat1, data2, fun, x = 1, y = 2,
+  z
+)

tests/testthat/line_breaks_fun_call/named_arguments-in.R

@@ -0,0 +1,24 @@
+call(3,
+  b = 2, c
+)
+
+gs(3,
+  b = 2,
+  c
+)
+
+call(3, b = 2, c)
+
+map(data, fun,
+  x = 3, z = 33
+)
+
+map2(
+  dat1, data2, fun, x, y,
+  z
+)
+
+map2(dat1, data2, fun,
+  x = 1, y = 2,
+  z
+)

tests/testthat/line_breaks_fun_call/named_arguments-in_tree

@@ -29,3 +29,9 @@ test_that("line breaks work with exceptions", {
                                  "switch_ifelse",
                                  transformer = style_text), NA)
 })
+
+test_that("line breaks work with exceptions", {
+  expect_warning(test_collection("line_breaks_fun_call",
+                                 "named_arguments",
+                                 transformer = style_text), NA)
+})