Merge pull request #711 from lorenzwalthert/subset-transformers

- Remove unused transformers before processing (#711).

Author: lorenzwalthert

.Rbuildignore

@@ -5,10 +5,8 @@
 ^API$
 ^README\.Rmd$
 ^README-.*\.png$
-^.travis.yml
 ^appveyor\.yml$
 ^tic\.R$
-^\.travis\.yml$
 ^docs$
 ^_pkgdown\.yml$
 CONTRIBUTING.md
@@ -20,5 +18,5 @@ revdep
 ^\.pre-commit-config\.yaml$
 ^brew\-log$
 ^\.github/$
-^touchstone/$
-^.github/$
+^touchstone$
+^\.github$

API

@@ -6,10 +6,11 @@ cache_activate(cache_name = NULL, verbose = TRUE)
 cache_clear(cache_name = NULL, ask = TRUE)
 cache_deactivate(verbose = TRUE)
 cache_info(cache_name = NULL, format = "both")
-create_style_guide(initialize = default_style_guide_attributes, line_break = NULL, space = NULL, token = NULL, indention = NULL, use_raw_indention = FALSE, reindention = tidyverse_reindention(), style_guide_name = NULL, style_guide_version = NULL, more_specs_style_guide = NULL)
+create_style_guide(initialize = default_style_guide_attributes, line_break = NULL, space = NULL, token = NULL, indention = NULL, use_raw_indention = FALSE, reindention = tidyverse_reindention(), style_guide_name = NULL, style_guide_version = NULL, more_specs_style_guide = NULL, transformers_drop = specify_transformers_drop())
 default_style_guide_attributes(pd_flat)
 specify_math_token_spacing(zero = "'^'", one = c("'+'", "'-'", "'*'", "'/'"))
 specify_reindention(regex_pattern = NULL, indention = 0, comments_only = TRUE)
+specify_transformers_drop(spaces = NULL, indention = NULL, line_breaks = NULL, tokens = NULL)
 style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile"), recursive = TRUE, exclude_files = NULL, exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0, dry = "off")
 style_file(path, ..., style = tidyverse_style, transformers = style(...), include_roxygen_examples = TRUE, base_indention = 0, dry = "off")
 style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile"), exclude_files = "R/RcppExports.R", exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0, dry = "off")

NAMESPACE

@@ -9,6 +9,7 @@ export(create_style_guide)
 export(default_style_guide_attributes)
 export(specify_math_token_spacing)
 export(specify_reindention)
+export(specify_transformers_drop)
 export(style_dir)
 export(style_file)
 export(style_pkg)

NEWS.md

@@ -21,6 +21,11 @@
   style tokens, you had to always also style spaces, indention, line breaks as 
   well (#705, #707).
 
+- New argument `transformers_drop` in `create_style_guide()` to be populated with
+  new helper function `specify_transformers_drop()` for specifying conditions
+  under which transformers are not going to be used and can therefore be 
+  omitted without effecting the result of styling (#711).
+
 ## Major changes
 
 
@@ -31,9 +36,10 @@
   or focus loss, so this feature becomes less relevant. (#631).
 - blank lines in function calls and headers are now removed, for the former only 
   when there are no comments before or after the blank line (#629, #630, #635).
-- speed improvements: (~10%) when cache is activated because transformers are not 
-  captured as character anymore (#679), ~ 3% in low-level optimization (#691). 
-  Require magrittr 2.0 gives about 7% speed improvement (#681).
+- speed improvements: ~10% when cache is activated because transformers are not 
+  captured as character anymore (#679), ~3% in low-level optimization (#691). 
+  7% by requiring magrittr 2.0 (#681), ~8% by dropping unused transformers 
+  (#711) .
 - `#<<` is now recognized as the xaringan marker and no space is added after`#` 
   (#700).
 

R/rules-spaces.R

@@ -185,20 +185,6 @@ set_space_in_curly_curly <- function(pd) {
   pd
 }
 
-add_space_before_brace <- function(pd_flat) {
-  # TODO remove this, it has no effect since { can only appear in the first
-  # position of the nest and taking lead(op_after, default = FALSE) will always
-  # yield a vector of FALSE only.
-  op_after <- pd_flat$token %in% "'{'"
-  if (!any(op_after)) {
-    return(pd_flat)
-  }
-  op_before <- lead(op_after, default = FALSE)
-  idx_before <- op_before & (pd_flat$newlines == 0L) & pd_flat$token != "'('"
-  pd_flat$spaces[idx_before] <- pmax(pd_flat$spaces[idx_before], 1L)
-  pd_flat
-}
-
 add_space_after_comma <- function(pd_flat) {
   comma_after <- (pd_flat$token == "','") & (pd_flat$newlines == 0L)
   pd_flat$spaces[comma_after] <- pmax(pd_flat$spaces[comma_after], 1L)