Fix alignment detection in tribble

NEWS.md

@@ -2,7 +2,7 @@
 
 * `#>` is recognized as an output marker and no space is added after `#` (#771).
 * code with left alignment after `=` in function calls is now recognized as 
-  aligned and won't be reformatted (#774).
+  aligned and won't be reformatted (#774, #777).
   ```
   # newly detected
   call(

R/detect-alignment.R

@@ -110,21 +110,32 @@ token_is_on_aligned_line <- function(pd_flat) {
 
     is_aligned <- length(unique(current_col)) == 1L
     if (is_aligned) {
-      previous_line <- nchar(by_line)
+      previous_line <- previous_line + nchar(by_line)
       next
     }
     # check 2: match by = (no extra spaces around it allowed.)
     # match left aligned after =
     start_after_eq <- regexpr("= [^ ]", by_line)
+    names(start_after_eq) <- names(by_line)
     start_after_eq <- start_after_eq[start_after_eq > 0]
 
-    # when match via comma unsuccessful, matching by = must yield at least one =
-    is_aligned <- length(unique(start_after_eq + previous_line)) == 1 && length(start_after_eq) > 1
-    previous_line <- nchar(by_line) + previous_line
-    if (column >= start_eval && !is_aligned) {
-      # when not all are named, we need colum 1 for previous_line
-      return(FALSE)
+    if (column >= start_eval) {
+      if (length(start_after_eq) == 0) {
+        return(FALSE)
+      }
+      # when match via comma unsuccessful, matching by = must yield at least one =
+      if (column == 1) {
+        current_col <- start_after_eq
+      } else {
+        current_col <- start_after_eq +
+          previous_line[intersect(names(previous_line), names(start_after_eq))]
+      }
+      is_aligned <- length(unique(current_col)) == 1 && length(start_after_eq) > 1
+      if (!is_aligned) {
+        return(FALSE)
+      }
     }
+    previous_line <- nchar(by_line) + previous_line
   }
   TRUE
 }

tests/testthat/alignment/named-in.R

@@ -204,3 +204,8 @@ gell(
   p = 2,   g = gg(x), n = 3 * 3, #
   31,    fds = -1, gz   = f / 3 + 1,
 )
+
+xgle(
+  1212, 232, f(n = 2),
+  1,      2,  "kFlya"
+)

tests/testthat/alignment/named-out.R

@@ -202,3 +202,8 @@ gell(
   p = 2,   g = gg(x), n = 3 * 3, #
   31,    fds = -1, gz   = f / 3 + 1,
 )
+
+xgle(
+  1212, 232, f(n = 2),
+  1,      2,  "kFlya"
+)

tests/testthat/test-detect-alignment.R

@@ -2,4 +2,7 @@ test_that("does apply spacing rules only if not aligned", {
   expect_warning(test_collection("alignment",
     transformer = style_text
   ), NA)
+
+  text <- "tribble(\n  ~x, ~y,\n  11, list(a = 1),\n  2, list(bjj = 2)\n)"
+  expect_warning(style_text(text), NA)
 })