Merge branch 'main' into f-759-named-funs

Author: IndrajeetPatil

.github/workflows/check-full.yaml

@@ -27,12 +27,12 @@ jobs:
           - {os: windows-latest, r: '3.6'}
 
           # Use older ubuntu to maximise backward compatibility
-          - {os: ubuntu-18.04,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-18.04,   r: 'release'}
-          - {os: ubuntu-18.04,   r: 'oldrel-1'}
-          - {os: ubuntu-18.04,   r: 'oldrel-2'}
-          - {os: ubuntu-18.04,   r: 'oldrel-3'}
-          - {os: ubuntu-18.04,   r: 'oldrel-4'}
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,  r: 'release'}
+          - {os: ubuntu-latest,  r: 'oldrel-1'}
+          - {os: ubuntu-latest,  r: 'oldrel-2'}
+          - {os: ubuntu-latest,  r: 'oldrel-3'}
+          - {os: ubuntu-latest,  r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -51,10 +51,12 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::rcmdcheck, data.tree=?ignore-before-r=3.5.0
+          extra-packages: any::rcmdcheck
           needs: check
 
       - uses: r-lib/actions/check-r-package@v2
+        with:
+          error-on: '"note"'
         env:
           _R_CHECK_FORCE_SUGGESTS_: false
 

.github/workflows/pre-commit.yaml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: >-
       !contains(github.event.head_commit.message, 'ci skip') &&
       (

DESCRIPTION

@@ -11,14 +11,19 @@ Authors@R:
       person(given = "Lorenz",
              family = "Walthert",
              role = c("cre", "aut"),
-             email = "[email protected]"))
+             email = "[email protected]"),
+      person(given = "Indrajeet",
+             family = "Patil",
+             role = "ctb",
+             email = "[email protected]",
+             comment = c(ORCID = "0000-0003-1995-6531", Twitter = "@patilindrajeets")))
 Description: Pretty-prints R code without changing the user's formatting
     intent.
 License: MIT + file LICENSE
 URL: https://github.com/r-lib/styler, https://styler.r-lib.org
 BugReports: https://github.com/r-lib/styler/issues
 Depends:
-    R (>= 3.4.0)
+    R (>= 3.5.0)
 Imports: 
     cli (>= 3.1.1),
     magrittr (>= 2.0.0),
@@ -48,6 +53,7 @@ Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate",
     "pkgapi::api_roclet"))
 RoxygenNote: 7.2.1
 Config/testthat/edition: 3
+Config/testthat/parallel: true
 Collate: 
     'addins.R'
     'communicate.R'

NEWS.md

