Merge branch 'main' into standalone

r-lib · Sep 24, 2023 · 30e8f15 · 30e8f15
2 parents a2b8ad4 + 957d64f
commit 30e8f15
Show file tree

Hide file tree

Showing 58 changed files with 73 additions and 118 deletions.
diff --git a/.github/workflows/check-all-examples.yaml b/.github/workflows/check-all-examples.yaml
@@ -22,7 +22,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/check-full.yaml b/.github/workflows/check-full.yaml
@@ -38,7 +38,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -56,6 +56,7 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
-          error-on: 'ifelse(getRversion() > 3.6, "warning", "note")'
+          error-on: 'ifelse(getRversion() > "3.6", "warning", "note")'
         env:
           _R_CHECK_FORCE_SUGGESTS_: false
+          _R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_: true
diff --git a/.github/workflows/check-link-rot.yaml b/.github/workflows/check-link-rot.yaml
@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -20,7 +20,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -39,7 +39,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.4.2
+        uses: JamesIves/github-pages-deploy-action@v4.4.3
         with:
           clean: false
           branch: gh-pages

diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -21,7 +21,7 @@ jobs:
         uses: styfle/cancel-workflow-action@0.11.0
         with:
           access_token: ${{ github.token }}
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Install system dependencies

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/touchstone-receive.yaml b/.github/workflows/touchstone-receive.yaml
@@ -24,7 +24,7 @@ jobs:
       config: ${{ steps.read_touchstone_config.outputs.config }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: f3498c421d68a1db26de1a1fe3ecc91dd6f03b5e
+    rev: v0.3.2.9019
     hooks:
       - id: style-files
         args:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: styler
 Title: Non-Invasive Pretty Printing of R Code
-Version: 1.10.1
+Version: 1.10.2
 Authors@R: 
     c(person(given = "Kirill",
              family = "Müller",

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,23 @@
+<!-- NEWS.md is maintained by https://cynkra.github.io/fledge, do not edit -->
+
+# styler 1.10.2
+
+This release was requested by the CRAN team to fix CRAN warning on invalid 
+numeric version inputs (#1143).
+
+**Minor changes**
+
+* Use cli messaging for cache (#1127).
+* Use latest (and stable!) pre-commit (#1144).
+* Fix CRAN warning on invalid numeric version inputs (#1143).
+* Bump JamesIves/github-pages-deploy-action from 4.4.2 to 4.4.3 (#1139).
+* fix pre-commit (#1132).
+* Don't require dplyr anywhere (#1131).
+
+We thank everyone who helped making this release possible.
+
+[&#x0040;krlmlr](https://github.com/krlmlr), [&#x0040;lorenzwalthert](https://github.com/lorenzwalthert), [&#x0040;MichaelChirico](https://github.com/MichaelChirico), [&#x0040;olivroy](https://github.com/olivroy), [&#x0040;rkrug](https://github.com/rkrug), and [&#x0040;rossdrucker](https://github.com/rossdrucker).
+
 # styler 1.10.1
 
 This release was requested by CRAN due to accidentally populating a user cache while building vignettes for R >= 4.3.0.

diff --git a/R/nest.R b/R/nest.R
@@ -343,7 +343,7 @@ nest_parse_data <- function(pd_flat) {
 
     rhs <- nest_(child, "child", setdiff(names(child), "parent_"))
 
-    nested <- left_join(internal, rhs, by = c("id" = "parent_"))
+    nested <- left_join(internal, rhs, by = c(id = "parent_"))
 
     children <- nested$child
     for (i in seq_along(children)) {

diff --git a/R/parse.R b/R/parse.R
@@ -182,7 +182,6 @@ ensure_correct_txt <- function(pd, text) {
 #' changes from "all strings" to "all problematic strings", is partly
 #' misleading and this approach was chosen for performance reasons only.
 #' @param pd A parse table.
-#' @param text The initial code to style.
 #' @keywords internal
 is_insufficiently_parsed_string <- function(pd) {
   grepl("^\\[", pd$text) & pd$token == "STR_CONST"

diff --git a/R/rules-indention.R b/R/rules-indention.R
@@ -20,7 +20,7 @@ indent_braces <- function(pd, indent_by) {
 #' @keywords internal
 unindent_fun_dec <- function(pd, indent_by = 2L) {
   if (is_function_declaration(pd)) {
-    idx_closing_brace <- which(pd$token %in% "')'")
+    idx_closing_brace <- which(pd$token == "')'")
     fun_dec_head <- seq2(2L, idx_closing_brace)
     if (is_double_indent_function_declaration(pd, indent_by = indent_by)) {
       pd$indent[fun_dec_head] <- 2L * indent_by

diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -153,7 +153,6 @@ style_line_break_around_curly <- function(strict, pd) {
     closing_before <- pd$token == "'}'"
     opening_before <- (pd$token == "'{'")
     to_break <- lag(opening_before, default = FALSE) | closing_before
-    len_to_break <- sum(to_break)
     pd$lag_newlines[to_break] <- ifelse(
       pd$token[to_break] == "COMMENT",
       pmin(1L, pd$lag_newlines[to_break]),
@@ -268,21 +267,20 @@ set_line_break_after_assignment <- function(pd) {
 
 #' Set line break for multi-line function calls
 #' @param pd A parse table.
-#' @param except_token_after A character vector with tokens after "'('" that do
-#'   not cause a line break after "'('".
-#' @param except_text_before A character vector with text before "'('" that do
-#'   not cause a line break after "'('".
-#' @param except_token_before A character vector with text before "')'" that do
-#'   not cause a line break before "')'".
-#' @param force_text_before A character vector with text before "'('" that
-#'   forces a line break after every argument in the call.
+#' @param except_token_before A character vector with tokens that do
+#'   not cause a line break after them.
 #' @name set_line_break_if_call_is_multi_line
 #'
 #' @keywords internal
 NULL
 
 #' Sets line break after opening parenthesis
-#'
+#' @param pd The parse table.
+#' @param except_token_after The tokens after the token that cause an exception.
+#' @param except_text_before A character vector with text before a token that
+#'   does not cause a line break.
+#' @param force_text_before A character vector with text before "'('" that
+#'   forces a line break after every argument in the call.
 #' @details
 #' In general, every call that is multi-line has a line break after the opening
 #' parenthesis. Exceptions:
@@ -341,7 +339,7 @@ set_line_break_after_opening_if_call_is_multi_line <- function(pd,
 #' position of the first named argument and breaks returns the index of it.
 #' If there is no named argument, the line is broken right after the opening
 #' parenthesis.
-#' @inheritParams set_line_break_if_call_is_multi_line
+#' @param pd A parse table.
 #' @keywords internal
 find_line_break_position_in_multiline_call <- function(pd) {
   candidate <- (which(pd$token == "EQ_SUB") - 1L)[1L]
@@ -377,7 +375,8 @@ set_line_break_before_closing_call <- function(pd, except_token_before) {
 }
 
 
-#' @rdname set_line_break_if_call_is_multi_line
+#' @describeIn set_line_break_if_call_is_multi_line Remove line breaks in
+#'   function calls.
 #' @keywords internal
 remove_line_break_in_fun_call <- function(pd, strict) {
   if (is_function_call(pd)) {

diff --git a/R/set-assert-args.R b/R/set-assert-args.R
@@ -21,7 +21,7 @@ set_arg_write_tree <- function(write_tree) {
 #' @inheritParams make_transformer
 #' @keywords internal
 assert_transformers <- function(transformers) {
-  version_cutoff <- 2.0
+  version_cutoff <- "2.0"
   no_name <- is.null(transformers$style_guide_name)
   no_version <- is.null(transformers$style_guide_version)
   if (no_name || no_version) {

diff --git a/R/testing.R b/R/testing.R
@@ -327,7 +327,7 @@ local_test_setup <- function(cache = FALSE,
                              .local_envir = parent.frame()) {
   current_cache <- cache_info(format = "tabular")
   withr::local_options(
-    list("styler.quiet" = TRUE, "R.cache.rootPath" = tempfile()),
+    list(styler.quiet = TRUE, R.cache.rootPath = tempfile()),
     .local_envir = .local_envir
   )
   if (cache) {

diff --git a/R/transform-files.R b/R/transform-files.R
@@ -116,9 +116,12 @@ make_transformer <- function(transformers,
       use_cache <- FALSE
     }
 
-    if (!use_cache) {
+    if (use_cache) {
+      text
+    } else {
       transformed_code <- text %>%
-        parse_transform_serialize_r(transformers,
+        parse_transform_serialize_r(
+          transformers,
           base_indention = base_indention,
           warn_empty = warn_empty
         )
@@ -139,8 +142,6 @@ make_transformer <- function(transformers,
       }
 
       transformed_code
-    } else {
-      text
     }
   }
 }

diff --git a/R/ui-caching.R b/R/ui-caching.R
@@ -138,7 +138,7 @@ cache_info <- function(cache_name = NULL, format = "both") {
 #' @export
 cache_activate <- function(cache_name = NULL,
                            verbose = !getOption("styler.quiet", FALSE)) {
-  options("styler.cache_name" = cache_name %||% styler_version)
+  options(styler.cache_name = cache_name %||% styler_version)
   path <- cache_find_path(cache_name)
 
   if (verbose) {
@@ -155,7 +155,7 @@ cache_activate <- function(cache_name = NULL,
 #' @rdname cache_activate
 #' @export
 cache_deactivate <- function(verbose = !getOption("styler.quiet", FALSE)) {
-  options("styler.cache_name" = NULL)
+  options(styler.cache_name = NULL)
 
   if (verbose) {
     cat("Deactivated cache.\n")

diff --git a/cran-comments.md b/cran-comments.md
@@ -4,8 +4,8 @@ editor_options:
     wrap: 79
 ---
 
-This is a release requested by the CRAN team to delete the population of the 
-user's cache while building vignettes.
+This is a release requested by the CRAN team to comply with 
+`R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS`.
 
 
 ## Test environments

diff --git a/man/is_insufficiently_parsed_string.Rd b/man/is_insufficiently_parsed_string.Rd
diff --git a/man/set_line_break_after_opening_if_call_is_multi_line.Rd b/man/set_line_break_after_opening_if_call_is_multi_line.Rd
diff --git a/man/set_line_break_if_call_is_multi_line.Rd b/man/set_line_break_if_call_is_multi_line.Rd
diff --git a/tests/testthat/test-create_token.R b/tests/testthat/test-create_token.R
@@ -1,5 +1,3 @@
-
-
 test_that("can create a token that has relevant columns", {
   pd_names <- c(
     "token", "text", "short", "lag_newlines", "newlines", "pos_id",

diff --git a/tests/testthat/test-create_tree.R b/tests/testthat/test-create_tree.R
@@ -1,5 +1,3 @@
-
-
 test_that("create_trees outputs identical structure if trees have same structure", {
   skip_if_not_installed("DiagrammeR")
   skip_if_not_installed("data.tree")

diff --git a/tests/testthat/test-curly-curly.R b/tests/testthat/test-curly-curly.R
@@ -1,5 +1,3 @@
-
-
 test_that("curly-culry", {
   expect_warning(test_collection("curly-curly",
     "mixed",

diff --git a/tests/testthat/test-exception_handling.R b/tests/testthat/test-exception_handling.R
@@ -1,5 +1,3 @@
-
-
 test_that("style_text returns custom error", {
   expect_error(style_text("a <- 3 4"), "unexpected numeric constant")
 })

diff --git a/tests/testthat/test-helpers.R b/tests/testthat/test-helpers.R
@@ -1,5 +1,3 @@
-
-
 test_that("can construct and print vertical", {
   skip_if_not_installed("prettycode")
   expect_snapshot({

diff --git a/tests/testthat/test-identify-roxygen-examples.R b/tests/testthat/test-identify-roxygen-examples.R
@@ -1,5 +1,3 @@
-
-
 #' Things to consider:
 #' * one function declaration or many
 #' * example(s) is last tag or not?

diff --git a/tests/testthat/test-indention_curly.R b/tests/testthat/test-indention_curly.R
@@ -1,5 +1,3 @@
-
-
 test_that("indention on one-liner curley only is not changed", {
   expect_warning(test_collection("indention_curly_brackets",
     "one_line_curly",

diff --git a/tests/testthat/test-indention_fun_calls.R b/tests/testthat/test-indention_fun_calls.R
@@ -1,5 +1,3 @@
-
-
 test_that("edge cases work", {
   expect_warning(test_collection("indention_fun_calls",
     transformer = style_text, strict = FALSE

diff --git a/tests/testthat/test-indention_multiple.R b/tests/testthat/test-indention_multiple.R
@@ -1,5 +1,3 @@
-
-
 test_that("multiple round brackets don't cause extraindention", {
   expect_warning(test_collection("indention_multiple",
     "round_only",

diff --git a/tests/testthat/test-indention_operators.R b/tests/testthat/test-indention_operators.R
@@ -1,5 +1,3 @@
-
-
 test_that("pipe is indended correctly", {
   expect_warning(test_collection("indention_operators",
     "pipe",

diff --git a/tests/testthat/test-indention_round_brackets.R b/tests/testthat/test-indention_round_brackets.R
@@ -1,5 +1,3 @@
-
-
 test_that("one-line function call yields correct indention", {
   expect_warning(test_collection("indention_round_brackets",
     "one_line",