Merge pull request #297 from lorenzwalthert/style-with-styler

- Style with styler (#297).

Author: lorenzwalthert

R/addins.R

@@ -50,13 +50,14 @@ try_transform_as_r_file <- function(context, transformer) {
   tryCatch(
     transformer(context$contents),
     error = function(e) stop(
-      paste(
-        "Styling of unsaved files is only supported for R files with valid code.",
-        "Please save the file (as .R or .Rmd) and make sure that the R code in it",
-        "can be parsed. Then, try to style again.",
-        "The error was \n", e
-      ), call. = FALSE
-  ))
+        paste(
+          "Styling of unsaved files is only supported for R files with valid code.",
+          "Please save the file (as .R or .Rmd) and make sure that the R code in it",
+          "can be parsed. Then, try to style again.",
+          "The error was \n", e
+        ), call. = FALSE
+      )
+  )
 }
 
 #' @describeIn styler_addins Styles the highlighted selection in a `.R` or

R/communicate.R

@@ -23,5 +23,4 @@ communicate_summary <- function(changed, ruler_width) {
   cli::cat_bullet("\t", sum(changed, na.rm = TRUE), "\tFile changed.", bullet = "info")
   cli::cat_bullet(bullet = "cross", "\t", sum(is.na(changed)), "\tStyling threw an eror.")
   cli::cat_rule(width = max(40, ruler_width))
-
 }

R/dplyr.R

@@ -24,8 +24,10 @@ arrange <- function(.data, ...) {
   stopifnot(is.data.frame(.data))
   ord <- eval(substitute(order(...)), .data, parent.frame())
   if (length(ord) != nrow(.data)) {
-    stop("Length of ordering vectors don't match data frame size",
-      call. = FALSE)
+    stop(
+      "Length of ordering vectors don't match data frame size",
+      call. = FALSE
+    )
   }
   .data[ord, , drop = FALSE]
 }
@@ -83,7 +85,7 @@ left_join <- function(x, y, by, ...) {
   res
 }
 
