Upkeep on path_first_existing()

Author: jennybc

R/pkgdown.R

@@ -141,12 +141,14 @@ tidyverse_url <- function(url, tr = NULL) {
 
 pkgdown_config_path <- function(base_path = proj_get()) {
   path_first_existing(
-    base_path,
-    c(
-      "_pkgdown.yml",
-      "_pkgdown.yaml",
-      "pkgdown/_pkgdown.yml",
-      "inst/_pkgdown.yml"
+    path(
+      base_path,
+      c(
+        "_pkgdown.yml",
+        "_pkgdown.yaml",
+        "pkgdown/_pkgdown.yml",
+        "inst/_pkgdown.yml"
+      )
     )
   )
 }

R/utils.R

@@ -72,9 +72,10 @@ isNA <- function(x) {
   length(x) == 1 && is.na(x)
 }
 
-path_first_existing <- function(...) {
-  paths <- path(...)
-  for (path in paths) {
+path_first_existing <- function(paths) {
+  # manual loop with explicit use of `[[` to retain "fs" class
+  for (i in seq_along(paths)) {
+    path <- paths[[i]]
     if (file_exists(path)) {
       return(path)
     }

tests/testthat/test-utils.R

@@ -17,3 +17,17 @@ test_that("slug() sets file extension, iff 'ext' not aleady the extension", {
   expect_equal(slug("abc.r", "R"), "abc.r")
   expect_equal(slug("abc.R", "txt"), "abc.txt")
 })
+
+test_that("path_first_existing() works", {
+  create_local_project()
+
+  all_3_files <- proj_path(c("alfa", "bravo", "charlie"))
+
+  expect_null(path_first_existing(all_3_files))
+
+  write_utf8(proj_path("charlie"), "charlie")
+  expect_equal(path_first_existing(all_3_files), proj_path("charlie"))
+
+  write_utf8(proj_path("bravo"), "bravo")
+  expect_equal(path_first_existing(all_3_files), proj_path("bravo"))
+})