Skip to content

Commit df0d1e5

Browse files
be consistent: all cache functions start with cache_
1 parent 587fdc6 commit df0d1e5

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

R/transform-files.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ make_transformer <- function(transformers,
7676
include_roxygen_examples,
7777
warn_empty = TRUE) {
7878
force(transformers)
79-
cache_dir <- c("styler", get_cache_name())
79+
cache_dir <- c("styler", cache_get_name())
8080
assert_R.cache_installation()
8181
function(text) {
8282
is_cached <- !is.null(

R/ui.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,8 @@ cache_activate <- function(cache_name = NULL) {
312312
options("styler.use_cache" = TRUE)
313313
if (!is.null(cache_name)) {
314314
options("styler.cache_name" = cache_name)
315+
} else {
316+
options("styler.cache_name" = cache_derive_name())
315317
}
316318
cat("Using cache at ", cache_find_path(cache_name), ".", sep = "")
317319
}

R/utils-cache.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,15 @@ hash_standardize <- function(x) {
1515
#' @keywords internal
1616
cache_find_path <- function(cache_name = NULL) {
1717
if (is.null(cache_name)) {
18-
cache_name <- get_cache_name()
18+
cache_name <- cache_get_name()
1919
}
2020
R.cache::getCachePath(c("styler", cache_name))
2121
}
2222

23-
get_cache_name <- function() {
23+
cache_derive_name <- function() {
24+
utils::packageDescription("styler", fields = "Version")
25+
}
26+
27+
cache_get_name <- function() {
2428
getOption("styler.cache_name")
2529
}

R/zzz.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
op.styler <- list(
55
styler.colored_print.vertical = TRUE,
66
styler.use_cache = TRUE,
7-
styler.cache_name = utils::packageDescription("styler", fields = "Version"),
7+
styler.cache_name = cache_derive_name(),
88
styler.addins_style_transformer = "styler::tidyverse_style()"
99
)
1010
toset <- !(names(op.styler) %in% names(op))

0 commit comments

Comments
 (0)