Merge pull request #782 from lorenzwalthert/issue-776

- Multi-line to carry number of lines instead of boolean (#776).

Author: lorenzwalthert

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ default_stages: [commit]
 
 repos:
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: acc8657498d5bfb9e9891098ba00b36e82c7ebd6
+    rev: 0cdf06628ef4ea54b20ed2feede10dad1fd9f304
     hooks:
     -   id: style-files
         args: [--style_pkg=styler, --style_fun=tidyverse_style]

NEWS.md

@@ -1,6 +1,5 @@
 # styler 1.4.1.9000 (Development version)
 
-* `#>` 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, #777).
   ```
@@ -18,7 +17,9 @@
   ```
   Also see `vignette("detect-alignment")`:
 
+* `#>` is recognized as an output marker and no space is added after `#` (#771).
 * improve pkgdown author URLs (#775).
+* `multi_line` attribute in parse table is now integer, not boolean (#782).
 
 # styler 1.4.1
 

R/detect-alignment-utils.R

@@ -58,8 +58,8 @@ alignment_ensure_trailing_comma <- function(pd_by_line) {
     tokens <- create_tokens(
       tokens = "','",
       texts = ",",
-      lag_newlines = 0,
-      spaces = 0,
+      lag_newlines = 0L,
+      spaces = 0L,
       pos_ids = NA,
     )
     tokens$.lag_spaces <- 0

R/detect-alignment.R

@@ -43,7 +43,7 @@
 #'   }
 #' )
 token_is_on_aligned_line <- function(pd_flat) {
-  line_idx <- 1 + cumsum(pd_flat$lag_newlines)
+  line_idx <- 1L + cumsum(pd_flat$lag_newlines)
   # cannot use lag_newlines anymore since we removed tokens
   # pos_id too expensive to construct in alignment_ensure_trailing_comma()
   pd_flat$lag_newlines <- pd_flat$pos_id <- NULL
@@ -80,7 +80,7 @@ token_is_on_aligned_line <- function(pd_flat) {
   if (any(starting_with_comma)) {
     return(FALSE)
   }
-  pd_is_multi_line <- map_lgl(pd_by_line, ~ any(.x$multi_line, na.rm = TRUE))
+  pd_is_multi_line <- map_lgl(pd_by_line, ~ any(.x$multi_line > 0L, na.rm = TRUE))
   if (any(pd_is_multi_line)) {
     return(FALSE)
   }

R/indent.R

@@ -163,7 +163,7 @@ needs_indention <- function(pd,
 needs_indention_one <- function(pd,
                                 potential_trigger_pos,
                                 other_trigger_tokens) {
-  before_first_break <- which(pd$lag_newlines > 0)[1] - 1
+  before_first_break <- which(pd$lag_newlines > 0)[1] - 1L
   if (is.na(before_first_break)) {
     return(FALSE)
   }
@@ -201,7 +201,7 @@ needs_indention_one <- function(pd,
 #' @importFrom purrr map_lgl
 #' @keywords internal
 set_multi_line <- function(pd) {
-  pd$multi_line <- map_lgl(pd$child, pd_is_multi_line)
+  pd$multi_line <- unname(map_int(pd$child, pd_multi_line))
   pd
 }
 
@@ -214,7 +214,11 @@ set_multi_line <- function(pd) {
 #' @param pd A parse table.
 #' @keywords internal
 pd_is_multi_line <- function(pd) {
-  any(pd$multi_line, pd$lag_newlines > 0)
+  pd_multi_line(pd) > 0
+}
+
+pd_multi_line <- function(pd) {
+  sum(pd$multi_line, pd$lag_newlines)
 }
 
 #' Update the newlines attribute

R/initialize.R

@@ -66,7 +66,7 @@ remove_attributes <- function(pd_flat, attributes) {
 initialize_multi_line <- function(pd_flat) {
   nrow <- nrow(pd_flat)
   pd_flat$multi_line <- ifelse(pd_flat$terminal,
-    rep(FALSE, nrow),
+    rep(0L, nrow),
     rep(NA, nrow)
   )
   pd_flat

R/rules-line-breaks.R

@@ -195,7 +195,7 @@ add_line_break_after_pipe <- function(pd) {
 set_line_break_after_assignment <- function(pd) {
   is_assignment <- lag(pd$token, default = FALSE) %in% c("LEFT_ASSIGN", "EQ_ASSIGN")
   if (any(is_assignment)) {
-    pd$lag_newlines[is_assignment] <- min(1, pd$lag_newlines[is_assignment])
+    pd$lag_newlines[is_assignment] <- min(1L, pd$lag_newlines[is_assignment])
   }
   pd
 }
@@ -289,7 +289,7 @@ set_line_break_before_closing_call <- function(pd, except_token_before) {
   }
   npd <- nrow(pd)
   is_multi_line <- any(pd$lag_newlines[seq2(3L, npd - 1L)] > 0)
-  if (!is_multi_line) {
+  if (is_multi_line == 0) {
     exception <- which(pd$token_before %in% except_token_before)
     pd$lag_newlines[setdiff(npd, exception)] <- 0L
     return(pd)

R/rules-tokens.R

@@ -31,7 +31,7 @@ add_brackets_in_pipe_one <- function(pd, pos) {
       tokens = c("'('", "')'"),
       texts = c("(", ")"),
       pos_ids = new_pos_ids,
-      lag_newlines = rep(0, 2)
+      lag_newlines = rep(0L, 2)
     )
     pd$child[[next_non_comment]] <- bind_rows(
       pd$child[[next_non_comment]],

R/serialize.R

@@ -5,7 +5,7 @@
 #' @keywords internal
 serialize_parse_data_flattened <- function(flattened_pd) {
   flattened_pd <- apply_stylerignore(flattened_pd)
-  flattened_pd$lag_newlines[1] <- 0 # resolve start_line elsewhere
+  flattened_pd$lag_newlines[1] <- 0L # resolve start_line elsewhere
   with(
     flattened_pd,
     paste0(

R/token-create.R

@@ -26,13 +26,13 @@
 #' @keywords internal
 create_tokens <- function(tokens,
                           texts,
-                          lag_newlines = 0,
-                          spaces = 0,
+                          lag_newlines = 0L,
+                          spaces = 0L,
                           pos_ids,
                           token_before = NA,
                           token_after = NA,
                           indention_ref_pos_ids = NA,
-                          indents = 0,
+                          indents = 0L,
                           terminal = TRUE,
                           child = NULL,
                           stylerignore = FALSE,
@@ -52,7 +52,7 @@ create_tokens <- function(tokens,
       terminal = rep(terminal, len_text),
       internal = rep(FALSE, len_text),
       spaces = spaces,
-      multi_line = rep(FALSE, len_text),
+      multi_line = rep(0L, len_text),
       indention_ref_pos_id = indention_ref_pos_ids,
       indent = indents,
       child = rep(list(child), len_text),

R/unindent.R

@@ -15,7 +15,7 @@ set_unindention_child <- function(pd, token = "')'", unindent_by) {
     return(pd)
   }
 
-  first_on_last_line <- last(c(1, which(pd$lag_newlines > 0 | pd$multi_line)))
+  first_on_last_line <- last(c(1, which(pd$lag_newlines > 0 | pd$multi_line > 0)))
   on_same_line <- seq2(first_on_last_line, closing - 1)
   cand_ind <- setdiff(on_same_line, which(pd$terminal))
 

R/visit.R

@@ -110,7 +110,7 @@ context_towards_terminals <- function(pd_nested,
   pd_nested$indent <- pd_nested$indent + ifelse(
     is.na(pd_nested$indention_ref_pos_id),
     outer_indent,
-    0
+    0L
   )
   ref_pos_id_is_na <- !is.na(pd_nested$indention_ref_pos_id)
   pd_nested$indention_ref_pos_id[!ref_pos_id_is_na] <- outer_indention_refs