Use integer literals and avoid coercions where needed (#994)

Author: IndrajeetPatil

API

@@ -9,11 +9,11 @@ cache_info(cache_name = NULL, format = "both")
 create_style_guide(initialize = default_style_guide_attributes, line_break = NULL, space = NULL, token = NULL, indention = NULL, use_raw_indention = FALSE, reindention = tidyverse_reindention(), style_guide_name = NULL, style_guide_version = NULL, more_specs_style_guide = NULL, transformers_drop = specify_transformers_drop(), indent_character = " ")
 default_style_guide_attributes(pd_flat)
 specify_math_token_spacing(zero = "'^'", one = c("'+'", "'-'", "'*'", "'/'"))
-specify_reindention(regex_pattern = NULL, indention = 0, comments_only = TRUE)
+specify_reindention(regex_pattern = NULL, indention = 0L, comments_only = TRUE)
 specify_transformers_drop(spaces = NULL, indention = NULL, line_breaks = NULL, tokens = NULL)
-style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), recursive = TRUE, exclude_files = NULL, exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0, dry = "off")
-style_file(path, ..., style = tidyverse_style, transformers = style(...), include_roxygen_examples = TRUE, base_indention = 0, dry = "off")
-style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), exclude_files = c("R/RcppExports.R", "R/cpp11.R"), exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0, dry = "off")
+style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), recursive = TRUE, exclude_files = NULL, exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
+style_file(path, ..., style = tidyverse_style, transformers = style(...), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
+style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), exclude_files = c("R/RcppExports.R", "R/cpp11.R"), exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
 style_text(text, ..., style = tidyverse_style, transformers = style(...), include_roxygen_examples = TRUE, base_indention = 0)
 tidyverse_math_token_spacing()
 tidyverse_reindention()

R/addins.R

