styler

poissonconsulting · Oct 5, 2023 · 1537db1 · 1537db1
1 parent 97d5aaf
commit 1537db1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/R/chk-length.R b/R/chk-length.R
@@ -21,7 +21,7 @@ chk_length <- function(x, length = 1L, upper = length, x_name = NULL) {
     return(invisible(x))
   }
   if (is.null(x_name)) x_name <- deparse_backtick_chk(substitute(x))
-  if(length == upper) {
+  if (length == upper) {
     abort_chk(x_name, " must be length ", length, " not ", length(x), x = x, length = length)
   }
   abort_chk(x_name, " must have a length between ", length, " and ", upper, " not ", length(x), x = x, length = length)

diff --git a/R/chk-range.R b/R/chk-range.R
@@ -42,8 +42,9 @@ chk_range <- function(x, range = c(0, 1), inclusive = TRUE, x_name = NULL) {
     abort_chk(x_name, " must have values of ", cc(range[1]), x = x, range = range)
   }
   abort_chk(x_name, " must have values between ", cc(range, " and "),
-            ifelse(isTRUE(inclusive), "", " exclusive"),
-            x = x, range = range)
+    ifelse(isTRUE(inclusive), "", " exclusive"),
+    x = x, range = range
+  )
 }
 
 #' @describeIn chk_range Validate Range
@@ -57,7 +58,7 @@ chk_range <- function(x, range = c(0, 1), inclusive = TRUE, x_name = NULL) {
 #' vld_range(c(0.1, 0.2, NA), range = c(0, 1))
 #' @export
 vld_range <- function(x, range = c(0, 1), inclusive = TRUE) {
-  if(isTRUE(inclusive)) {
+  if (isTRUE(inclusive)) {
     return(all(x[!is.na(x)] >= range[1] & x[!is.na(x)] <= range[2]))
   }
   all(x[!is.na(x)] > range[1] & x[!is.na(x)] < range[2])

diff --git a/R/err.R b/R/err.R
@@ -71,7 +71,7 @@ NULL
 #' # err
 #' try(err("there %r %n problem value%s", n = 2))
 err <- function(..., n = NULL, tidy = TRUE, .subclass = NULL, class = NULL, call = rlang::caller_call(3)) {
-  if(!is.null(.subclass)) {
+  if (!is.null(.subclass)) {
     deprecate_soft("0.8.1", "err(.subclass)", "err(class)")
     class <- .subclass
   }
@@ -104,7 +104,7 @@ err <- function(..., n = NULL, tidy = TRUE, .subclass = NULL, class = NULL, call
 #' # wrn
 #' wrn("there %r %n problem value%s", n = 2)
 wrn <- function(..., n = NULL, tidy = TRUE, .subclass = NULL, class = NULL) {
-  if(!is.null(.subclass)) {
+  if (!is.null(.subclass)) {
     deprecate_soft("0.8.1", "wrn(.subclass)", "wrn(class)")
     class <- .subclass
   }
@@ -120,7 +120,7 @@ wrn <- function(..., n = NULL, tidy = TRUE, .subclass = NULL, class = NULL) {
 #' # msg
 #' msg("there %r %n problem value%s", n = 2)
 msg <- function(..., n = NULL, tidy = TRUE, .subclass = NULL, class = NULL) {
-  if(!is.null(.subclass)) {
+  if (!is.null(.subclass)) {
     deprecate_soft("0.8.1", "msg(.subclass)", "msg(class)")
     class <- .subclass
   }

diff --git a/scripts/build.R b/scripts/build.R
@@ -1,11 +1,13 @@
 roxygen2md::roxygen2md()
-styler::style_pkg(filetype = c("R", "Rmd"))
+styler::style_pkg(
+  scope = "line_breaks",
+  filetype = c("R", "Rmd")
+)
 lintr::lint_package()
 
 devtools::test()
 devtools::document()
 
-rmarkdown::render("README.Rmd", output_format = "md_document")
-pkgdown::build_site()
+pkgdown::build_home()
 
 devtools::check()
diff --git a/tests/testthat/test-chk-null-or.R b/tests/testthat/test-chk-null-or.R
@@ -35,9 +35,10 @@ test_that("chk_null_or gives correct error message", {
   rlang::local_options(lifecycle_verbosity = "quiet")
   expect_error(
     chk_null_or("2000", vld = vld_whole_number),
-    "^`\"2000\"` must be a whole number \\(non-missing integer scalar or double equivalent\\) or NULL\\.$")
+    "^`\"2000\"` must be a whole number \\(non-missing integer scalar or double equivalent\\) or NULL\\.$"
+  )
   expect_error(
     chk_null_or("2000", vld = chk::vld_whole_number),
-    "^`\"2000\"` must be a whole number \\(non-missing integer scalar or double equivalent\\) or NULL\\.$")
+    "^`\"2000\"` must be a whole number \\(non-missing integer scalar or double equivalent\\) or NULL\\.$"
+  )
 })
-