Merged origin/main into main

NEWS.md

@@ -5,7 +5,8 @@
 * Code evaluated in inline markdown code chunks and `@eval`/`@evalRd`/
   `@evalNamespace` is now evaluated in an environment designed to be more
   reproducible and to suppress output that won't work in Rd (e.g. turning
-  off colour and unicode support in cli) (#1351).
+  off colour and unicode support in cli) (#1351). They now also set 
+  knitr options `comment = #>` (#1380) and `collapse = TRUE` (#1376).
 
 # roxygen2 7.2.0
 
@@ -49,7 +50,7 @@
   `\ifelse{}{}{}` tags are now inserted correctly (without additional `{}`) 
   (#1062).
 
-* `@inhert` now supports inheriting "Notes" with `@inherit pkg::fun note` 
+* `@inherit` now supports inheriting "Notes" with `@inherit pkg::fun note` 
   (@pat-s, #1218)
 
 * Automatic `@usage` now correctly wraps arguments containing syntactically 

R/markdown.R

@@ -116,7 +116,9 @@ eval_code_node <- function(node, env) {
 knitr_chunk_defaults <- list(
   error = FALSE,
   fig.path = "man/figures/",
-  fig.process = function(path) basename(path)
+  fig.process = function(path) basename(path),
+  comment = "#>",
+  collapse = TRUE
 )
 
 str_set_all_pos <- function(text, pos, value, nodes) {

src/parser2.cpp

@@ -118,7 +118,7 @@ cpp11::list tokenise_block(cpp11::strings lines, std::string file,
 
     if (!line.consumeRoxygenComment()) {
       // Incremenet curRow for non-roxygen comments at start of block
-      if (curVal == "")
+      if (curVal.empty())
         curRow++;
       continue;
     }

tests/testthat/_snaps/markdown-code.md

@@ -24,3 +24,28 @@
       1: 1 + 
          ^
 
+# interleaving fences and inline code
+
+    Code
+      cat(out1$get_value("details"))
+    Output
+      Details 10
+      
+      \if{html}{\out{<div class="sourceCode r">}}\preformatted{y <- x + 10
+      y
+      #> [1] 20
+      }\if{html}{\out{</div>}}
+
+# preserves white space
+
+    Code
+      cat(out1$get_value("details"))
+    Output
+      \if{html}{\out{<div class="sourceCode r">}}\preformatted{a <- 1
+      
+      b <- 2
+      }\if{html}{\out{</div>}}
+      
+      \if{html}{\out{<div class="sourceCode r">}}\preformatted{c <- 3
+      }\if{html}{\out{</div>}}
+

tests/testthat/test-markdown-code.R

@@ -5,7 +5,7 @@ test_that("can eval inline code", {
     #' @description Description `r 2 + 2`
     #' @md
     foo <- function() NULL
-    
+
   ")[[1]]
   expect_equal(out1$get_value("title"), "Title 2")
   expect_equal(out1$get_value("description"), "Description 4")
@@ -21,7 +21,7 @@ test_that("can eval fenced code", {
     #' ```
     #' @md
     foo <- function() NULL
-    
+
   ")[[1]]
   expect_match(out1$get_value("details"), "2")
 })
@@ -35,7 +35,7 @@ test_that("use same env within, but not across blocks", {
     bar <- function() NULL
 
     #' Title
-    #' 
+    #'
     #' Description `r exists('baz', inherits = FALSE)`
     #' @md
     zap <- function() NULL
@@ -56,7 +56,7 @@ test_that("appropriate knit print method for fenced and inline is applied", {
   )
   out1 <- roc_proc_text(rd_roclet(), "
     #' @title Title `r structure('default', class = 'foo')`
-    #' 
+    #'
     #' @details Details
     #'
     #' ```{r}
@@ -153,9 +153,30 @@ test_that("interleaving fences and inline code", {
     #' @name dummy
     NULL")[[1]]
 
-  details <- out1$get_value("details")
-  expect_match(details, "Details 10", fixed = TRUE)
-  expect_match(details, "## [1] 20", fixed = TRUE)
+  expect_snapshot(cat(out1$get_value("details")))
+})
+
+test_that("preserves white space", {
+    out1 <- roc_proc_text(rd_roclet(), "
+    #' Title
+    #'
+    #' @details
+    #'
+    #' ```{r}
+    #' a <- 1
+    #'
+    #' b <- 2
+    #' ```
+    #'
+    #' ```{r}
+    #' c <- 3
+    #' ```
+    #'
+    #' @md
+    #' @name dummy
+    NULL")[[1]]
+
+  expect_snapshot(cat(out1$get_value("details")))
 })
 
 test_that("fence options are used", {