Merge pull request #277 from r-lib/use-rstudioapi

Check if rstudioapi is available
r-lib · May 3, 2024 · f7fc41f · f7fc41f
2 parents 7556a3f + 0e94bb1
commit f7fc41f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/R/dev-help.R b/R/dev-help.R
@@ -89,7 +89,7 @@ print.dev_topic <- function(x, ...) {
   type <- arg_match0(x$type %||% "text", c("text", "html"))
 
   # Use rstudio's previewRd() if possible
-  if (type == "html" && is_rstudio() && is_installed("rstudioapi")) {
+  if (type == "html" && rstudioapi_available()) {
     # If the package has Rd macros, this needs a version of rstudio
     # that loads them, see rstudio/rstudio#12111
     version_needed <- if (has_rd_macros(dirname(dirname(x$path)))) "2022.12.0.256"

diff --git a/R/utils.R b/R/utils.R
@@ -203,3 +203,7 @@ cat_line <- function(...) {
 is_rstudio <- function() {
   is_string(.Platform$GUI, "RStudio")
 }
+
+rstudioapi_available <- function() {
+  is_installed("rstudioapi") && rstudioapi::isAvailable()
+}