Skip to content

Commit d5fb483

Browse files
fix pre-commit issues
1 parent 609e461 commit d5fb483

File tree

5 files changed

+19
-6
lines changed

5 files changed

+19
-6
lines changed

.pre-commit-config.yaml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repos:
1010
args: [--style_pkg=styler, --style_fun=tidyverse_style]
1111
exclude: >
1212
(?x)^(
13-
tests/testthat/.*/.*\.R|
13+
tests/testthat/.*/.*\.R(md)?|
1414
vignettes/customizing_styler\.Rmd
1515
)$
1616
- id: roxygenize
@@ -46,13 +46,22 @@ repos:
4646
exclude: >
4747
(?x)^(
4848
tests/testthat/public-api/xyzaddin/addin_region-.*|
49-
tests/testmanual/addins/r-invalid\.R
49+
tests/testmanual/addins/r-invalid\.R|
50+
tests/testthat/escaping/basic-escape-out\.R
5051
)$
5152
- id: no-browser-statement
53+
exclude: >
54+
(?x)^(
55+
tests/testthat/public-api/xyzaddin/addin_region-.*|
56+
tests/testmanual/addins/r-invalid\.R|
57+
tests/testthat/escaping/basic-escape-out\.R
58+
)$
5259
- id: deps-in-desc
5360
exclude: >
5461
(?x)^(
5562
touchstone/.*|
63+
tests/testmanual/addins/r-invalid\.R|
64+
tests/testthat/escaping/basic-escape-out\.R|
5665
tests/testthat/.*\.R(md)?
5766
)$
5867
- repo: https://github.com/pre-commit/pre-commit-hooks

NEWS.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# styler 1.6.1.9000 (Development version)
2+
3+
* Use pre-commit.ci and improve code quality (#841).
4+
5+
16
# styler 1.6.1
27

38
* Files with `.Rmarkdown` extension are now recognized as an R markdown files in

R/nest.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ drop_cached_children <- function(pd) {
135135
#' @details
136136
#' Note that top-level comments **above** code have negative parents
137137
#' (the negative value of the parent of the code expression that follows after,
138-
#' a nother comment might be in the way though), all comments that are not top
138+
#' another comment might be in the way though), all comments that are not top
139139
#' level have positive ids. All comments for which no code follows afterwards
140140
#' have parent 0.
141141
#' @examples

R/utils-cache.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ cache_dir_default <- function() {
201201

202202
#' Create more specs
203203
#'
204-
#' Syntactic suggar for creating more specs. This is useful when we want to add
204+
#' Syntactic sugar for creating more specs. This is useful when we want to add
205205
#' more arguments (because we can search for this function in the source code).
206206
#' @keywords internal
207207
cache_more_specs <- function(include_roxygen_examples, base_indention) {

tests/testmanual/tests

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Addins
44

55
* set style:
6-
- test setting a valid stlye
6+
- test setting a valid style
77
- test setting an invalid style
88
* style active file:
99
- saved .R file (valid and invalid code)
@@ -23,4 +23,3 @@
2323
- unsaved .Rnw file
2424
- saved non-R file
2525
- unsaved R file
26-

0 commit comments

Comments
 (0)