Housekeeping without air

.github/workflows/pre-commit.yaml

@@ -25,7 +25,9 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-
+      - name: Setup system dependencies
+        run: | 
+          sudo apt install cmake libcurl4-openssl-dev libnode-dev pandoc
       - name: Set up Python
         uses: actions/setup-python@v6.0.0
         with:

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: styler
 Title: Non-Invasive Pretty Printing of R Code
-Version: 1.11.0
+Version: 1.11.0.9001
 Authors@R: 
     c(person(given = "Kirill",
              family = "Müller",
@@ -53,7 +53,6 @@ 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.3.3
 Language: en-US
 Config/testthat/edition: 3
 Config/testthat/parallel: true
@@ -107,3 +106,4 @@ Collate:
     'vertical.R'
     'visit.R'
     'zzz.R'
+Config/roxygen2/version: 8.0.0

R/indent.R

@@ -39,28 +39,29 @@ indent_without_paren_if_else <- function(pd, indent_by) {
   }
   needs_indention_now <- pd$lag_newlines[
     next_non_comment(pd, which(pd$token == "')'"))
-  ] > 0L
+  ] >
+    0L
 
   if (needs_indention_now) {
     pd$indent[expr_after_if] <- indent_by
   }
 
-  else_idx <- which(pd$token == "ELSE")
-  if (length(else_idx) == 0L) {
+  els_idx <- which(pd$token == "ELSE")
+  if (length(els_idx) == 0L) {
     return(pd)
   }
-  expr_after_else_idx <- next_non_comment(pd, else_idx)
-  has_else_without_curly_or_else_chid <-
-    any(pd$token == "ELSE") &&
-      pd$child[[expr_after_else_idx]]$token[1L] != "'{'" &&
-      pd$child[[expr_after_else_idx]]$token[1L] != "IF"
+  expr_after_else_idx <- next_non_comment(pd, els_idx)
+  has_else_without_curly_or_else_chid <- any(pd$token == "ELSE") &&
+    pd$child[[expr_after_else_idx]]$token[1L] != "'{'" &&
+    pd$child[[expr_after_else_idx]]$token[1L] != "IF"
 
   needs_indention_now <- pd$lag_newlines[
     next_non_comment(pd, which(pd$token == "ELSE"))
-  ] > 0L
+  ] >
+    0L
 
   if (has_else_without_curly_or_else_chid && needs_indention_now) {
-    pd$indent[seq(else_idx + 1L, nrow(pd))] <- indent_by
+    pd$indent[seq(els_idx + 1L, nrow(pd))] <- indent_by
   }
   pd
 }
@@ -200,7 +201,6 @@ needs_indention_one <- function(pd,
 }
 
 
-
 #' Set the multi-line column
 #'
 #' Sets the column `multi_line` in `pd` by checking row-wise whether any child

R/initialize.R

@@ -25,7 +25,6 @@ default_style_guide_attributes <- function(pd_flat) {
 }
 
 
-
 #' Initialize attributes
 #'
 #' @name initialize_attributes

R/io.R

@@ -31,6 +31,7 @@ transform_utf8_one <- function(path, fun, dry) {
       identical_content <- identical(file_with_info$text, new)
       identical <- identical_content && !file_with_info$missing_EOF_line_break
       if (!identical) {
+        # fmt: skip
         switch(dry,
           fail = rlang::abort(
             paste0(

R/style-guides.R

@@ -130,6 +130,7 @@ tidyverse_style <- function(scope = "tokens",
 
   line_break_manipulators <- if ("line_breaks" %in% scope) {
     list(
+      # fmt: skip
       remove_empty_lines_after_opening_and_before_closing_braces =
         remove_empty_lines_after_opening_and_before_closing_braces,
       set_line_break_around_comma_and_or = set_line_break_around_comma_and_or,
@@ -159,8 +160,7 @@ tidyverse_style <- function(scope = "tokens",
           set_line_break_after_opening_if_call_is_multi_line,
           except_token_after = "COMMENT",
           # don't modify line break here
-          except_text_before = c("ifelse", "if_else"),
-          force_text_before = "switch" # force line break after first token
+          except_text_before = c("ifelse", "if_else")
         )
       },
       remove_line_break_in_fun_call = purrr::partial(
@@ -238,6 +238,7 @@ tidyverse_style <- function(scope = "tokens",
   )
 
   style_guide_name <- "styler::tidyverse_style@https://github.com/r-lib"
+  # fmt: skip
   create_style_guide(
     # transformer functions
     initialize             = default_style_guide_attributes,

R/testing.R

@@ -178,6 +178,7 @@ style_empty <- function(text, base_indention = 0L) {
 #' @describeIn test_transformer Transformations for indention based on operators
 #' @keywords internal
 style_op <- function(text, base_indention = 0L) {
+  # fmt: skip
   transformers <- list(
     # transformer functions
     initialize        = default_style_guide_attributes,

R/token-create.R

@@ -134,7 +134,6 @@ find_start_pos_id <- function(pd,
 }
 
 
-
 #' Validate sequence of new position ids
 #'
 #' Ids created with `after = TRUE` can have `pos_id` values between x.0 and

R/token-define.R

@@ -1,4 +1,5 @@
 # styler: off
+# fmt: skip
 token <- rbind.data.frame(
   c("&",          "logical",          "AND"),
   c("&&",         "logical",         "AND2"),

R/transform-code.R

@@ -171,6 +171,7 @@ get_engine_pattern <- function() {
 #' @inheritParams separate_chunks
 #' @keywords internal
 get_knitr_pattern <- function(filetype) {
+  # fmt: skip
   switch(filetype,
     Rnw = knitr::all_patterns[["rnw"]],
     Rmd = knitr::all_patterns[["md"]]

R/transform-files.R

@@ -381,7 +381,6 @@ apply_transformers <- function(pd_nested, transformers) {
 }
 
 
-
 #' Check whether a round trip verification can be carried out
 #'
 #' If scope was set to "line_breaks" or lower (compare [tidyverse_style()]),