Merge branch 'main' into markup-in-link-text

Author: salim-b

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: roxygen2
 Title: In-Line Documentation for R
-Version: 7.3.2.9000
+Version: 7.3.3.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "hadley@posit.co", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0003-4757-117X")),

NEWS.md

@@ -1,5 +1,7 @@
 # roxygen2 (development version)
 
+# roxygen2 7.3.3
+
 * Package documentation now converts ROR IDs into a useful link (#1698, @maelle).
 
 * The check for unexported S3 methods was improved, so it does not hang any more

tests/testthat/test-markdown-code.R

@@ -133,7 +133,14 @@ test_that("inline code gives useful warning", {
   "
 
   expect_snapshot(
-    out <- roc_proc_text(rd_roclet(), block)[[1]]
+    out <- roc_proc_text(rd_roclet(), block)[[1]],
+    transform = function(x) {
+      line <- grep("~~~", x)[1]
+      if (!is.na(line)) {
+        x <- x[1:(line-1)]
+      }
+      x
+    }
   )
   expect_equal(out$get_value("description"), "\\verb{r 1 + }")
 })

tests/testthat/test-rd-include-rmd.R

@@ -297,6 +297,10 @@ test_that("useful warnings", {
     transform = function(x) {
       x <- gsub(path, "<temp-path.Rmd>", x, fixed = TRUE)
       x <- gsub("file.*\\.Rmd", "<another-temp-path.Rmd>", x)
+      line <- grep("~~~", x)[1]
+      if (!is.na(line)) {
+        x <- x[1:(line-1)]
+      }
       x
     }
   )