Allow whitespace after code headers in split_code_headers() (#678)

Co-authored-by: Garrick Aden-Buie <garrick@adenbuie.com>
rstudio · Mar 18, 2022 · 1c01ac2 · 1c01ac2
1 parent 6339fa0
commit 1c01ac2
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/R/staticimports.R b/R/staticimports.R
@@ -19,7 +19,11 @@ is_html_tag <- function(x) {
   inherits(x, c("shiny.tag", "shiny.tag.list"))
 }
 
-knitr_engine_caption <- function(engine) {
+knitr_engine_caption <- function(engine = NULL) {
+  if (is.null(engine)) {
+    engine <- "r"
+  }
+
   switch(
     tolower(engine),
     "bash" = "Bash",
@@ -60,7 +64,7 @@ split_code_headers <- function(code, prefix = "section") {
   code <- str_trim(code, character = "[\r\n]")
   code <- strsplit(code, "\n")[[1]]
 
-  rgx_header <- "^(#+)([ -]*)(.+?)?\\s*----+$"
+  rgx_header <- "^\\s*(#+)([ -]*)(.+?)?\\s*----+\\s*$"
   headers <- regmatches(code, regexec(rgx_header, code, perl = TRUE))
   lines_headers <- which(vapply(headers, length, integer(1)) > 0)
 

diff --git a/inst/staticexports/split_code_headers.R b/inst/staticexports/split_code_headers.R
@@ -7,7 +7,7 @@ split_code_headers <- function(code, prefix = "section") {
   code <- str_trim(code, character = "[\r\n]")
   code <- strsplit(code, "\n")[[1]]
 
-  rgx_header <- "^(#+)([ -]*)(.+?)?\\s*----+$"
+  rgx_header <- "^(#+)([ -]*)(.+?)?\\s*----+\\s*$"
   headers <- regmatches(code, regexec(rgx_header, code, perl = TRUE))
   lines_headers <- which(vapply(headers, length, integer(1)) > 0)
 

diff --git a/tests/testthat/test-staticimports.R b/tests/testthat/test-staticimports.R
@@ -0,0 +1,37 @@
+test_that("split_code_headers()", {
+  target <- list(one = "1", two = "2")
+
+  # No whitespace after dashes
+  expect_equal(
+    split_code_headers(
+"# one ----
+1
+# two ----
+2"
+    ),
+    target
+  )
+
+
+  # Whitespace after first header
+  expect_equal(
+    split_code_headers(
+"# one ----
+1
+# two ----
+2"
+    ),
+  target
+  )
+
+  # Whitespace after subsequent headers
+  expect_equal(
+    split_code_headers(
+"# one ----
+1
+# two ----
+2"
+    ),
+  target
+)
+})