Merge branch 'main' into dev-roxygen-nested

Author: lorenzwalthert

.github/workflows/check-full.yaml

@@ -50,7 +50,7 @@ jobs:
           sudo locale-gen zh_CN
           echo "LC_ALL=zh_CN" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/check-no-warnings.yaml

@@ -14,7 +14,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: r-lib/actions/setup-r@v2
         with:

.github/workflows/pkgdown.yaml

@@ -20,7 +20,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/pre-commit.yaml

@@ -22,12 +22,12 @@ jobs:
         with:
           access_token: ${{ github.token }}
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v6.0.0
         with:
           python-version: "3.13"
 

.github/workflows/test-coverage.yaml

@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: r-lib/actions/setup-r@v2
         with:

.github/workflows/touchstone-receive.yaml

@@ -24,7 +24,7 @@ jobs:
       config: ${{ steps.read_touchstone_config.outputs.config }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.4.3.9009
+    rev: v0.4.3.9014
     hooks:
       - id: style-files
         args:
@@ -101,7 +101,7 @@ repos:
           )$
       - id: pkgdown
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=200"]

DESCRIPTION

@@ -16,7 +16,7 @@ Authors@R:
              family = "Patil",
              role = "aut",
              email = "[email protected]",
-             comment = c(ORCID = "0000-0003-1995-6531", Twitter = "@patilindrajeets")))
+             comment = c(ORCID = "0000-0003-1995-6531")))
 Description: Pretty-prints R code without changing the user's formatting
     intent.
 License: MIT + file LICENSE
@@ -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.3.2
+RoxygenNote: 7.3.3
 Language: en-US
 Config/testthat/edition: 3
 Config/testthat/parallel: true

R/rules-line-breaks.R

@@ -3,11 +3,11 @@
 #' Rule:
 #' * Principle: Function arguments that consist of a braced expression always
 #'   need to start on a new line
-#' * Exception: [...] unless it's the last argument and all other
+#' * Exception: unless it's the last argument and all other
 #'   arguments fit on the line of the function call
-#' * Exception: [...] or they are named.
+#' * Exception: or they are named
 #' * Extension: Also, expressions following on braced expressions also cause a
-#'   line trigger.
+#'   line trigger
 #' @keywords internal
 #' @examplesIf FALSE
 #' tryCatch(

R/transform-code.R

@@ -36,6 +36,9 @@ transform_code <- function(path, fun, ..., dry) {
 #' @inheritParams separate_chunks
 #' @keywords internal
 transform_mixed <- function(lines, transformer_fun, filetype) {
+  if (filetype %in% c("Rnw", "Rmd") && !rlang::is_installed("knitr")) {
+    rlang::abort("{knitr} is required to process vignette files (Rmd, Rnw)")
+  }
   chunks <- separate_chunks(lines, filetype)
   chunks$r_chunks <- map(chunks$r_chunks, transform_mixed_non_empty,
     transformer_fun = transformer_fun
@@ -168,9 +171,8 @@ get_engine_pattern <- function() {
 #' @inheritParams separate_chunks
 #' @keywords internal
 get_knitr_pattern <- function(filetype) {
-  if (filetype == "Rnw") {
-    knitr::all_patterns[["rnw"]]
-  } else if (filetype == "Rmd") {
-    knitr::all_patterns[["md"]]
-  }
+  switch(filetype,
+    Rnw = knitr::all_patterns[["rnw"]],
+    Rmd = knitr::all_patterns[["md"]]
+  )
 }