From 077ca45f2bd32118fdd74d45ebdc338867be2516 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Tue, 14 May 2024 22:24:51 +0200 Subject: [PATCH 1/3] Update spelling wordlist via `spelling::update_wordlist()` --- DESCRIPTION | 1 + inst/WORDLIST | 168 ++++++------------------------- vignettes/customizing_styler.Rmd | 2 +- 3 files changed, 34 insertions(+), 137 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 1015146f4..5c1cd3138 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -53,6 +53,7 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate", warning("Please install r-lib/pkgapi to make sure the file API is kept up to date"); NULL})) RoxygenNote: 7.3.1 +Language: en-US Config/testthat/edition: 3 Config/testthat/parallel: true Collate: diff --git a/inst/WORDLIST b/inst/WORDLIST index 23a970246..0699d470b 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,245 +1,141 @@ +AST Addin +Addins +AppVeyor +CMD +DSLs +EOF +EOL +EOLs +EQ +Freepik +Gayathri +Github +Invasiveness +JamesIves +Jupyterlab +LF +Lifecycle +ORCID +README +RMarkdown +RStudio +Rmarkdown +Rmd +Rnw +Robinlovelace +Roxygen +Shallowify +StackOverflow +Tidyverse +Unindent +Visit'em +YAML addin addins -api -AppVeyor arg -args -AST -aut -backport backports bdr benchmarking -bootswatch -BugReports -bXj cancelling -cff ci cli -CMD -codebase -codecov codegrip coercible coercions -compat config -Config counterpair -coventions -cpp -cre -ctb -cyclocomp -cynkra dec dependabot -desc -devtools dir -dirs -docsearch dont dontrun dontshow donttest dplyr -DSLs emacs -EOF -EOL -EOLs -EQ examplesIf -expr -eZm fansi -Fi filetype -Fjmav flaticon forcond formatter -Freepik gadenbuie -Gayathri -getOption ggplot github -Github -gitsum -gmail grkstyle -GSOC helpfiles -href https -icloud ifelse -Indrajeet infinitively -initializer inode integrations -interaces internal's invasiveness -Invasiveness io ixmypi -JamesIves -JBP -Jupyterlab -kirill -Kirill knitr -krlmlr -labelled learnr -LF lifecycle -linter -linters lintr -lorenz lorenzwalthert -macOS magrittr -mav md -MERCHANTABILITY mlr mlr's -mutli -Müller -navbar -nbv -netlify nocomments -NONINFRINGEMENT -nonportable -nzchar -ocx oneliner -ORCID -ourself -packrat pandoc -params parsable -parsesum -Patil -patilindrajeet patilindrajeets -pdy -PGW pkgapi pkgconfig pkgdown pos pre precommit -prefill prettycode priori -PRs -purrr -qez qmd -Qmd -RcppExports readme -README rebased -reindent reindented reindention -relevel -renv repo reprex -revdepcheck rlang rlang's rmarkdown -Rmarkdown -RMarkdown rmd -Rmd rnw -Rnw roadmap -Robinlovelace -roclet -roclets ropensci -roxgen roxygen -Roxygen -RoxygenNote rplumber rprofile -Rprofile -rprojroot -RStudio -RStudio's -rstudioapi -saamwerk -Sd semicoloner -Shallowify sharding spaceout -StackOverflow -styler stylerignore stylerignored -sublicense -summarises testthat -tg -th tibble tibbles -tidyr tidyverse -todo travis -ubuntu -Uf -ui uncached unexplainable unicode unindent -Unindent unindention unlink unnest utf vctrs vec -Vh -VignetteBuilder -Visit'em -walthert -Walthert -winbuilder withr -WN -www xaringan xfun -Xie -xk -XN yaml -YAML yihui -Yihui -yl -YPa -zm zzz diff --git a/vignettes/customizing_styler.Rmd b/vignettes/customizing_styler.Rmd index 7742b9e18..7c31c9a27 100644 --- a/vignettes/customizing_styler.Rmd +++ b/vignettes/customizing_styler.Rmd @@ -44,7 +44,7 @@ We note that there are different types of transformer functions. `initialize` in tidyverse_style()$space$remove_space_after_opening_paren ``` -As the name says, this function removes spaces after the opening parenthesis. But how? Its input is a *nest*. Since the visitor will go through all levels of nesting, we just need a function that can be applied to a *nest*, that is, to a parse table at one level of nesting. We can compute the nested parse table and look at one of the levels of nesting that is interesting for us (more on the data structure in the vignettes "Data structures" and "Manipulating the parse table"): +As the name says, this function removes spaces after the opening parenthesis. But how? Its input is a *nest*. Since the visitor will go through all levels of nesting, we just need a function that can be applied to a *nest*, that is, to a parse table at one level of nesting. We can compute the nested parse table and look at one of the levels of nesting that is interesting for us: ```{r} string_to_format <- "call( 3)" From 0c4a0b6ef5910447e3b48ee4f11e4ab013c68175 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 14 May 2024 20:29:27 +0000 Subject: [PATCH 2/3] pre-commit --- inst/WORDLIST | 166 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 134 insertions(+), 32 deletions(-) diff --git a/inst/WORDLIST b/inst/WORDLIST index 0699d470b..66f2882fe 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,131 +1,218 @@ -AST Addin -Addins -AppVeyor -CMD -DSLs -EOF -EOL -EOLs -EQ -Freepik -Gayathri -Github -Invasiveness -JamesIves -Jupyterlab -LF -Lifecycle -ORCID -README -RMarkdown -RStudio -Rmarkdown -Rmd -Rnw -Robinlovelace -Roxygen -Shallowify -StackOverflow -Tidyverse -Unindent -Visit'em -YAML addin +Addins addins +api +AppVeyor arg +AST +aut +backport backports bdr benchmarking +bootswatch +BugReports +bXj cancelling +cff ci cli +CMD +codebase codegrip coercible coercions +compat config counterpair +coventions +cpp +cre +ctb +cyclocomp +cynkra dec dependabot +desc +devtools dir +docsearch dont dontrun dontshow donttest dplyr +DSLs emacs +EOF +EOL +EOLs +EQ examplesIf +expr +eZm fansi +Fi filetype +Fjmav flaticon forcond formatter +Freepik gadenbuie +Gayathri +getOption ggplot +Github github +gitsum +gmail grkstyle +GSOC helpfiles +href https +icloud ifelse +Indrajeet infinitively +initializer inode integrations +interaces internal's +Invasiveness invasiveness io ixmypi +JamesIves +JBP +Jupyterlab +kirill +Kirill knitr +krlmlr +labelled learnr +LF +Lifecycle lifecycle +linter +linters lintr +lorenz lorenzwalthert +macOS magrittr +mav md +MERCHANTABILITY mlr mlr's +mutli +Müller +navbar +nbv +netlify nocomments +NONINFRINGEMENT +nonportable +nzchar +ocx oneliner +ORCID +ourself +packrat pandoc +params parsable +parsesum +Patil +patilindrajeet patilindrajeets +pdy +PGW pkgapi pkgconfig pkgdown pos pre precommit +prefill prettycode priori +PRs +purrr +qez qmd +RcppExports +README readme rebased +reindent reindented reindention +relevel +renv repo reprex +revdepcheck rlang rlang's +RMarkdown +Rmarkdown rmarkdown +Rmd rmd +Rnw rnw roadmap +Robinlovelace +roclet +roclets ropensci +roxgen +Roxygen roxygen +RoxygenNote rplumber rprofile +rprojroot +RStudio +RStudio's +rstudioapi +saamwerk +Sd semicoloner +Shallowify sharding spaceout +StackOverflow +styler stylerignore stylerignored +stylers +Stylers +sublicense +summarises testthat +tg +th tibble tibbles +tidyr +Tidyverse tidyverse +todo travis +ubuntu +Uf +ui uncached unexplainable unicode +Unindent unindent unindention unlink @@ -133,9 +220,24 @@ unnest utf vctrs vec +Vh +VignetteBuilder +Visit'em +walthert +Walthert +winbuilder withr +WN +www xaringan xfun +Xie +xk +XN +YAML yaml yihui +yl +YPa +zm zzz From dd0598145f17cf3a76eba38c1ccac8558eb8f1e5 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Tue, 14 May 2024 22:37:25 +0200 Subject: [PATCH 3/3] correct actual spelling mistakes --- CONTRIBUTING.md | 2 +- R/utils-cache.R | 2 +- inst/WORDLIST | 2 -- man/cache_make_key.Rd | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f9759dc00..665875467 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -98,7 +98,7 @@ The source code is organized as follows: | token-create.R | Utilities for creating tokens, mostly to insert braces around mutli-line if statements. | | token-define.R | Defines which tokens belong to which group. | | transform-code.R, transform-files.R | Transformation of code for APIs that manipulate files (e.g. `style_file()`). | -| ui.R | User interaces. Top-level functions for styling. | +| ui.R | User interfaces. Top-level functions for styling. | | unindent.R | Certain tokens cause unindention, e.g. closing braces. | | utils.R | low-level general purpose utilities. | | vertical.R | S3 class for pretty printing of styled code. | diff --git a/R/utils-cache.R b/R/utils-cache.R index ce255587e..fdbc2cbe2 100644 --- a/R/utils-cache.R +++ b/R/utils-cache.R @@ -54,7 +54,7 @@ is_cached <- function(text, #' a new cache. #' * transformers. Cannot easily hash them because two environments won't be #' identical even if they contain the same objects (see 'Experiments'). Simple -#' `as.character(transformers)` will not consider infinitively recursive +#' `as.character(transformers)` will not consider infinitely recursive #' code dependencies. #' To fix this, transformers must have names and version number as described #' in [create_style_guide()]. Now, the only way to fool the cache invalidation diff --git a/inst/WORDLIST b/inst/WORDLIST index 66f2882fe..36b75233f 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -76,11 +76,9 @@ https icloud ifelse Indrajeet -infinitively initializer inode integrations -interaces internal's Invasiveness invasiveness diff --git a/man/cache_make_key.Rd b/man/cache_make_key.Rd index ec1cdb9d8..b7468fcb3 100644 --- a/man/cache_make_key.Rd +++ b/man/cache_make_key.Rd @@ -29,7 +29,7 @@ We need to compare: a new cache. \item transformers. Cannot easily hash them because two environments won't be identical even if they contain the same objects (see 'Experiments'). Simple -\code{as.character(transformers)} will not consider infinitively recursive +\code{as.character(transformers)} will not consider infinitely recursive code dependencies. To fix this, transformers must have names and version number as described in \code{\link[=create_style_guide]{create_style_guide()}}. Now, the only way to fool the cache invalidation