clean up

Author: lorenzwalthert

R/testing.R

@@ -339,8 +339,5 @@ fresh_testthat_cache <- function() {
 }
 
 cache_more_specs_default <- function() {
-  cache_more_specs(
-    include_roxygen_examples = TRUE,
-    base_indention = 0
-  )
+  cache_more_specs(include_roxygen_examples = TRUE, base_indention = 0)
 }

R/transform-files.R

@@ -240,10 +240,7 @@ parse_transform_serialize_r <- function(text,
   }
   text_out <- convert_newlines_to_linebreaks(text_out)
   if (cache_is_activated()) {
-    cache_by_expression(
-      text_out, transformers,
-      more_specs = more_specs
-    )
+    cache_by_expression(text_out, transformers, more_specs = more_specs)
   }
   text_out
 }

R/utils-cache.R

@@ -25,7 +25,6 @@ is_cached <- function(text,
                       transformers,
                       more_specs,
                       cache_dir = cache_dir_default()) {
-
   R.cache::generateCache(
     key = cache_make_key(text, transformers, more_specs),
     dirs = cache_dir
@@ -166,8 +165,6 @@ cache_by_expression <- function(text,
 #' @inheritParams cache_make_key
 #' @keywords internal
 cache_write <- function(text, transformers, more_specs) {
-  # print(c("writing cahce for text: ", substr(paste0(text, collapse = "\n"), 1, 15)))
-  # print(c("more_specs: ", more_specs))
   R.cache::generateCache(
     key = cache_make_key(text, transformers, more_specs),
     dirs = cache_dir_default()

tests/testthat/test-cache-low-level-api.R

@@ -73,10 +73,11 @@ test_that("blank lines are correctly identified", {
   )
   # when not cached, all code in same block
   more_specs <- cache_more_specs_default()
-  pd_nested <- compute_parse_data_nested(text, tidyverse_style(), more_specs = more_specs)
-  cache_by_expression(
-    text, tidyverse_style(), more_specs = more_specs
+  pd_nested <- compute_parse_data_nested(text,
+    transformers = tidyverse_style(),
+    more_specs = more_specs
   )
+  cache_by_expression(text, tidyverse_style(), more_specs = more_specs)
   expect_equal(
     pd_nested$block, rep(1, 4)
   )

tests/testthat/test-interaction-caching-stylerignore.R

@@ -154,7 +154,7 @@ test_that("does not cache stylerignore sequences", {
     is_cached(
       "1+1",
       tidyverse_style(),
-      more_specs = cache_more_specs(include_roxygen_examples = FALSE, base_indention = 0)
+      more_specs = cache_more_specs_default()
     )
   )
 })