Merge pull request #1026 from IndrajeetPatil/index_integer_literals

Author: IndrajeetPatil

R/addins.R

@@ -78,7 +78,7 @@ style_active_file <- function() {
   if (save_after_styling_is_active() == TRUE && context$path != "") {
     rstudioapi::documentSave(context$id)
   }
-  rstudioapi::setCursorPosition(context$selection[[1]]$range)
+  rstudioapi::setCursorPosition(context$selection[[1L]]$range)
 }
 
 #' Wrapper around [style_pkg()] for access via Addin.
@@ -123,18 +123,18 @@ save_after_styling_is_active <- function() {
 style_selection <- function() {
   communicate_addins_style_transformers()
   context <- get_rstudio_context()
-  text <- context$selection[[1]]$text
+  text <- context$selection[[1L]]$text
   if (all(nchar(text) == 0L)) abort("No code selected")
   out <- style_text(
     text,
     transformers = get_addins_style_transformer(),
     base_indention = nchar(gsub("^( *).*", "\\1", text))
   )
   rstudioapi::modifyRange(
-    context$selection[[1]]$range,
+    context$selection[[1L]]$range,
     paste0(c(
       out,
-      if (context$selection[[1]]$range$end[2] == 1L) ""
+      if (context$selection[[1L]]$range$end[2L] == 1L) ""
     ), collapse = "\n"),
     id = context$id
   )

R/detect-alignment-utils.R

@@ -93,8 +93,8 @@ alignment_ensure_trailing_comma <- function(pd_by_line) {
       lag_newlines = 0L,
       spaces = 0L,
       pos_ids = NA,
-      stylerignore = last_pd$stylerignore[1],
-      indents = last_pd$indent[1]
+      stylerignore = last_pd$stylerignore[1L],
+      indents = last_pd$indent[1L]
     )
     tokens$.lag_spaces <- 0
 
@@ -114,9 +114,9 @@ alignment_col1_all_named <- function(relevant_pd_by_line) {
     if (nrow(x) < 3L) {
       return(FALSE)
     }
-    x$token[3] == "expr" &&
-      any(c("SYMBOL_SUB", "STR_CONST", "SYMBOL_FORMALS") == x$token[1]) &&
-      any(c("EQ_SUB", "EQ_FORMALS", "SPECIAL-IN", "LT", "GT", "EQ", "NE") == x$token[2])
+    x$token[3L] == "expr" &&
+      any(c("SYMBOL_SUB", "STR_CONST", "SYMBOL_FORMALS") == x$token[1L]) &&
+      any(c("EQ_SUB", "EQ_FORMALS", "SPECIAL-IN", "LT", "GT", "EQ", "NE") == x$token[2L])
   }) %>%
     all()
 }

R/detect-alignment.R

@@ -38,7 +38,7 @@
 #'       ")"
 #'     )) %>%
 #'       styler:::post_visit(transformers$initialize)
-#'     nest <- pd_nested$child[[1]]
+#'     nest <- pd_nested$child[[1L]]
 #'     styler:::token_is_on_aligned_line(nest)
 #'   }
 #' )