@@ -11,7 +11,8 @@ editor_options:
 -  `style_dir()` and `style_pkg()` now default to styling all supported file 
    formats (`.R`, `.Rmd`, `.Rmarkdown`, `.Rnw`, and `.qmd`) in the (package) 
    directory (\@IndrajeetPatil, #965).
-- `style_pkg()` now excludes the auto-generated `R/cpp11.R` file (#977).
+-  `style_pkg()` now excludes the auto-generated `R/cpp11.R` file (#977).
+-   Minimum needed R version is now bumped to `3.5` (\@IndrajeetPatil, #986).
 
 **Features**
 
@@ -49,6 +50,10 @@ editor_options:
 
 **Other**
 
+-   \@IndrajeetPatil is now a contributor to {styler}. Welcome and thanks for
+    everything you did so far! (#988).
+-   Non-exported and unused functions `odd()` and `even()` were removed 
+    (\@IndrajeetPatil, #989).
 -   Old (and outdated) vignettes have been removed (\@IndrajeetPatil, #955). To
     access them, do `git checkout v1.0.0`.
 -   Upgrade testing infra to testthat 3e (\@IndrajeetPatil, #949).
@@ -628,7 +633,7 @@ Thanks to all contributors involved, in particular
 ## Adaption
 
 -   styler is now available through the pre-commit hook `style-files` in
-    <https://github.com/lorenzwalthert/pre-commit-hooks>.
+    <https://github.com/lorenzwalthert/precommit>.
 
 Thanks to all contributors involved, in particular
 

R/expr-is.R

@@ -103,7 +103,7 @@ is_subset_expr <- function(pd) {
 #' Identify comments that are shebangs
 #'
 #' Shebangs should be preserved and no space should be inserted between
-#' \# and !. A comment is a shebang if it is the first top level token
+#' `#` and `!`. A comment is a shebang if it is the first top level token
 #' (identified with `pos_id`) and if it starts with `#!`.
 #' @param pd A parse table.
 #' @examples

R/nest.R

@@ -250,13 +250,15 @@ add_terminal_token_after <- function(pd_flat) {
     filter(terminal) %>%
     arrange_pos_id()
 
-  new_tibble(list(
-    pos_id = terminals$pos_id,
-    token_after = lead(terminals$token, default = "")
-  ),
-  nrow = nrow(terminals)
-  ) %>%
-    left_join(pd_flat, ., by = "pos_id")
+  rhs <- new_tibble(
+    list(
+      pos_id = terminals$pos_id,
+      token_after = lead(terminals$token, default = "")
+    ),
+    nrow = nrow(terminals)
+  )
+
+  left_join(pd_flat, rhs, by = "pos_id")
 }
 
 #' @rdname add_token_terminal
@@ -266,14 +268,15 @@ add_terminal_token_before <- function(pd_flat) {
     filter(terminal) %>%
     arrange_pos_id()
 
-  new_tibble(
+  rhs <- new_tibble(
     list(
       id = terminals$id,
       token_before = lag(terminals$token, default = "")
     ),
     nrow = nrow(terminals)
-  ) %>%
-    left_join(pd_flat, ., by = "id")
+  )
+
+  left_join(pd_flat, rhs, by = "id")
 }
 
 
@@ -351,13 +354,19 @@ nest_parse_data <- function(pd_flat) {
   internal$child <- NULL
 
   child$parent_ <- child$parent
-  joined <-
-    child %>%
-    nest_(., "child", setdiff(names(.), "parent_")) %>%
-    left_join(internal, ., by = c("id" = "parent_"))
-  nested <- joined
-  nested$child <- map2(nested$child, nested$internal_child, combine_children)
-  nested <- nested[, setdiff(names(nested), "internal_child")]
+
+  rhs <- nest_(child, "child", setdiff(names(child), "parent_"))
+
+  nested <- left_join(internal, rhs, by = c("id" = "parent_"))
+
+  children <- nested$child
+  for (i in seq_along(children)) {
+    new <- combine_children(children[[i]], nested$internal_child[[i]])
+    # Work around is.null(new)
+    children[i] <- list(new)
+  }
+  nested$child <- children
+  nested$internal_child <- NULL
   nest_parse_data(nested)
 }
 

R/roxygen-examples-parse.R

@@ -146,9 +146,8 @@ emulate_rd <- function(roxygen) {
     text <- roxygen2::roc_proc_text(
       roxygen2::rd_roclet(),
       paste(roxygen, collapse = "\n")
-    )[[1]]$get_section("examples") %>%
-      as.character() %>%
-      .[-1]
+    )[[1]]$get_section("examples")
+    text <- as.character(text)[-1]
     text <- c(
       if (grepl("^#'(\\s|\t)*@examples(\\s|\t)*$", roxygen[2])) "",
       text

R/transform-files.R

@@ -244,15 +244,20 @@ parse_transform_serialize_r <- function(text,
     transformers
   )
 
-  text_out <- pd_nested %>%
-    split(pd_nested$block) %>%
-    unname() %>%
-    map2(find_blank_lines_to_next_block(pd_nested),
-      parse_transform_serialize_r_block,
+  pd_split <- unname(split(pd_nested, pd_nested$block))
+  pd_blank <- find_blank_lines_to_next_block(pd_nested)
+
+  text_out <- vector("list", length(pd_split))
+  for (i in seq_along(pd_split)) {
+    text_out[[i]] <- parse_transform_serialize_r_block(
+      pd_split[[i]],
+      pd_blank[[i]],
       transformers = transformers,
       base_indention = base_indention
-    ) %>%
-    unlist()
+    )
+  }
+
+  text_out <- unlist(text_out)
 
   verify_roundtrip(
     text, text_out,

R/utils.R

@@ -48,24 +48,13 @@ two_cols_match <- function(col1, col2, data) {
   all(unlist(data[col1]) == unlist(data[col2]))
 }
 
-odd <- function(x) {
-  x[odd_index(x)]
-}
-
 odd_index <- function(x) {
   if (length(x) < 1) {
     return(NULL)
   }
   seq(1L, length(x), by = 2)
 }
 
-even <- function(x) {
-  if (length(x) < 2) {
-    return(NULL)
-  }
-  x[even_index(x)]
-}
-
 even_index <- function(x) {
   seq(2L, length(x), by = 2)
 }

cran-comments.md

@@ -10,7 +10,7 @@ Luke Tierney.
 
 ## Test environments
 
--   ubuntu 18.04 (on GitHub Actions): R devel, R 4.1.2, R 4.0.5, R 3.6, R 3.5,
+-   ubuntu 20.04 (on GitHub Actions): R devel, R 4.1.2, R 4.0.5, R 3.6, R 3.5,
     R 3.4
 -   Windows Server 10 (on GitHub Actions): R 3.6, R 4.0.5
 -   win-builder: R devel