Merge pull request #786 from lorenzwalthert/improve-issue-784

- Detect alignment more generally (#786).

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: styler
 Title: Non-Invasive Pretty Printing of R Code
-Version: 1.4.1.9002
+Version: 1.4.1.9003
 Authors@R: 
     c(person(given = "Kirill",
              family = "Müller",

NEWS.md

@@ -18,21 +18,31 @@
   )
   ```
 
-* similarly, `tibble::tribble()`-like alignment for column > 1 is now detected 
-  when left aligned (#785).
+* similarly, left aligned after comma is now detected (#785).
   ```
   # previously detected
+  call(
+    x  = 12345, "It's old",
+    y2 = 17,      "before"
+  )
+  
   tribble(
-    ~x,        ~d,
-    "axa'fa", 1:6,
-    "b",   422231
+    ~x,             ~y,
+    "another",     1:3,
+    "b",       1211234
   )
   
   # newly detected
+  call(
+    x = 2,           p = "another",
+    y = "hhjkjkbew", x = 3
+  )
+
+  
   tribble(
-    ~x,       ~d,
-    "axa'fa", 1:6,
-    "b",      422231
+    ~x,        ~y,
+    "another", 1:3,
+    "b",       1211234
   )
   ```
   Also see `vignette("detect-alignment")`.

R/detect-alignment-utils.R

@@ -75,7 +75,7 @@ alignment_ensure_trailing_comma <- function(pd_by_line) {
 #'   excluding first and last column.
 #' @importFrom purrr map_lgl
 #' @keywords internal
-alignment_col1_is_named <- function(relevant_pd_by_line) {
+alignment_col1_all_named <- function(relevant_pd_by_line) {
   map_lgl(relevant_pd_by_line, function(x) {
     if (nrow(x) < 3) {
       return(FALSE)
@@ -90,7 +90,7 @@ alignment_col1_is_named <- function(relevant_pd_by_line) {
 
 #' Serialize all lines for a given column
 #' @param column The index of the column to serialize.
-#' @inheritParams alignment_col1_is_named
+#' @inheritParams alignment_col1_all_named
 #' @importFrom purrr map
 #' @keywords internal
 alignment_serialize_column <- function(relevant_pd_by_line, column) {
@@ -101,7 +101,7 @@ alignment_serialize_column <- function(relevant_pd_by_line, column) {
 #'
 #'
 #' @inheritParams alignment_serialize_column
-#' @inheritParams alignment_col1_is_named
+#' @inheritParams alignment_col1_all_named
 #' @keywords internal
 alignment_serialize_line <- function(relevant_pd_by_line, column) {
   # TODO

R/detect-alignment.R

@@ -93,7 +93,7 @@ token_is_on_aligned_line <- function(pd_flat) {
 
   n_cols <- map_int(pd_by_line, ~ sum(.x$token == "','"))
   previous_line <- 0
-  start_eval <- ifelse(all(alignment_col1_is_named(pd_by_line)), 1, 2)
+  start_eval <- ifelse(alignment_col1_all_named(pd_by_line), 1, 2)
   for (column in seq2(1, max(n_cols))) {
     by_line <- alignment_serialize_column(pd_by_line, column) %>%
       compact() %>%
@@ -109,15 +109,19 @@ token_is_on_aligned_line <- function(pd_flat) {
     }
 
     is_aligned <- length(unique(current_col)) == 1L
-    if (!is_aligned && !any(pd_flat$token == "EQ_SUB")) {
-      # check 2: by character after comma, e.g. tribble. Must not have =
-      current_col <- nchar(gsub("^(,[\\s\\t]*)[^ ]*", "\\1", by_line, perl = TRUE))
+    if (!is_aligned) {
+      # check 2: left aligned after ,
+      current_col <- nchar(gsub("^(,[\\s\\t]*)[^ ]*.*$", "\\1", by_line, perl = TRUE))
 
       if (column > 1) {
         # must add previous columns, as first column might not align
         current_col <- current_col + previous_line
       }
       is_aligned <- length(unique(current_col)) == 1L
+      if (is_aligned) {
+        # if left aligned after ,
+        start_eval <- 2
+      }
     }
     if (is_aligned) {
       previous_line <- previous_line + nchar(by_line)

tests/testthat/alignment/named-in.R

@@ -209,3 +209,15 @@ xgle(
   1212, 232, f(n = 2),
   1,      2,  "kFlya"
 )
+
+# left aligned after ,
+call(
+  x = 2,           y = "another",
+  y = "hhjkjkbew", x = 3
+)
+
+call(
+  k = ff("pk"), k = 3,
+  b = f(-g),    22 + 1,
+  44,           323
+)

tests/testthat/alignment/named-out.R

@@ -207,3 +207,15 @@ xgle(
   1212, 232, f(n = 2),
   1,      2,  "kFlya"
 )
+
+# left aligned after ,
+call(
+  x = 2,           y = "another",
+  y = "hhjkjkbew", x = 3
+)
+
+call(
+  k = ff("pk"), k = 3,
+  b = f(-g),    22 + 1,
+  44,           323
+)

tests/testthat/alignment/tribble-out.R

@@ -26,5 +26,5 @@ tribble(
 # has EQ_SUB which don't match, not tribble-like
 mlr3misc:::rowwise_table(
   x = 23, zy = 3,
-  y = 1, k = 1,
+  y = 1,  k = 1,
 )