diff --git a/R/roxygen-examples.R b/R/roxygen-examples.R index 646003621..a911043b1 100644 --- a/R/roxygen-examples.R +++ b/R/roxygen-examples.R @@ -24,6 +24,9 @@ style_roxygen_code_example <- function(example, transformers, base_indention) { style_roxygen_code_example_one <- function(example_one, transformers, base_indention) { + # Workaround for imperfect parsing of roxygen2 examples + example_one <- example_one[example_one != ""] + bare <- parse_roxygen(example_one) one_dont <- split(bare$text, factor(cumsum(bare$text %in% dont_keywords()))) unmasked <- map(one_dont, style_roxygen_code_example_segment, diff --git a/tests/testthat/roxygen-examples-complete/17-two-no-non-comment-out.R b/tests/testthat/roxygen-examples-complete/17-two-no-non-comment-out.R index 21f1dd477..b783e79b9 100644 --- a/tests/testthat/roxygen-examples-complete/17-two-no-non-comment-out.R +++ b/tests/testthat/roxygen-examples-complete/17-two-no-non-comment-out.R @@ -4,7 +4,6 @@ #' } #' # before this comment is a left-over space #' another_function <- function() NULL -#' #' @examples #' my_fun <- function() { diff --git a/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in.R b/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in.R index 14b943318..5808ced9c 100644 --- a/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in.R +++ b/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in.R @@ -28,3 +28,13 @@ NULL #' @examples #' 2 + 1 NULL + + + +#' this +#' +#' empty line after example +#' @examples +#' 2 + 1 + +NULL diff --git a/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in_tree b/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in_tree index d0f5d92d7..8f9a397dc 100644 --- a/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in_tree +++ b/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-in_tree @@ -26,5 +26,12 @@ ROOT (token: short_text [lag_newlines/spaces] {pos_id}) ¦--COMMENT: #' me [1/0] {25} ¦--COMMENT: #' @e [1/0] {26} ¦--COMMENT: #' 2 [1/0] {27} - °--expr: NULL [1/0] {29} - °--NULL_CONST: NULL [0/0] {28} + ¦--expr: NULL [1/0] {29} + ¦ °--NULL_CONST: NULL [0/0] {28} + ¦--COMMENT: #' th [4/0] {30} + ¦--COMMENT: #' [1/0] {31} + ¦--COMMENT: #' em [1/0] {32} + ¦--COMMENT: #' @e [1/0] {33} + ¦--COMMENT: #' 2 [1/0] {34} + °--expr: NULL [2/0] {36} + °--NULL_CONST: NULL [0/0] {35} diff --git a/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-out.R b/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-out.R index e9f4c3d17..f85ff9e76 100644 --- a/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-out.R +++ b/tests/testthat/roxygen-examples-complete/26-empty-trailing-lines-out.R @@ -22,3 +22,12 @@ NULL #' @examples #' 2 + 1 NULL + + + +#' this +#' +#' empty line after example +#' @examples +#' 2 + 1 +NULL diff --git a/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-out.R b/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-out.R index d82d10a2c..90eb3b168 100644 --- a/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-out.R +++ b/tests/testthat/roxygen-examples-complete/27-no-code-block-after-example-out.R @@ -5,7 +5,6 @@ #' #' @examples #' 1 + 1 -#' #' nolint start #' @examplesIf long_condition_line