-nth <- function (x, n, order_by = NULL, default = x[NA_real_]) {
+nth <- function(x, n, order_by = NULL, default = x[NA_real_]) {
   stopifnot(length(n) == 1, is.numeric(n))
   n <- trunc(n)
   if (n == 0 || n > length(x) || n < -length(x)) {
@@ -101,7 +103,7 @@ nth <- function (x, n, order_by = NULL, default = x[NA_real_]) {
 }
 
 
-last <- function (x, order_by = NULL, default = x[NA_real_]) {
+last <- function(x, order_by = NULL, default = x[NA_real_]) {
   nth(x, -1L, order_by = order_by, default = default)
 }
 

R/expr-is.R

@@ -47,7 +47,7 @@ contains_else_expr_that_needs_braces <- function(pd) {
     non_comment_after_else <- next_non_comment(pd, else_idx)
     sub_expr <- pd$child[[non_comment_after_else]]
     # needs braces if NOT if_condition, NOT curly expr
-    !is_cond_expr(sub_expr) &&  !is_curly_expr(sub_expr)
+    !is_cond_expr(sub_expr) && !is_curly_expr(sub_expr)
   } else {
     FALSE
   }

R/indent.R

@@ -28,8 +28,8 @@ indent_op <- function(pd,
                         special_token,
                         "LEFT_ASSIGN",
                         "EQ_ASSIGN",
-                        "'$'")
-                      ) {
+                        "'$'"
+                      )) {
   indent_indices <- compute_indent_indices(pd, token)
   pd$indent[indent_indices] <- pd$indent[indent_indices] + indent_by
   pd
@@ -62,8 +62,8 @@ indent_assign <- function(pd, indent_by, token = NULL) {
 #'   statements that do not have curly parenthesis.
 indent_without_paren <- function(pd, indent_by = 2) {
   pd %>%
-  indent_without_paren_for_while_fun(indent_by) %>%
-  indent_without_paren_if_else(indent_by)
+    indent_without_paren_for_while_fun(indent_by) %>%
+    indent_without_paren_if_else(indent_by)
 }
 
 #' @describeIn update_indention Is used to indent for and statements and function
@@ -90,8 +90,8 @@ indent_without_paren_if_else <- function(pd, indent_by) {
   expr_after_else_idx <- next_non_comment(pd, else_idx)
   has_else_without_curly_or_else_chid <-
     any(pd$token == "ELSE") &&
-    pd$child[[expr_after_else_idx]]$token[1] != "'{'" &&
-    pd$child[[expr_after_else_idx]]$token[1] != "IF"
+      pd$child[[expr_after_else_idx]]$token[1] != "'{'" &&
+      pd$child[[expr_after_else_idx]]$token[1] != "IF"
   if (has_else_without_curly_or_else_chid) {
     pd$indent[seq(else_idx + 1, nrow(pd))] <- indent_by
   }

R/initialize.R

@@ -10,7 +10,6 @@
 #' styler:::pre_visit(pd, c(default_style_guide_attributes))
 #' @export
 default_style_guide_attributes <- function(pd_flat) {
-
   init_pd <-
     initialize_newlines(pd_flat) %>%
     initialize_spaces() %>%

R/nest.R

@@ -65,8 +65,10 @@ add_terminal_token_before <- function(pd_flat) {
     filter(terminal) %>%
     arrange(pos_id)
 
-  data_frame(id = terminals$id,
-             token_before = lag(terminals$token, default = "")) %>%
+  data_frame(
+    id = terminals$id,
+    token_before = lag(terminals$token, default = "")
+  ) %>%
     left_join(pd_flat, ., by = "id")
 }
 
@@ -144,7 +146,6 @@ combine_children <- function(child, internal_child) {
   bound <- bind_rows(child, internal_child)
   if (nrow(bound) == 0) return(NULL)
   bound[order(bound$pos_id), ]
-
 }
 
 #' Get the start right

R/nested_to_tree.R

@@ -43,8 +43,9 @@ create_node_from_nested_root <- function(pd_nested, structure_only) {
 #' @param parent The parent of the node to be created.
 #' @importFrom purrr map2 map
 create_node_from_nested <- function(pd_nested, parent, structure_only) {
-  if (is.null(pd_nested))
+  if (is.null(pd_nested)) {
     return()
+  }
 
   node_info <- create_node_info(pd_nested, structure_only)
 
@@ -62,6 +63,6 @@ create_node_info <- function(pd_nested, structure_only) {
     pd_nested$short, " [",
     pd_nested$lag_newlines, "/",
     pd_nested$spaces, "] {",
-    pd_nested$pos_id, "}")
-
+    pd_nested$pos_id, "}"
+  )
 }

R/parse.R

@@ -57,7 +57,7 @@ add_id_and_short <- function(pd) {
 #'   for potential reparsing.
 verify_str_txt <- function(pd_with_terminal_text, text) {
   string_ind <- pd_with_terminal_text$token == "STR_CONST"
-  strings <- pd_with_terminal_text[string_ind,]
+  strings <- pd_with_terminal_text[string_ind, ]
   parent_of_strings_ind <- pd_with_terminal_text$id %in% strings$parent
   other_ind <- !(string_ind | parent_of_strings_ind)
   if (nrow(strings) == 0 || !any(substr(strings$text, 1, 1) == "[")) {
@@ -71,8 +71,7 @@ verify_str_txt <- function(pd_with_terminal_text, text) {
   bind_rows(
     new_strings,
     pd_with_terminal_text[other_ind, ],
-    pd_with_terminal_text[parent_of_strings_ind,]
+    pd_with_terminal_text[parent_of_strings_ind, ]
   ) %>%
     arrange(pos_id)
-
 }

R/reindent.R

@@ -30,7 +30,7 @@ update_indention_ref_fun_call <- function(pd_nested) {
   non_comment <- which(pd_nested$token != "COMMENT")
   first_non_comment_after_call <- non_comment[non_comment > 2][1]
   if ((current_is_call) &&
-      pd_nested$lag_newlines[first_non_comment_after_call] == 0) {
+    pd_nested$lag_newlines[first_non_comment_after_call] == 0) {
     candidates <- seq2(3, nrow(pd_nested) - 1)
 
     child_is_call <- map_lgl(pd_nested$child, is_function_call)
@@ -109,7 +109,6 @@ apply_ref_indention_one <- function(flattened_pd, target_token) {
   flattened_pd$col1[cols_to_update] <- flattened_pd$col1[cols_to_update] + shift
   flattened_pd$col2[cols_to_update] <- flattened_pd$col2[cols_to_update] + shift
   flattened_pd
-
 }
 
 
@@ -131,16 +130,16 @@ apply_ref_indention_one <- function(flattened_pd, target_token) {
 #'   the tokens that match `regex.`
 #' @importFrom purrr map flatten_int
 set_regex_indention <- function(flattened_pd,
-                                  pattern,
-                                  target_indention = 0,
-                                  comments_only = TRUE) {
+                                pattern,
+                                target_indention = 0,
+                                comments_only = TRUE) {
   if (comments_only) {
     cond <- which(
       (flattened_pd$token == "COMMENT") & (flattened_pd$lag_newlines > 0)
     )
     if (length(cond) < 1) return(flattened_pd)
-    to_check <- flattened_pd[cond,]
-    not_to_check <- flattened_pd[-cond,]
+    to_check <- flattened_pd[cond, ]
+    not_to_check <- flattened_pd[-cond, ]
   } else {
     to_check <- flattened_pd
     not_to_check <- NULL