@@ -62,7 +62,7 @@ token_is_on_aligned_line <- function(pd_flat) {
   relevant_idx <- seq2(2L, last_idx)
   pd_by_line <- pd_by_line[relevant_idx]
 
-  relevant_lag_spaces_col_1 <- map_int(pd_by_line, ~ .x$.lag_spaces[1])
+  relevant_lag_spaces_col_1 <- map_int(pd_by_line, ~ .x$.lag_spaces[1L])
 
   col1_is_aligned <- length(unique(relevant_lag_spaces_col_1)) == 1L
   if (!col1_is_aligned) {
@@ -82,7 +82,7 @@ token_is_on_aligned_line <- function(pd_flat) {
   if (!all(has_correct_spacing_around_eq_sub)) {
     return(FALSE)
   }
-  starting_with_comma <- map_lgl(pd_by_line, ~ .x$token[1] == "','")
+  starting_with_comma <- map_lgl(pd_by_line, ~ .x$token[1L] == "','")
   if (any(starting_with_comma)) {
     return(FALSE)
   }

R/expr-is.R

@@ -12,23 +12,23 @@ is_curly_expr <- function(pd) {
   if (is.null(pd)) {
     return(FALSE)
   }
-  pd$token[1] == "'{'"
+  pd$token[1L] == "'{'"
 }
 
 is_for_expr <- function(pd) {
-  pd$token[1] == "FOR"
+  pd$token[1L] == "FOR"
 }
 
 #' @describeIn pd_is Checks whether `pd` contains is a conditional expression.
 #' @keywords internal
 is_cond_expr <- function(pd) {
-  pd$token[1] == "IF"
+  pd$token[1L] == "IF"
 }
 
 #' @describeIn pd_is Checks whether `pd` contains is a while loop.
 #' @keywords internal
 is_while_expr <- function(pd) {
-  pd$token[1] == "WHILE"
+  pd$token[1L] == "WHILE"
 }
 
 #' @describeIn pd_is Checks whether `pd` is a function call.
@@ -37,10 +37,10 @@ is_function_call <- function(pd) {
   if (is.null(pd)) {
     return(FALSE)
   }
-  if (is.na(pd$token_before[2])) {
+  if (is.na(pd$token_before[2L])) {
     return(FALSE)
   }
-  pd$token_before[2] == "SYMBOL_FUNCTION_CALL"
+  pd$token_before[2L] == "SYMBOL_FUNCTION_CALL"
 }
 
 #' @describeIn pd_is Checks whether `pd` is a function declaration.
@@ -49,7 +49,7 @@ is_function_dec <- function(pd) {
   if (is.null(pd)) {
     return(FALSE)
   }
-  pd$token[1] == "FUNCTION"
+  pd$token[1L] == "FUNCTION"
 }
 
 #' @describeIn pd_is Checks for every token whether or not it is a comment.
@@ -96,7 +96,7 @@ is_subset_expr <- function(pd) {
   if (is.null(pd) || nrow(pd) == 1) {
     return(FALSE)
   }
-  pd$token[2] == "'['"
+  pd$token[2L] == "'['"
 }
 
 

R/indent.R

@@ -14,7 +14,7 @@ NULL
 indent_without_paren_for_while_fun <- function(pd, indent_by) {
   tokens <- c("FOR", "WHILE", "FUNCTION")
   nrow <- nrow(pd)
-  if (!(pd$token[1] %in% tokens)) {
+  if (!(pd$token[1L] %in% tokens)) {
     return(pd)
   }
   if (is_curly_expr(pd$child[[nrow]])) {
@@ -32,8 +32,8 @@ indent_without_paren_for_while_fun <- function(pd, indent_by) {
 #' @importFrom rlang seq2
 #' @keywords internal
 indent_without_paren_if_else <- function(pd, indent_by) {
-  expr_after_if <- next_non_comment(pd, which(pd$token == "')'")[1])
-  is_if <- pd$token[1] == "IF"
+  expr_after_if <- next_non_comment(pd, which(pd$token == "')'")[1L])
+  is_if <- pd$token[1L] == "IF"
   if (!is_if) {
     return(pd)
   }
@@ -52,8 +52,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[1L] != "'{'" &&
+      pd$child[[expr_after_else_idx]]$token[1L] != "IF"
 
   needs_indention_now <- pd$lag_newlines[
     next_non_comment(pd, which(pd$token == "ELSE"))
@@ -97,7 +97,7 @@ compute_indent_indices <- function(pd,
   needs_indention <- needs_indention(pd, potential_triggers,
     other_trigger_tokens = c("EQ_SUB", "EQ_FORMALS")
   )
-  trigger <- potential_triggers[needs_indention][1]
+  trigger <- potential_triggers[needs_indention][1L]
   if (is.na(trigger)) {
     return(numeric(0))
   }
@@ -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 > 0L)[1] - 1L
+  before_first_break <- which(pd$lag_newlines > 0L)[1L] - 1L
   if (is.na(before_first_break)) {
     return(FALSE)
   }

R/nest.R

@@ -145,7 +145,7 @@ drop_cached_children <- function(pd) {
 #' styler:::get_parse_data(c("", "c(#", "1)", "#"))
 #' @keywords internal
 find_pos_id_to_keep <- function(pd) {
-  if (pd$is_cached[1]) {
+  if (pd$is_cached[1L]) {
     pd$pos_id[pd$parent <= 0]
   } else {
     pd$pos_id
@@ -292,9 +292,9 @@ add_attributes_caching <- function(pd_flat, transformers, more_specs) {
   pd_flat$block <- rep(NA, nrow(pd_flat))
   pd_flat$is_cached <- rep(FALSE, nrow(pd_flat))
   if (cache_is_activated()) {
-    is_parent <- pd_flat$parent == 0
+    is_parent <- pd_flat$parent == 0L
     pd_flat$is_cached[is_parent] <- map_lgl(
-      pd_flat$text[pd_flat$parent == 0],
+      pd_flat$text[pd_flat$parent == 0L],
       is_cached, transformers,
       more_specs = more_specs
     )

R/parse.R

@@ -45,10 +45,10 @@ parse_safely <- function(text, ...) {
 #' @param initial_text The initial text to style.
 #' @keywords internal
 has_crlf_as_first_line_sep <- function(message, initial_text) {
-  split <- strsplit(message, ":", fixed = TRUE)[[1]]
-  if (length(split) > 1L && split[1] == "<text>") {
-    start_char <- as.numeric(split[3])
-    offending_line <- initial_text[as.integer(split[2])]
+  split <- strsplit(message, ":", fixed = TRUE)[[1L]]
+  if (length(split) > 1L && split[1L] == "<text>") {
+    start_char <- as.numeric(split[3L])
+    offending_line <- initial_text[as.integer(split[2L])]
     if (!is.na(offending_line)) {
       if (substr(offending_line, start_char, start_char + 1) == "\r\n") {
         return(TRUE)

R/relevel.R

@@ -52,7 +52,7 @@ flatten_operators_one <- function(pd_nested) {
 #'   from left or from right.
 #' @keywords internal
 flatten_pd <- function(pd_nested, token, child_token = token, left = TRUE) {
-  token_pos_candidates <- which(pd_nested$token[-1] %in% token) + 1L
+  token_pos_candidates <- which(pd_nested$token[-1L] %in% token) + 1L
   if (length(token_pos_candidates) == 0L) {
     return(pd_nested)
   }
@@ -70,7 +70,7 @@ flatten_pd <- function(pd_nested, token, child_token = token, left = TRUE) {
   if (pos < 1L) {
     return(pd_nested)
   }
-  if (!any(pd_nested$child[[pos]]$token[-1] %in% child_token)) {
+  if (!any(pd_nested$child[[pos]]$token[-1L] %in% child_token)) {
     return(pd_nested)
   }
   bind_with_child(pd_nested, pos)
@@ -102,8 +102,8 @@ wrap_expr_in_expr <- function(pd) {
     pos_ids = create_pos_ids(pd, 1, after = FALSE),
     child = pd,
     terminal = FALSE,
-    stylerignore = pd$stylerignore[1],
-    indents = pd$indent[1]
+    stylerignore = pd$stylerignore[1L],
+    indents = pd$indent[1L]
   )
 }
 
@@ -214,7 +214,7 @@ find_block_id <- function(pd) {
 #' @keywords internal
 relocate_eq_assign_one <- function(pd) {
   idx_eq_assign <- which(pd$token == "EQ_ASSIGN")
-  eq_ind <- seq2(idx_eq_assign[1] - 1L, last(idx_eq_assign) + 1L)
+  eq_ind <- seq2(idx_eq_assign[1L] - 1L, last(idx_eq_assign) + 1L)
   # initialize because wrap_expr_in_expr -> create_tokens -> requires it
   pd$indent <- 0
   eq_expr <- pd[eq_ind, ] %>%
@@ -240,9 +240,9 @@ relocate_eq_assign_one <- function(pd) {
 #' @keywords internal
 add_line_col_to_wrapped_expr <- function(pd) {
   if (nrow(pd) > 1) abort("pd must be a wrapped expression that has one row.")
-  pd$line1 <- pd$child[[1]]$line1[1]
-  pd$line2 <- last(pd$child[[1]]$line2)
-  pd$col1 <- pd$child[[1]]$col1[1]
-  pd$col2 <- last(pd$child[[1]]$col2)
+  pd$line1 <- pd$child[[1L]]$line1[1L]
+  pd$line2 <- last(pd$child[[1L]]$line2)
+  pd$col1 <- pd$child[[1L]]$col1[1L]
+  pd$col2 <- last(pd$child[[1L]]$col2)
   pd
 }

R/roxygen-examples-add-remove.R

@@ -5,7 +5,7 @@
 #' @importFrom rlang seq2
 remove_dont_mask <- function(roxygen) {
   mask <- c(
-    1L, 2L, if (roxygen[3] == "\n") 3L, last(which(roxygen == "}"))
+    1L, 2L, if (roxygen[3L] == "\n") 3L, last(which(roxygen == "}"))
   ) %>% sort()
   list(
     code = roxygen[-mask], mask = paste(roxygen[seq2(1, 2)], collapse = "")
@@ -45,8 +45,8 @@ remove_roxygen_header <- function(text) {
 add_roxygen_mask <- function(text, initial_text, example_type) {
   space <- ifelse(text == "", "", " ")
   out <- c(
-    paste0("#' @", example_type, space[1], text[1]),
-    map2_chr(space[-1], text[-1], ~ paste0("#'", .x, .y))
+    paste0("#' @", example_type, space[1L], text[1L]),
+    map2_chr(space[-1L], text[-1L], ~ paste0("#'", .x, .y))
   )
 
   ordinary_comment <- grep("^#[^']", initial_text, value = TRUE)
@@ -55,7 +55,7 @@ add_roxygen_mask <- function(text, initial_text, example_type) {
   }
   without_mask <- remove_roxygen_mask(out)
   for (idx in seq_along(ordinary_comment)) {
-    to_replace <- which(ordinary_comment[idx] == without_mask)[1]
+    to_replace <- which(ordinary_comment[idx] == without_mask)[1L]
     out[to_replace] <- ordinary_comment[idx]
     without_mask[to_replace] <- NA
   }

R/roxygen-examples-find.R

@@ -66,6 +66,6 @@ find_dont_closings <- function(bare, dont_openings) {
   match_closing <- intersect(
     seq2(dont_openings + 1L, length(bare)),
     which(diff == level_dont - 1L)
-  )[1]
+  )[1L]
   match_closing + 1L
 }