Merge 4ec583d into e987d7a

r-lib · Jan 13, 2024 · 7eaf828 · 7eaf828
2 parents e987d7a + 4ec583d
commit 7eaf828
Show file tree

Hide file tree

Showing 21 changed files with 120 additions and 123 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -17,8 +17,11 @@
 ^doc$
 ^docs$
 ^gitsum$
+^hextools
 ^inst/WORDLIST$
+^inst/hextools$
 ^inst/hooks/.*$
+^pkgdown$
 ^revdep$
 ^tests/testmanual$
 ^tic\.R$

diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,11 @@
+.DS_Store
 .RData
 .Rhistory
 .Rproj.user
 .gitsum
 Meta
 R/scratch
+README.html
 doc
 docs
 gitsum

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9019
+    rev: v0.3.2.9027
     hooks:
       - id: style-files
         args:
@@ -34,9 +34,9 @@ repos:
       - id: roxygenize
         additional_dependencies:
           - r-lib/pkgapi
-          - dplyr@1.1.2
-          - roxygen2@7.2.3
-          - rlang@1.1.0
+          - dplyr
+          - roxygen2
+          - rlang
       - id: use-tidy-description
       - id: spell-check
         exclude: >
@@ -62,6 +62,7 @@ repos:
           .*\.Rds|
           .*\.sh|
           .*\.RData|
+          .*\.png|
           .*-in_tree
           )$
       - id: readme-rmd-rendered

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -52,7 +52,7 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate",
     if (rlang::is_installed("pkgapi")) "pkgapi::api_roclet" else {
     warning("Please install r-lib/pkgapi to make sure the file API is kept
     up to date"); NULL}))
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0
 Config/testthat/edition: 3
 Config/testthat/parallel: true
 Collate: 

diff --git a/R/styler-package.R b/R/styler-package.R
@@ -18,14 +18,15 @@
 #' style_text("a%>%b; a", scope = "tokens")
 "_PACKAGE"
 
-## usethis namespace: start
+## styler namespace: start
 #'
-#' @importFrom magrittr "%>%"
+#' @importFrom magrittr %>%
 #' @importFrom purrr compact partial flatten flatten_int flatten_chr
 #' @importFrom purrr map map_lgl map_int map_chr map2 map2_chr map_at pmap pwalk
-#' @importFrom rlang abort warn seq2 check_installed is_installed "%||%" set_names
+#' @importFrom rlang abort warn seq2 check_installed is_installed %||% set_names
 #' @importFrom vctrs vec_rbind vec_slice vec_split
-## usethis namespace: end
+#'
+## styler namespace: end
 NULL
 
 

diff --git a/R/transform-files.R b/R/transform-files.R
@@ -68,12 +68,10 @@ transform_file <- function(path,
 
   bullet <- if (is.na(changed)) {
     "warning"
+  } else if (changed) {
+    "info"
   } else {
-    if (changed) {
-      "info"
-    } else {
-      "tick"
-    }
+    "tick"
   }
 
   if (!getOption("styler.quiet", FALSE)) {

diff --git a/README.Rmd b/README.Rmd
@@ -15,7 +15,7 @@ knitr::opts_chunk$set(
 )
 ```
 
-# styler
+# styler <img src="man/figures/logo.png" align="right" width="240" />
 
 <!-- badges: start -->
 
@@ -68,3 +68,9 @@ The following online docs are available:
 -   [latest CRAN release](https://styler.r-lib.org).
 
 -   [GitHub development version](https://styler.r-lib.org/dev/).
+
+## Acknowledgments
+
+Hex sticker font is [Gayathri](https://fonts.google.com/specimen/Gayathri), and 
+the image is taken from icon made by [Freepik](https://www.freepik.com) and 
+available at [flaticon.com](https://www.flaticon.com/free-icon/suit).
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 <!-- README.md is generated from README.Rmd. Please edit that file -->
 
-# styler
+# styler <img src="man/figures/logo.png" align="right" width="240" />
 
 <!-- badges: start -->
 
@@ -53,3 +53,10 @@ The following online docs are available:
 - [latest CRAN release](https://styler.r-lib.org).
 
 - [GitHub development version](https://styler.r-lib.org/dev/).
+
+## Acknowledgments
+
+Hex sticker font is
+[Gayathri](https://fonts.google.com/specimen/Gayathri), and the image is
+taken from icon made by [Freepik](https://www.freepik.com) and available
+at [flaticon.com](https://www.flaticon.com/free-icon/suit).