use xfun::normalize_path everywhere

Author: cderv

NAMESPACE

@@ -61,5 +61,6 @@ importFrom(tools,vignetteEngine)
 importFrom(utils,browseURL)
 importFrom(xfun,base64_encode)
 importFrom(xfun,env_option)
+importFrom(xfun,normalize_path)
 importFrom(yaml,as.yaml)
 importFrom(yaml,write_yaml)

R/quarto-package.R

@@ -11,5 +11,6 @@
 #' @importFrom tools vignetteEngine
 #' @importFrom xfun base64_encode
 #' @importFrom xfun env_option
+#' @importFrom xfun normalize_path
 ## usethis namespace: end
 NULL

R/quarto.R

@@ -21,7 +21,7 @@ quarto_path <- function(normalize = TRUE) {
   if (!normalize) {
     return(quarto_path)
   }
-  normalizePath(quarto_path, winslash = "/", mustWork = FALSE)
+  xfun::normalize_path(quarto_path)
 }
 
 get_quarto_path_env <- function() {
@@ -257,7 +257,7 @@ quarto_binary_sitrep <- function(verbose = TRUE, debug = FALSE) {
     return(FALSE)
   }
 
-  quarto_found <- normalizePath(quarto_found, mustWork = FALSE)
+  quarto_found <- xfun::normalize_path(quarto_found)
 
   same_config <- TRUE
   if (debug) {
@@ -271,8 +271,8 @@ quarto_binary_sitrep <- function(verbose = TRUE, debug = FALSE) {
     ))
   }
 
-  quarto_r_env <- normalizePath(get_quarto_path_env(), mustWork = FALSE)
-  quarto_system <- normalizePath(unname(Sys.which("quarto")), mustWork = FALSE)
+  quarto_r_env <- xfun::normalize_path(get_quarto_path_env())
+  quarto_system <- xfun::normalize_path(unname(Sys.which("quarto")))
   # quarto R package will use QUARTO_PATH env var with higher priority than latest version on path $PATH
   # and RStudio IDE does not use this environment variable
   if (!is.na(quarto_r_env) && identical(quarto_r_env, quarto_found)) {
@@ -296,7 +296,7 @@ quarto_binary_sitrep <- function(verbose = TRUE, debug = FALSE) {
   # RStudio IDE > Render button will use RSTUDIO_QUARTO env var with higher priority than latest version on path $PATH
   rstudio_env <- Sys.getenv("RSTUDIO_QUARTO", unset = NA)
   if (!is.na(rstudio_env)) {
-    rstudio_env <- normalizePath(rstudio_env, mustWork = FALSE)
+    rstudio_env <- xfun::normalize_path(rstudio_env)
     if (!identical(rstudio_env, quarto_found)) {
       same_config <- FALSE
       if (verbose) {

tests/testthat/helper.R

@@ -211,7 +211,7 @@ transform_quarto_cli_in_output <- function(
         if (dir_only) {
           quarto_found <- dirname(quarto_found)
         }
-        quarto_found_normalized <- normalizePath(quarto_found, mustWork = FALSE)
+        quarto_found_normalized <- xfun::normalize_path(quarto_found)
         # look for non-normalized path
         lines <- hide_path(lines, quarto_found)
         # look for normalized path

tests/testthat/test-quarto.R

@@ -64,7 +64,7 @@ test_that("quarto CLI sitrep", {
   skip_if_no_quarto()
   skip_on_cran()
   local_reproducible_output(width = 1000)
-  dummy_quarto_path <- normalizePath("dummy", mustWork = FALSE)
+  dummy_quarto_path <- xfun::normalize_path("dummy")
   withr::with_envvar(
     list(QUARTO_PATH = dummy_quarto_path, RSTUDIO_QUARTO = NA),
     expect_snapshot(