diff --git a/R/transform-files.R b/R/transform-files.R index b8cf90f0c..431235a2f 100644 --- a/R/transform-files.R +++ b/R/transform-files.R @@ -99,6 +99,10 @@ make_transformer <- function(transformers, base_indention = base_indention ) ) + + if (!is.null(attr(use_cache, "text"))) { + text <- attr(use_cache, "text") + } } else { use_cache <- FALSE } @@ -117,10 +121,9 @@ make_transformer <- function(transformers, ~. ) if (should_use_cache) { - cache_write( - transformed_code, transformers, - cache_more_specs(include_roxygen_examples, base_indention) - ) + specs <- cache_more_specs(include_roxygen_examples, base_indention) + cache_write(transformed_code, transformers, specs) + cache_write(text, transformers, specs, transformed_code) } transformed_code } else { diff --git a/R/utils-cache.R b/R/utils-cache.R index 1c8845a54..8ffb55ff2 100644 --- a/R/utils-cache.R +++ b/R/utils-cache.R @@ -25,11 +25,21 @@ is_cached <- function(text, transformers, more_specs, cache_dir = cache_dir_default()) { - R.cache::generateCache( + cache_path <- R.cache::generateCache( key = cache_make_key(text, transformers, more_specs), dirs = cache_dir - ) %>% - file.exists() + ) + + if (!file.exists(cache_path)) { + return(FALSE) + } + + text <- readLines(cache_path) + if (length(text) > 0) { + structure(TRUE, text = text) + } else { + TRUE + } } @@ -164,12 +174,17 @@ cache_by_expression <- function(text, #' #' @inheritParams cache_make_key #' @keywords internal -cache_write <- function(text, transformers, more_specs) { - R.cache::generateCache( +cache_write <- function(text, transformers, more_specs, text_out = NULL) { + cache_path <- R.cache::generateCache( key = cache_make_key(text, transformers, more_specs), dirs = cache_dir_default() - ) %>% - file.create() + ) + + if (is.null(text_out)) { + file.create(cache_path) + } else { + writeLines(text_out, cache_path) + } } styler_version <- unlist(unname(read.dcf("DESCRIPTION")[, "Version"])) diff --git a/_pkgdown.yml b/_pkgdown.yml index 8845bb940..2cf84d5f5 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -44,7 +44,7 @@ template: authors: Kirill Müller: - href: http://krlmlr.info + href: https://krlmlr.info Lorenz Walthert: href: http://lorenzwalthert.netlify.com