use unindent_fun_dec() for proper token-dependent indention of function calls.

Author: lorenzwalthert

R/indent.R

@@ -36,6 +36,21 @@ indent_op <- function(pd,
   pd
 }
 
+#' Revert the indention of function declaration heads
+#'
+#' Necessary for consistent indention of the function declaration head.
+#' @param pd A parse table.
+#' @seealso set_unindention_child update_indention_ref_fun_dec
+unindent_fun_dec <- function(pd) {
+  if (is_function_dec(pd)) {
+    idx_closing_brace <- which(pd$token %in% "')'")
+    fun_dec_head <- seq2(2L, idx_closing_brace)
+    pd$indent[fun_dec_head] <- 0L
+
+  }
+  pd
+}
+
 #' @describeIn update_indention Updates indention for token EQ_SUB. Only differs
 #'   from [indent_op()] in the sense that not all subsequent tokens in the parse
 #'   table are necessarily indented, as `EQ_SUB` and `EQ_FORMALS` can occur

R/reindent.R

@@ -96,9 +96,7 @@ apply_ref_indention_one <- function(flattened_pd, target_token) {
   # udate spaces
   copied_spaces <- flattened_pd$col2[target_token]
   old_spaces <- flattened_pd$lag_spaces[token_to_update[1]]
-  if (length(token_to_update) < 1) return(flattened_pd)
-  zero_ref <- min(flattened_pd$lag_spaces[token_to_update])
-  shift <-  copied_spaces - zero_ref
+  shift <- copied_spaces
   flattened_pd$lag_spaces[token_to_update] <-
     flattened_pd$lag_spaces[token_to_update] + shift
 
@@ -115,8 +113,6 @@ apply_ref_indention_one <- function(flattened_pd, target_token) {
 #' spacing information needs to be updated are computed. Since indention is
 #' already embeded in the column `lag_spaces`, only tokens at the beginning of
 #' a line are of concern.
-#' This function is currently tailored targeted at
-#' re-indention of function delcaration.
 #' @param flattened_pd A flattened parse table.
 #' @param token_to_update An integer vector with positions of tokens to update.
 #' @seealso apply_ref_indention_one()

R/style_guides.R

@@ -65,6 +65,7 @@ tidyverse_style <- function(scope = "tokens",
   space_manipulators <- if (scope >= "spaces") {
     lst(
       partial(indent_braces, indent_by = indent_by),
+      unindent_fun_dec,
       partial(indent_op, indent_by = indent_by),
       partial(indent_eq_sub, indent_by = indent_by),
       partial(indent_without_paren, indent_by = indent_by),