Remove leading blank lines when strict = TRUE

R/roxygen-examples.R

@@ -74,8 +74,7 @@ style_roxygen_code_example_segment <- function(one_dont,
   }
   dont_seqs <- find_dont_seqs(one_dont)
   split_segments <- split_roxygen_segments(one_dont, unlist(dont_seqs))
-  is_dont <-
-    seq2(1L, length(split_segments$separated)) %in% split_segments$selectors
+  is_dont <- seq2(1L, length(split_segments$separated)) %in% split_segments$selectors
 
   map2(split_segments$separated, is_dont,
     style_roxygen_example_snippet,
@@ -117,8 +116,11 @@ style_roxygen_example_snippet <- function(code_snippet,
   )
   if (!is_cached || !cache_is_active) {
     code_snippet <- code_snippet %>%
-      parse_transform_serialize_r(transformers,
-        base_indention = base_indention, warn_empty = FALSE
+      parse_transform_serialize_r(
+        transformers,
+        base_indention = base_indention,
+        warn_empty = FALSE,
+        is_roxygen_code_example = TRUE
       )
   }
 

R/transform-block.R

@@ -51,7 +51,10 @@ parse_transform_serialize_r_block <- function(pd_nested,
     ) %>%
       unlist(use.names = FALSE)
   }
-  c(rep("", start_line - 1L), serialized_transformed_text)
+  c(
+    rep("", start_line - as.integer(start_line > 0L)),
+    serialized_transformed_text
+  )
 }
 
 #' Find the groups of expressions that should be processed together

R/transform-files.R

@@ -231,6 +231,7 @@ split_roxygen_segments <- function(text, roxygen_examples) {
 #' Wrapper function for the common three operations.
 #' @param warn_empty Whether or not a warning should be displayed when `text`
 #'   does not contain any tokens.
+#' @param is_roxygen_code_example Is code a roxygen examples block?
 #' @inheritParams compute_parse_data_nested
 #' @inheritParams parse_transform_serialize_r_block
 #' @seealso [parse_transform_serialize_roxygen()]
@@ -239,7 +240,8 @@ split_roxygen_segments <- function(text, roxygen_examples) {
 parse_transform_serialize_r <- function(text,
                                         transformers,
                                         base_indention,
-                                        warn_empty = TRUE) {
+                                        warn_empty = TRUE,
+                                        is_roxygen_code_example = FALSE) {
   more_specs <- cache_more_specs(
     include_roxygen_examples = TRUE, base_indention = base_indention
   )
@@ -257,14 +259,24 @@ parse_transform_serialize_r <- function(text,
     transformers
   )
 
+  strict <- transformers$more_specs_style_guide$strict %||% TRUE
   pd_split <- unname(split(pd_nested, pd_nested$block))
   pd_blank <- find_blank_lines_to_next_block(pd_nested)
 
   text_out <- vector("list", length(pd_split))
   for (i in seq_along(pd_split)) {
+    # if the first block: only preserve for roxygen or not strict
+    # if a later block: always preserve line breaks
+    start_line <- if (i == 1L) {
+      if (is_roxygen_code_example || !strict) pd_blank[[i]] else 1L
+    } else {
+      pd_blank[[i]]
+    }
+
+
     text_out[[i]] <- parse_transform_serialize_r_block(
       pd_split[[i]],
-      pd_blank[[i]],
+      start_line = start_line,
       transformers = transformers,
       base_indention = base_indention
     )

tests/testthat/curly-curly/mixed-out.R

@@ -1,4 +1,3 @@
-
 ##  ............................................................................
 ##  line breaks                                                             ####
 # not inserting line breaks

tests/testthat/indention_curly_brackets/custom-out.R

@@ -1,4 +1,3 @@
-
 value <- 5
 if (value > 0) {
     print(value)

tests/testthat/line_breaks_and_other/base-pipe-line-breaks-out.R

@@ -1,4 +1,3 @@
-
 c(a |> b())
 
 c(a + b |> c())

tests/testthat/public-api/renvpkg/tests/testthat/test-package-xyz.R

@@ -1,5 +1,3 @@
-
-
 test_that("hi there", {
   I(am(a(package(x))))
 })

tests/testthat/public-api/xyzpackage-qmd/tests/testthat/test-package-xyz.R

@@ -1,5 +1,3 @@
-
-
 test_that("hi there", {
   I(am(a(package(x))))
 })

tests/testthat/public-api/xyzpackage-rmd/tests/testthat/test-package-xyz.R

@@ -1,5 +1,3 @@
-
-
 test_that("hi there", {
   I(am(a(package(x))))
 })

tests/testthat/public-api/xyzpackage-rnw/tests/testthat/test-package-xyz.R

@@ -1,5 +1,3 @@
-
-
 test_that("hi there", {
   I(am(a(package(x))))
 })

tests/testthat/public-api/xyzpackage/tests/testthat/test-package-xyz.R

@@ -1,5 +1,3 @@
-
-
 test_that("hi there", {
   I(am(a(package(x))))
 })

tests/testthat/roxygen-examples-complete/12-dontshow-dontrun-donttest-out.R

@@ -1,4 +1,3 @@
-
 #' Create a style guide
 #'
 #' @param reindention A list of parameters for regex re-indention, most

tests/testthat/roxygen-examples-complete/12-fun-decs-in-examples-out.R

@@ -1,4 +1,3 @@
-
 #' Create a style guide
 #'
 #' @param reindention A list of parameters for regex re-indention, most

tests/testthat/roxygen-examples-complete/13-empty-lines-out.R

@@ -1,4 +1,3 @@
-
 #' Create a style guide
 #'
 #' @param reindention A list of parameters for regex re-indention, most

tests/testthat/start_line/comment-out.R

@@ -1,8 +1,3 @@
-
-
-
-
-
 # a comment
 a <- function(x) {
 x

tests/testthat/start_line/no_comment-out.R

@@ -1,8 +1,3 @@
-
-
-
-
-
 a <- function(x) {
 x
 }

tests/testthat/stylerignore/simple-out.R

@@ -1,4 +1,3 @@
-
 call(1 ) # styler: off
 # styler: off
 # also if there are more comments

tests/testthat/test-parse_comments.R

@@ -1,6 +1,3 @@
-library("testthat")
-
-
 test_that("spacing within comments is done correctly", {
   expect_warning(test_collection("parse_comments",
     "within_spacing_with_force",

tests/testthat/tests-cache-require-serial.R

@@ -1,4 +1,3 @@
-
 test_that("top-level test: Caches top-level expressions efficiently on style_text()", {
   local_test_setup(cache = TRUE)
   text <- test_path("cache-with-r-cache/mlflow-1-in.R") %>%

tests/testthat/token_adding_removing/token_creation_find_pos-out.R

@@ -1,4 +1,3 @@
-
 print_out <- function(x, ...) {
   lines <- m(y, ..., print = TRUE)
   paste(lines, sep = "\n")