Merge pull request #1197 from r-lib/r-440

Author: IndrajeetPatil

.github/workflows/check-full.yaml

@@ -20,9 +20,8 @@ jobs:
         config:
           - {os: macos-latest,   r: 'release'}
 
+          - {os: windows-latest, r: 'devel'}
           - {os: windows-latest, r: 'release'}
-          # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
           # use 4.1 to check with rtools40's older compiler
           - {os: windows-latest, r: '4.1'}
 
@@ -56,7 +55,7 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
-          error-on: 'ifelse(getRversion() > "3.6", "warning", "note")'
+          error-on: '"note"'
         env:
           _R_CHECK_FORCE_SUGGESTS_: false
           _R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_: true

.lintr

@@ -8,14 +8,12 @@ linters: linters_with_tags(
     line_length_linter(120L),
     namespace_linter = NULL,
     nested_ifelse_linter = NULL,
-    # TODO: remove this once the lint message is fixed
     nzchar_linter = NULL,
     object_name_linter = NULL,
     object_length_linter(70L),
     object_overwrite_linter = NULL,
     object_usage_linter = NULL,
     todo_comment_linter = NULL,
-    extraction_operator_linter = NULL,
     nonportable_path_linter = NULL,
     string_boundary_linter = NULL,
     undesirable_function_linter = NULL,

.pre-commit-config.yaml

@@ -23,6 +23,7 @@ repos:
       - id: lintr
         additional_dependencies:
           - r-lib/lintr
+          - any::cyclocomp
         exclude: >
           (?x)^(
           inst/.*|

DESCRIPTION

@@ -23,7 +23,7 @@ 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.6.0)
+    R (>= 4.0.0)
 Imports: 
     cli (>= 3.1.1),
     magrittr (>= 2.0.0),

R/addins.R

@@ -72,7 +72,7 @@ style_active_file <- function() {
   }
   rstudioapi::modifyRange(
     c(1L, 1L, length(context$contents) + 1L, 1L),
-    paste0(ensure_last_n_empty(out), collapse = "\n"),
+    paste(ensure_last_n_empty(out), collapse = "\n"),
     id = context$id
   )
   if (save_after_styling_is_active() && context$path != "") {
@@ -132,7 +132,7 @@ style_selection <- function() {
   )
   rstudioapi::modifyRange(
     context$selection[[1L]]$range,
-    paste0(c(
+    paste(c(
       out,
       if (context$selection[[1L]]$range$end[2L] == 1L) ""
     ), collapse = "\n"),

R/detect-alignment-utils.R

@@ -161,7 +161,7 @@ alignment_serialize <- function(pd_sub) {
   if (anyNA(out)) {
     return(NA)
   }
-  paste0(out, collapse = "")
+  paste(out, collapse = "")
 }
 
 #' Check if spacing around comma is correct

R/environments.R

@@ -26,8 +26,9 @@
 #' * `parser_version_find()` determines the version of the parser from parse
 #'   data. This does not necessarily mean that the version found is the
 #'   actual version, but it *behaves* like it. For example, code that does not
-#'   contain `EQ_ASSIGN` is parsed the same way with version 1 and 2. If the
-#'   behavior is identical, the version is set to 1.
+#'   contain `EQ_ASSIGN` is parsed the same way with version `1` and `2`. If the
+#'   behavior is identical, the version is set to `1`. Since the package now
+#'   requires R >= 4.0, the version is always set to `3`.
 #' @param version The version of the parser to be used.
 #' @param pd A parse table such as the output from
 #'   `utils::getParseData(parse(text = text))`.
@@ -42,10 +43,7 @@ parser_version_get <- function() {
 }
 
 #' @rdname parser_version_set
-parser_version_find <- function(pd) {
-  if (any(pd$token == "equal_assign")) 2L else 3L
-}
-
+parser_version_find <- function(pd) 3L
 
 #' The elements that are added to this environment are:
 #'

R/parse.R

@@ -87,8 +87,6 @@ tokenize <- function(text) {
 #' @param ... Other arguments passed to [utils::getParseData()].
 #' @keywords internal
 get_parse_data <- function(text, include_text = TRUE, ...) {
-  # avoid https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=16041
-  parse_safely(text, keep.source = TRUE)
   parsed <- parse_safely(text, keep.source = TRUE)
   pd <- utils::getParseData(parsed, includeText = include_text) %>%
     styler_df()

R/roxygen-examples-parse.R

@@ -68,7 +68,7 @@ parse_roxygen <- function(roxygen) {
 roxygen_remove_extra_brace <- function(parsed) {
   parsed <- rlang::try_fetch(
     {
-      parse(text = paste0(gsub("^\\\\[[:alpha:]]*", "", parsed), collapse = ""))
+      parse(text = paste(gsub("^\\\\[[:alpha:]]*", "", parsed), collapse = ""))
       parsed
     },
     error = function(e) {

R/style-guides.R

@@ -226,10 +226,6 @@ tidyverse_style <- function(scope = "tokens",
     tokens = list(
       resolve_semicolon = "';'",
       add_brackets_in_pipe = c("SPECIAL-PIPE", "PIPE"),
-      # before 3.6, these assignments are not wrapped into top-level expression
-      # and `text` supplied to transformers_drop() is "", so it appears to not
-      # contain EQ_ASSIGN, and the transformer is falsely removed.
-      # compute_parse_data_nested / text_to_flat_pd ('a = 4')
       force_assignment_op = "EQ_ASSIGN",
       wrap_if_else_while_for_fun_multi_line_in_curly = c(
         "IF", "WHILE", "FOR", "FUNCTION"