derive example type independently of whether nor not rd emulation is needed. Match \t anyways as although it can't be in file input, it can be in text input (and unit tests)

Author: lorenzwalthert

R/roxygen-examples-add-remove.R

@@ -29,18 +29,7 @@ remove_roxygen_mask <- function(text) {
 #' #' @examples c(1, 2)
 #' @keywords internal
 remove_roxygen_header <- function(text) {
-  text <- gsub("^\\s*@examples(If\\s|\\s|$)", "", text, perl = TRUE)
-  if (grepl("^If ", text[1])) {
-    text[1] <- gsub("^If\\s*", "", text[1])
-    example_type <- "examplesIf"
-  } else {
-    example_type <- "examples"
-  }
-
-  list(
-    text = text,
-    example_type = example_type
-  )
+  gsub("^\\s*@examples(If)?(\\s|\t)*", "", text, perl = TRUE)
 }
 
 #' Add the roxygen mask to code

R/roxygen-examples-find.R

@@ -7,7 +7,7 @@
 #' @importFrom rlang seq2
 #' @keywords internal
 identify_start_to_stop_of_roxygen_examples_from_text <- function(text) {
-  starts <- grep("^#'\\s*@examples(If\\s|\\s|$)", text, perl = TRUE)
+  starts <- grep("^#'\\s*@examples(If\\s|\\s|\t|$)", text, perl = TRUE)
   if (length(starts) < 1L) {
     return(integer())
   }

R/roxygen-examples-parse.R

@@ -124,12 +124,11 @@ roxygen_remove_extra_brace <- function(parsed) {
 #' `remove_roxygen_mask()` when there are no characters to escape.
 #' @keywords internal
 emulate_rd <- function(roxygen) {
+  example_type <- gsub("^#'(\\s|\t)*@examples(If)?(\\s|\t)*(.*)", "examples\\2", roxygen[1])
   if (needs_rd_emulation(roxygen)) {
-    example_type <- gsub("^#'\\s*@examples(If)?.*", "examples\\1", roxygen[1])
-
     roxygen <- c(
       "#' Example",
-      gsub("^#'\\s*@examples(If)?\\s*(.*)", "#' @examples \\2", roxygen),
+      gsub("^#'(\\s|\t)*@examples(If)?(\\s|\t)*(.*)", "#' @examples \\4", roxygen),
       "x <- 1"
     )
     text <- roxygen2::roc_proc_text(
@@ -138,16 +137,17 @@ emulate_rd <- function(roxygen) {
     )[[1]]$get_section("examples") %>%
       as.character() %>%
       .[-1]
-    list(
-      text = c(
-        if (grepl("^#'\\s*@examples\\s*$", roxygen[2])) "",
-        text
-      ),
-      example_type = example_type
+    text <- c(
+      if (grepl("^#'(\\s|\t)*@examples(\\s|\t)*$", roxygen[2])) "",
+      text
     )
   } else {
-    remove_roxygen_mask(roxygen)
+    text <- remove_roxygen_mask(roxygen)
   }
+  list(
+    text = text,
+    example_type = example_type
+  )
 }
 
 #' Check if rd emulation is required with [roxygen2::roc_proc_text()]