Merge pull request #328 from lorenzwalthert/hotfix-eq-assign

- Fixing relocation of EQ_ASSIGN (#328).

Author: lorenzwalthert

R/relevel.R

@@ -164,7 +164,7 @@ relocate_eq_assign_nest <- function(pd) {
 #' @param pd A parse table.
 find_block_id <- function(pd) {
   idx_eq_assign <- which(pd$token == "EQ_ASSIGN")
-  eq_belongs_to_block <- c(0, cumsum(diff(idx_eq_assign)) > 2)
+  eq_belongs_to_block <- c(0, cumsum(diff(idx_eq_assign) > 2))
 
   empty_seq <- rep(0, nrow(pd))
   empty_seq[idx_eq_assign - 1] <- eq_belongs_to_block

tests/testthat/relocate_eq_assign/eq_assign_multiple_tokens_eq_only-in.R

@@ -0,0 +1 @@
+a = b = c = d = e = f       = g = 4

tests/testthat/relocate_eq_assign/eq_assign_multiple_tokens_eq_only-in_tree

@@ -0,0 +1 @@
+a <- b <- c <- d <- e <- f <- g <- 4

tests/testthat/relocate_eq_assign/eq_assign_multiple_tokens_eq_only-out.R

@@ -0,0 +1 @@
+a = b = c = d = e = f       = g <- 4

tests/testthat/relocate_eq_assign/eq_assign_multiple_tokens_mixed-in.R

@@ -0,0 +1 @@
+a <- b <- c <- d <- e <- f <- g <- 4

tests/testthat/relocate_eq_assign/eq_assign_multiple_tokens_mixed-in_tree

@@ -27,6 +27,16 @@ test_that("tree hierarchy is the same no matter whether = or <- is used", {
     "x <- b <-  5", structure_only = TRUE
   )
   expect_equal(assign_eq, assign_left)
+
+
+  assign_left_many <- create_tree(
+    "x = b = c = d = r=  5", structure_only = TRUE
+  )
+  assign_eq_many <-  create_tree(
+    "x <- b <- c <- d <- r <- 5", structure_only = TRUE
+  )
+  expect_equal(assign_eq_many, assign_left_many)
+
 })
 
 test_that("braces are added in the right place in ifelse if eq_assign is in expr", {
@@ -37,6 +47,23 @@ test_that("braces are added in the right place in ifelse if eq_assign is in expr
   ), NA)
 })
 
+test_that("complicated reassignment works", {
+  expect_warning(test_collection(
+    "relocate_eq_assign", "eq_assign_multiple_tokens_eq_only",
+    transformer = style_text,
+    scope = "tokens",
+    style = tidyverse_style
+  ), NA)
+
+  expect_warning(test_collection(
+    "relocate_eq_assign", "eq_assign_multiple_tokens_mixed",
+    transformer = style_text,
+    scope = "tokens",
+    style = tidyverse_style
+  ), NA)
+})
+
+
 test_that("eq_assign is not replaced", {
   expect_warning(test_collection(
     "relocate_eq_assign", "eq_assign_ifelse_scope_line_breaks",