@@ -52,7 +52,7 @@ style_active_file <- function() {
   context <- get_rstudio_context()
   transformer <- make_transformer(get_addins_style_transformer(),
     include_roxygen_examples = TRUE,
-    base_indention = 0,
+    base_indention = 0L,
     warn_empty = is_plain_r_file(context$path)
   )
   is_r_file <- any(
@@ -124,7 +124,7 @@ style_selection <- function() {
   communicate_addins_style_transformers()
   context <- get_rstudio_context()
   text <- context$selection[[1]]$text
-  if (all(nchar(text) == 0)) abort("No code selected")
+  if (all(nchar(text) == 0L)) abort("No code selected")
   out <- style_text(
     text,
     transformers = get_addins_style_transformer(),

R/compat-dplyr.R

@@ -80,6 +80,7 @@ slice <- function(.data, ...) {
   .data[c(...), , drop = FALSE]
 }
 
+# TODO: Use `purrr::map_dfr()` when it stops implicitly relying on `{dplyr}`
 #' @importFrom purrr as_mapper map
 map_dfr <- function(.x, .f, ..., .id = NULL) {
   .f <- as_mapper(.f, ...)

R/detect-alignment-utils.R

@@ -32,7 +32,7 @@ alignment_ensure_no_closing_brace <- function(pd_by_line,
 alignment_drop_comments <- function(pd_by_line) {
   map(pd_by_line, function(x) {
     out <- x[x$token != "COMMENT", ]
-    if (nrow(out) < 1) {
+    if (nrow(out) < 1L) {
       return(NULL)
     } else {
       out
@@ -184,7 +184,7 @@ alignment_serialize <- function(pd_sub) {
 #' @keywords internal
 alignment_has_correct_spacing_around_comma <- function(pd_sub) {
   comma_tokens <- which(pd_sub$token == "','")
-  if (length(comma_tokens) == 0) {
+  if (length(comma_tokens) == 0L) {
     return(TRUE)
   }
   relevant_comma_token <- comma_tokens[seq2(1, length(comma_tokens) - 1L)]
@@ -201,7 +201,7 @@ alignment_has_correct_spacing_around_comma <- function(pd_sub) {
 #' @importFrom rlang seq2
 alignment_has_correct_spacing_around_eq_sub <- function(pd_sub) {
   relevant_eq_sub_token <- which(pd_sub$token == "EQ_SUB")
-  if (length(relevant_eq_sub_token) == 0) {
+  if (length(relevant_eq_sub_token) == 0L) {
     return(TRUE)
   }
 

R/detect-alignment.R

@@ -33,7 +33,7 @@
 #'     transformers <- tidyverse_style()
 #'     pd_nested <- styler:::compute_parse_data_nested(c(
 #'       "call(",
-#'       "  ab = 1,",
+#'       "  ab = 1L,",
 #'       "  a  = 2",
 #'       ")"
 #'     )) %>%
@@ -50,7 +50,7 @@ token_is_on_aligned_line <- function(pd_flat) {
   pd_flat$.lag_spaces <- lag(pd_flat$spaces)
   pd_by_line <- split(pd_flat, line_idx)
   pd_by_line[purrr::map_lgl(pd_by_line, ~ any(.x$stylerignore))] <- NULL
-  if (length(pd_by_line) < 1) {
+  if (length(pd_by_line) < 1L) {
     return(TRUE)
   }
   last_line_is_closing_brace_only <- nrow(last(pd_by_line)) == 1
@@ -93,7 +93,7 @@ token_is_on_aligned_line <- function(pd_flat) {
   }
 
   pd_by_line <- alignment_drop_comments(pd_by_line)
-  if (length(pd_by_line) < 1) {
+  if (length(pd_by_line) < 1L) {
     return(TRUE)
   }
   pd_by_line <- alignment_drop_last_expr(pd_by_line) %>%
@@ -165,7 +165,7 @@ token_is_on_aligned_line <- function(pd_flat) {
     start_after_eq <- start_after_eq[start_after_eq > 0]
 
     if (column >= start_eval) {
-      if (length(start_after_eq) == 0) {
+      if (length(start_after_eq) == 0L) {
         return(FALSE)
       }
       # when match via , unsuccessful, matching by = must yield at least one =
@@ -176,7 +176,7 @@ token_is_on_aligned_line <- function(pd_flat) {
           previous_line[intersect(names(previous_line), names(start_after_eq))]
       }
       is_aligned <- all(
-        length(unique(current_col)) == 1,
+        length(unique(current_col)) == 1L,
         length(start_after_eq) > 1
       )
       if (!is_aligned) {

R/expr-is.R

@@ -150,7 +150,7 @@ contains_else_expr <- function(pd) {
 #' @keywords internal
 contains_else_expr_that_needs_braces <- function(pd) {
   else_idx <- which(pd$token == "ELSE")
-  if (length(else_idx) > 0) {
+  if (length(else_idx) > 0L) {
     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

R/indent.R

@@ -21,7 +21,7 @@ indent_without_paren_for_while_fun <- function(pd, indent_by) {
     return(pd)
   }
 
-  if (pd$newlines[length(pd$newlines) - 1] == 0) {
+  if (pd$newlines[length(pd$newlines) - 1] == 0L) {
     return(pd)
   }
   pd$indent[nrow] <- indent_by
@@ -50,7 +50,7 @@ indent_without_paren_if_else <- function(pd, indent_by) {
 
 
   else_idx <- which(pd$token == "ELSE")
-  if (length(else_idx) == 0) {
+  if (length(else_idx) == 0L) {
     return(pd)
   }
   expr_after_else_idx <- next_non_comment(pd, else_idx)
@@ -167,7 +167,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] - 1L
+  before_first_break <- which(pd$lag_newlines > 0L)[1] - 1L
   if (is.na(before_first_break)) {
     return(FALSE)
   }
@@ -240,7 +240,7 @@ pd_multi_line <- function(pd) {
 #' @seealso choose_indention
 #' @keywords internal
 update_newlines <- function(pd) {
-  seq_pd <- seq_len(nrow(pd) - 1)
-  pd$newlines[seq_pd] <- pd$lag_newlines[seq_pd + 1]
+  seq_pd <- seq_len(nrow(pd) - 1L)
+  pd$newlines[seq_pd] <- pd$lag_newlines[seq_pd + 1L]
   pd
 }

R/initialize.R

@@ -37,7 +37,7 @@ NULL
 #' @describeIn initialize_attributes Initializes `newlines` and `lag_newlines`.
 #' @keywords internal
 initialize_newlines <- function(pd_flat) {
-  pd_flat$line3 <- lead(pd_flat$line1, default = tail(pd_flat$line2, 1))
+  pd_flat$line3 <- lead(pd_flat$line1, default = tail(pd_flat$line2, 1L))
   pd_flat$newlines <- pd_flat$line3 - pd_flat$line2
   pd_flat$lag_newlines <- lag(pd_flat$newlines, default = 0L)
   pd_flat$line3 <- NULL
@@ -47,7 +47,7 @@ initialize_newlines <- function(pd_flat) {
 #' @describeIn initialize_attributes Initializes `spaces`.
 #' @keywords internal
 initialize_spaces <- function(pd_flat) {
-  pd_flat$col3 <- lead(pd_flat$col1, default = tail(pd_flat$col2, 1) + 1L)
+  pd_flat$col3 <- lead(pd_flat$col1, default = tail(pd_flat$col2, 1L) + 1L)
   pd_flat$col2_nl <- ifelse(pd_flat$newlines > 0L,
     rep(0L, nrow(pd_flat)), pd_flat$col2
   )
@@ -83,7 +83,7 @@ initialize_indention_ref_pos_id <- function(pd_flat) {
 #' @keywords internal
 initialize_indent <- function(pd_flat) {
   if (!("indent" %in% names(pd_flat))) {
-    pd_flat$indent <- 0
+    pd_flat$indent <- 0L
   }
   pd_flat
 }

R/io.R

@@ -100,7 +100,7 @@ read_utf8_bare <- function(con, warn = TRUE) {
   x <- readLines(con, encoding = "UTF-8", warn = warn)
   i <- invalid_utf8(x)
   n <- length(i)
-  if (n > 0) {
+  if (n > 0L) {
     stop(
       c(
         "The file ", con, " is not encoded in UTF-8. ",

R/nest.R

@@ -112,7 +112,7 @@ drop_cached_children <- function(pd) {
     order <- order(pd$line1, pd$col1, -pd$line2, -pd$col2, as.integer(pd$terminal))
     pd_parent_first <- pd[order, ]
     pos_ids_to_keep <- pd_parent_first %>%
-      split(cumsum(pd_parent_first$parent == 0)) %>%
+      split(cumsum(pd_parent_first$parent == 0L)) %>%
       map(find_pos_id_to_keep) %>%
       unlist(use.names = FALSE)
     pd[pd$pos_id %in% pos_ids_to_keep, ]
@@ -124,11 +124,11 @@ drop_cached_children <- function(pd) {
 #' Find the pos ids to keep
 #'
 #' To make a parse table shallow, we must know which ids to keep.
-#' `split(cumsum(pd_parent_first$parent == 0))` above puts comments with
+#' `split(cumsum(pd_parent_first$parent == 0L))` above puts comments with
 #' negative parents in the same block as proceeding expressions (but also with
 #' positive).
 #' `find_pos_id_to_keep()` must hence always keep negative comments. We did not
-#' use `split(cumsum(pd_parent_first$parent < 1))` because then every top-level
+#' use `split(cumsum(pd_parent_first$parent < 1L))` because then every top-level
 #' comment is an expression on its own and processing takes much longer for
 #' typical roxygen annotated code.
 #' @param pd A temporary top level nest where the first expression is always a
@@ -340,10 +340,10 @@ set_spaces <- function(spaces_after_prefix, force_one) {
 #' @importFrom purrr map2
 #' @keywords internal
 nest_parse_data <- function(pd_flat) {
-  if (all(pd_flat$parent <= 0)) {
+  if (all(pd_flat$parent <= 0L)) {
     return(pd_flat)
   }
-  pd_flat$internal <- with(pd_flat, (id %in% parent) | (parent <= 0))
+  pd_flat$internal <- with(pd_flat, (id %in% parent) | (parent <= 0L))
   split_data <- split(pd_flat, pd_flat$internal)
 
   child <- split_data$`FALSE`
@@ -381,7 +381,7 @@ nest_parse_data <- function(pd_flat) {
 #' @keywords internal
 combine_children <- function(child, internal_child) {
   bound <- bind_rows(child, internal_child)
-  if (nrow(bound) == 0) {
+  if (nrow(bound) == 0L) {
     return(NULL)
   }
   bound[order(bound$pos_id), ]