Fix idempotency of roxygenize() for packages using multi-line @rawNamespace

.Rbuildignore

@@ -14,6 +14,7 @@
 ^\.github$
 ^pkgdown$
 ^\.covrignore$
+^\.devcontainer$
 ^azure-pipelines\.yml$
 ^\.Rprofile$
 ^r-packages$

.devcontainer/Dockerfile

@@ -0,0 +1,14 @@
+FROM rocker/r-base
+
+RUN apt-get -qq update && \
+  apt-get install -y --no-install-recommends git libxml2-dev
+
+COPY DESCRIPTION .
+
+RUN Rscript -e '                           \
+  install.packages("remotes");             \
+  remotes::install_deps(dependencies = c(  \
+    "Imports",                             \
+    "Config/Needs/development"             \
+  ))                                       \
+'

.devcontainer/devcontainer.json

@@ -0,0 +1,3 @@
+{
+    "build": { "dockerfile": "Dockerfile", "context": ".."}
+}

DESCRIPTION

@@ -46,6 +46,7 @@ LinkingTo:
     cpp11
 VignetteBuilder: 
     knitr
+Config/Needs/development: testthat
 Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
 Config/testthat/parallel: TRUE

R/namespace.R

@@ -74,7 +74,7 @@ update_namespace_imports <- function(base_path) {
   }
 
   lines <- c(namespace_imports(base_path), namespace_exports(NAMESPACE))
-  results <- c(made_by("#"), sort_c(unique(lines)))
+  results <- c(made_by("#"), sort_c(unique(trimws(lines))))
   write_if_different(NAMESPACE, results, check = TRUE)
 
   invisible()
@@ -109,12 +109,14 @@ namespace_imports_blocks <- function(srcref) {
   }))
 }
 
+# NB: this is designed as the conjugate of namespace_imports(), so also
+#   includes @rawNamespace entries which may/may not also include import directives.
 namespace_exports <- function(path) {
   parsed <- as.list(parse(path, keep.source = TRUE))
 
   is_import_directive <- function(x) is_call(x, import_directives)
   export_lines <- attr(parsed, "srcref")[!map_lgl(parsed, is_import_directive)]
-  unlist(lapply(export_lines, as.character))
+  unlist(lapply(export_lines, function(x) paste(as.character(x), collapse = "\n")))
 }
 
 # NAMESPACE generation ----------------------------------------------------

tests/testthat/test-namespace.R

@@ -305,6 +305,24 @@ test_that("rawNamespace inserted unchanged", {
   expect_equal(out, "xyz\n  abc")
 })
 
+test_that("rawNamespace does not break idempotency", {
+  initial_namespace <- roc_proc_text(namespace_roclet(), "
+    #' @import methods
+    #' @rawNamespace
+    #' if (TRUE) {
+    #'   1
+    #' } else {
+    #'   2
+    #' }
+    NULL")
+
+  tmp_namespace <- withr::local_tempfile(lines = initial_namespace)
+
+  expect_no_error(update_namespace_imports(dirname(tmp_namespace)))
+
+  # contents unchanged
+  expect_equal(read_lines(tmp_namespace), unlist(strsplit(initial_namespace, "\n")))
+})
 
 # @evalNamespace ----------------------------------------------------------
 
@@ -391,7 +409,13 @@ test_that("can extract non-imports from namespace preserving source", {
     "export(b)"
   )
   path <- withr::local_tempfile(lines = lines)
-  expect_equal(namespace_exports(path), lines[c(1:3, 5)])
+  expect_equal(
+    namespace_exports(path),
+    c(
+      paste(lines[1:3], collapse = "\n"),
+      lines[5L]
+    )
+  )
 })
 
 test_that("Invalid imports throw a helpful error", {