Fix RStudio help event

Follow up to #205 for #120
r-lib · Jun 2, 2022 · e3c282a · e3c282a
1 parent 7f743b2
commit e3c282a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/R/dev-help.r b/R/dev-help.r
@@ -65,8 +65,12 @@ print.dev_topic <- function(x, ...) {
     topic_write_text(x, out_path)
     file.show(out_path, title = paste(x$pkg, basename(x$path), sep = ":"))
   } else if (type == "html") {
-    topic_write_html(x, out_path)
-    utils::browseURL(out_path)
+    if (is_installed("rstudioapi") && rstudioapi::hasFun("previewRd")) {
+      rstudioapi::callFun("previewRd", x$path)
+    } else {
+      topic_write_html(x, out_path)
+      utils::browseURL(out_path)
+    }
   }
 }
 
@@ -83,11 +87,6 @@ topic_write_text <- function(x, path) {
 }
 
 topic_write_html <- function(x, path) {
-  if (is_installed("rstudioapi") && rstudioapi::hasFun("previewRd")) {
-    rstudioapi::callFun("previewRd", x$path)
-    return(invisible())
-  }
-
   macros <- load_rd_macros(dirname(dirname(x$path)))
 
   tools::Rd2HTML(

diff --git a/tests/testthat/test-help.r b/tests/testthat/test-help.r
@@ -102,7 +102,7 @@ test_that("complex expressions are checked", {
 test_that("can use macros in other packages (#120)", {
   skip_if_not_installed("mathjaxr")
 
-  load_all("testMacroDownstream")
+  load_all(test_path("testMacroDownstream"))
 
   topic <- dev_help("macro_downstream")
   text_lines <- topic_lines(topic, "text")