Address comments

Author: olivroy

R/addins.R

@@ -68,7 +68,7 @@ style_active_file <- function() {
   } else if (is_r_file) {
     out <- try_transform_as_r_file(context, transformer)
   } else {
-    abort("Can only style .R, .qmd, .Rmd, and .Rnw files.")
+    abort("Can only style .qmd, .R, .Rmd, and .Rnw files.")
   }
   rstudioapi::modifyRange(
     c(1L, 1L, length(context$contents) + 1L, 1L),
@@ -97,11 +97,12 @@ save_after_styling_is_active <- function() {
   op_old <- as.logical(toupper(Sys.getenv("save_after_styling")))
   op_new <- getOption("styler.save_after_styling", default = "")
   if (!is.na(op_old)) {
-    rlang::warn(paste(
-      "Using the environment variable `save_after_styling` is deprecated and",
-      "won't work in a future version of styler. Please use",
-      "`options(styler.save_after_styling)` to control the behavior. If both are set,",
-      "the R option is used."
+    cli::cli_warn(c(
+      "Using the environment variable {.envvar save_after_styling} is \\
+      deprecated and won't work in a future version of styler. ",
+      "!" = "Please use `options(styler.save_after_styling)` \\
+             to control the behavior.",
+      i = "If both are set, the R option is used."
     ))
   }
 
@@ -123,7 +124,7 @@ style_selection <- function() {
   communicate_addins_style_transformers()
   context <- get_rstudio_context()
   text <- context$selection[[1L]]$text
-  if (all(nchar(text) == 0L)) abort("No code selected")
+  if (!any(nzchar(text))) abort("No code selected")
   out <- style_text(
     text,
     transformers = get_addins_style_transformer(),
@@ -212,9 +213,9 @@ try_transform_as_r_file <- function(context, transformer) {
     transformer(context$contents),
     error = function(e) {
       preamble_for_unsaved <- paste(
-        "Styling of unsaved files is only supported for R files with valid ",
-        "code. Please save the file (as .R or .Rmd) and make sure that the R ",
-        "code in it can be parsed. Then, try to style again."
+        "Styling of unsaved files is only supported for R files with valid",
+        "code. Please save the file (as .qmd, .R, or .Rmd) and make sure that",
+        "the R code in it can be parsed. Then, try to style again."
       )
 
       if (context$path == "") {

R/set-assert-args.R

@@ -73,8 +73,8 @@ assert_filetype <- function(lowercase_filetype) {
   allowed_types <- c("r", "rmd", "rmarkdown", "rnw", "rprofile", "qmd")
   if (!all(lowercase_filetype %in% allowed_types)) {
     abort(paste(
-      "filetype must not contain other values than 'R', 'Rprofile',",
-      "'Rmd', 'Rmarkdown', 'qmd' or 'Rnw' (case is ignored)."
+      "filetype must not contain other values than 'qmd', 'R',",
+      "'Rmarkdown', 'Rmd', 'Rnw', or 'Rprofile' (case is ignored)."
     ))
   }
 }

R/style-guides.R

@@ -479,11 +479,7 @@ tidyverse_reindention <- function() {
 #' @export
 scope_normalize <- function(scope, name = substitute(scope)) {
   levels <- c("none", "spaces", "indention", "line_breaks", "tokens")
-  rlang::arg_match(
-    scope,
-    values = levels,
-    multiple = TRUE
-  )
+  rlang::arg_match(scope, values = levels, multiple = TRUE)
 
   if (inherits(scope, "AsIs")) {
     factor(as.character(scope), levels = levels, ordered = TRUE)

R/transform-code.R

@@ -22,7 +22,7 @@ transform_code <- function(path, fun, ..., dry) {
       ..., dry = dry
     )
   } else {
-    cli::cli_abort("{.path {path}} is not an R, Rmd, qmd, or Rnw file.")
+    cli::cli_abort("{.path {path}} is not a qmd, R, Rmd, or Rnw file.")
   }
 }
 

R/ui-styling.R

@@ -87,10 +87,10 @@ style_pkg <- function(pkg = ".",
 #' Prettify a package
 #'
 #' @param filetype Vector of file extensions indicating which file types should
-#'   be styled. Case is ignored, and the `.` is optional, e.g. `c(".R",
-#'   ".Rmd")`, or `c("r", "rmd")`. Supported values (after standardization) are:
-#'   "r", "rprofile", "rmd", "rmarkdown", "rnw", "qmd". Rmarkdown is treated as
-#'   Rmd.
+#'   be styled. Case is ignored, and the `.` is optional, e.g. `c(".R",".Rmd")`,
+#'   or `c("r", "rmd")`. Supported values (after standardization) are:
+#'   "qmd", "r", "rmd", "rmarkdown", "rnw", and "rprofile".
+#'   Rmarkdown is treated as Rmd.
 #' @param exclude_files Character vector with regular expressions to files
 #'   that should be excluded from styling.
 #' @param exclude_dirs Character vector with directories to exclude

man/prettify_any.Rd

@@ -28,7 +28,7 @@ styler::cache_deactivate()
 
 styler provides the following API to format code:
 
--   `style_file()` styles `.R`, `.qmd`, `.Rmd`, `.Rmarkdown`, `.Rnw`, and `.Rprofile` files.
+-   `style_file()` styles `.qmd`, `.R`, `.Rmd`, `.Rmarkdown`, `.Rnw`, and `.Rprofile` files.
 
 -   `style_dir()` styles all these files in a directory.