Merge branch 'main' into fix-cran-warning

lorenzwalthert · web-flow · commit 922573ccc299 · 2023-08-22T15:17:43.000+02:00
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/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/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/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/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",
diff --git a/tests/testthat/test-insertion_comment_interaction.R b/tests/testthat/test-insertion_comment_interaction.R
@@ -1,5 +1,3 @@
-
-
 ##  ............................................................................
 ##  strict = TRUE                                                           ####
 
diff --git a/tests/testthat/test-line_breaks_and_other.R b/tests/testthat/test-line_breaks_and_other.R
@@ -1,5 +1,3 @@
-
-
 test_that("line breaks involing curly brackets", {
   expect_warning(test_collection("line_breaks_and_other", "curly",
     transformer = style_text
diff --git a/tests/testthat/test-line_breaks_fun_call.R b/tests/testthat/test-line_breaks_fun_call.R
@@ -1,4 +1,3 @@
-
 test_that("line breaks work in general", {
   expect_warning(test_collection("line_breaks_fun_call",
     "token_dependent_mixed",
diff --git a/tests/testthat/test-math_token_spacing.R b/tests/testthat/test-math_token_spacing.R
@@ -1,5 +1,3 @@
-
-
 test_that("invalid tokens return error", {
   expect_error(test_collection(
     "math_token_spacing", "non_strict_math_spacing_all",
diff --git a/tests/testthat/test-parsing.R b/tests/testthat/test-parsing.R
@@ -1,5 +1,3 @@
-
-
 test_that("repreated parsing solves wrong parent assignment", {
   expect_warning(
     test_collection(
diff --git a/tests/testthat/test-relocate_eq_assign.R b/tests/testthat/test-relocate_eq_assign.R
@@ -1,4 +1,3 @@
-
 # Tests code in R/relevel.R
 test_that("tree hierarchy is the same no matter whether = or <- is used", {
   skip_if_not_installed("DiagrammeR")
diff --git a/tests/testthat/test-rmd.R b/tests/testthat/test-rmd.R
@@ -1,5 +1,3 @@
-
-
 test_that("can style .Rmd files", {
   expect_warning(test_collection("rmd", "simple",
     transformer = transform_mixed,
diff --git a/tests/testthat/test-rnw.R b/tests/testthat/test-rnw.R
@@ -1,5 +1,3 @@
-
-
 test_that("can style .Rnw files", {
   expect_warning(test_collection(
     "rnw", "008-outdec",
diff --git a/tests/testthat/test-roundtrip.R b/tests/testthat/test-roundtrip.R
@@ -1,6 +1,3 @@
-
-
-
 test_that("parse_tree_must_be_identical works", {
   expect_true(
     parse_tree_must_be_identical(tidyverse_style(scope = "line_breaks"))
diff --git a/tests/testthat/test-roxygen-examples-parse.R b/tests/testthat/test-roxygen-examples-parse.R
@@ -1,5 +1,3 @@
-
-
 test_that("simple examples can be parsed", {
   expected_out <- c("\n", "x <- 1\n")
   expect_equal(parse_roxygen(c("#' @examples", "#' x <- 1"))$text, expected_out)
diff --git a/tests/testthat/test-scope-AsIs.R b/tests/testthat/test-scope-AsIs.R
@@ -1,5 +1,3 @@
-
-
 test_that("no indention manipulation but spaces manipulation", {
   expect_warning(test_collection(
     "scope-AsIs", "scope_spaces-",
diff --git a/tests/testthat/test-scope-character.R b/tests/testthat/test-scope-character.R
@@ -1,5 +1,3 @@
-
-
 test_that("no indention manipulation but spaces manipulation", {
   expect_warning(test_collection(
     "scope-character", "scope_spaces",
diff --git a/tests/testthat/test-serialize_tests.R b/tests/testthat/test-serialize_tests.R
@@ -1,5 +1,3 @@
-
-
 test_that("No files to compare returns error", {
   expect_error(test_collection("serialize_tests", "xyz",
     transformer = as_is
diff --git a/tests/testthat/test-spacing.R b/tests/testthat/test-spacing.R
@@ -1,5 +1,3 @@
-
-
 test_that("curly braces", {
   expect_warning(test_collection(
     "spacing", "round",
diff --git a/tests/testthat/test-square_brackets.R b/tests/testthat/test-square_brackets.R
@@ -1,5 +1,3 @@
-
-
 test_that("square brackets cause indention", {
   expect_warning(test_collection(
     "indention_square_brackets",
diff --git a/tests/testthat/test-start_line.R b/tests/testthat/test-start_line.R
@@ -1,5 +1,3 @@
-
-
 test_that("leading spaces are preserved at start of text", {
   expect_warning(test_collection("start_line",
     transformer = style_empty
diff --git a/tests/testthat/test-strict.R b/tests/testthat/test-strict.R
@@ -1,5 +1,3 @@
-
-
 test_that("can style example source file with strict = TRUE", {
   expect_warning(test_collection(
     "strict", "strict",
diff --git a/tests/testthat/test-tidyeval.R b/tests/testthat/test-tidyeval.R
@@ -1,5 +1,3 @@
-
-
 test_that("no spaces within bang-bang operator !!!", {
   expect_warning(test_collection("tidyeval", "bang_bang",
     transformer = style_text
diff --git a/tests/testthat/test-token_adding_removing.R b/tests/testthat/test-token_adding_removing.R
@@ -1,5 +1,3 @@
-
-
 test_that("other manipulations are correct (add braces, semi-colon etc.)", {
   expect_warning(test_collection("token_adding_removing", "mixed_token",
     transformer = style_text
diff --git a/tests/testthat/test-unary.R b/tests/testthat/test-unary.R
@@ -1,5 +1,3 @@
-
-
 test_that("no spaces before unary operator", {
   expect_warning(test_collection("unary_spacing",
     "unary_simple",
diff --git a/tests/testthat/test-unindention.R b/tests/testthat/test-unindention.R
@@ -1,5 +1,3 @@
-
-
 test_that("round brackets are unindented correctly", {
   expect_warning(test_collection("unindention",
     "mixed",
diff --git a/tests/testthat/test-unindention_regex.R b/tests/testthat/test-unindention_regex.R
@@ -1,4 +1,3 @@
-
 test_that("forced regex token-dependent indention", {
   expect_warning(test_collection(
     "unindention_regex", "regex_force_with",
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
@@ -1,5 +1,3 @@
-
-
 test_that("non-comment-helpers", {
   pd <- compute_parse_data_nested("a <- # hi \n x %>% b()")
   child <- pd$child[[1]]
diff --git a/tests/testthat/test-varia.R b/tests/testthat/test-varia.R
@@ -1,5 +1,3 @@
-
-
 test_that("ensure_last_n_empty", {
   expect_equal(
     ensure_last_n_empty("x"),

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ local_test_setup <- function(cache = FALSE,`
`327`	`327`	`.local_envir = parent.frame()) {`
`328`	`328`	`current_cache <- cache_info(format = "tabular")`
`329`	`329`	`withr::local_options(`
`330`		`- list("styler.quiet" = TRUE, "R.cache.rootPath" = tempfile()),`
	`330`	`+ list(styler.quiet = TRUE, R.cache.rootPath = tempfile()),`
`331`	`331`	`.local_envir = .local_envir`
`332`	`332`	`)`
`333`	`333`	`if (cache) {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`test_that("can create a token that has relevant columns", {`
`4`	`2`	`pd_names <- c(`
`5`	`3`	`"token", "text", "short", "lag_newlines", "newlines", "pos_id",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`test_that("create_trees outputs identical structure if trees have same structure", {`
`4`	`2`	`skip_if_not_installed("DiagrammeR")`
`5`	`3`	`skip_if_not_installed("data.tree")`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`test_that("curly-culry", {`
`4`	`2`	`expect_warning(test_collection("curly-curly",`
`5`	`3`	`"mixed",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`test_that("style_text returns custom error", {`
`4`	`2`	`expect_error(style_text("a <- 3 4"), "unexpected numeric constant")`
`5`	`3`	`})`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`test_that("can construct and print vertical", {`
`4`	`2`	`skip_if_not_installed("prettycode")`
`5`	`3`	`expect_snapshot({`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`#' Things to consider:`
`4`	`2`	`#' * one function declaration or many`
`5`	`3`	`#' * example(s) is last tag or not?`