Merge branch 'main' into bump-to-r36

Author: IndrajeetPatil

R/nest.R

@@ -327,33 +327,35 @@ set_spaces <- function(spaces_after_prefix, force_one) {
 #' @return A nested parse table.
 #' @keywords internal
 nest_parse_data <- function(pd_flat) {
-  if (all(pd_flat$parent <= 0L)) {
-    return(pd_flat)
+  repeat {
+    if (all(pd_flat$parent <= 0L)) {
+      return(pd_flat)
+    }
+    pd_flat$internal <- with(pd_flat, (id %in% parent) | (parent <= 0L))
+    split_data <- split(pd_flat, pd_flat$internal)
+
+    child <- split_data$`FALSE`
+    internal <- split_data$`TRUE`
+
+    internal$internal_child <- internal$child
+    internal$child <- NULL
+
+    child$parent_ <- child$parent
+
+    rhs <- nest_(child, "child", setdiff(names(child), "parent_"))
+
+    nested <- left_join(internal, rhs, by = c("id" = "parent_"))
+
+    children <- nested$child
+    for (i in seq_along(children)) {
+      new <- combine_children(children[[i]], nested$internal_child[[i]])
+      # Work around is.null(new)
+      children[i] <- list(new)
+    }
+    nested$child <- children
+    nested$internal_child <- NULL
+    pd_flat <- nested
   }
-  pd_flat$internal <- with(pd_flat, (id %in% parent) | (parent <= 0L))
-  split_data <- split(pd_flat, pd_flat$internal)
-
-  child <- split_data$`FALSE`
-  internal <- split_data$`TRUE`
-
-  internal$internal_child <- internal$child
-  internal$child <- NULL
-
-  child$parent_ <- child$parent
-
-  rhs <- nest_(child, "child", setdiff(names(child), "parent_"))
-
-  nested <- left_join(internal, rhs, by = c("id" = "parent_"))
-
-  children <- nested$child
-  for (i in seq_along(children)) {
-    new <- combine_children(children[[i]], nested$internal_child[[i]])
-    # Work around is.null(new)
-    children[i] <- list(new)
-  }
-  nested$child <- children
-  nested$internal_child <- NULL
-  nest_parse_data(nested)
 }
 
 #' Combine child and internal child

R/roxygen-examples-parse.R

@@ -143,10 +143,12 @@ emulate_rd <- function(roxygen) {
     )
     roxygen <- gsub("(^#)[^']", "#' #", roxygen)
 
-    text <- roxygen2::roc_proc_text(
+    processed <- roxygen2::roc_proc_text(
       roxygen2::rd_roclet(),
       paste(roxygen, collapse = "\n")
-    )[[1L]]$get_section("examples")
+    )
+
+    text <- processed[[1L]]$get_section("examples")
     text <- as.character(text)[-1L]
     text <- c(
       if (grepl("^#'(\\s|\t)*@examples(\\s|\t)*$", roxygen[2L])) "",

tests/testthat/_snaps/public_api-1.md

@@ -0,0 +1,47 @@
+# messages (via cat()) of style_file are correct
+
+    Code
+      cat(catch_style_file_output(file.path("public-api", "xyzdir-dirty",
+        "dirty-sample-with-scope-tokens.R")), sep = "\n")
+    Output
+      Styling  1  files:
+       dirty-sample-with-scope-tokens.R i 
+      ----------------------------------------
+      Status	Count	Legend 
+      v 	0	File unchanged.
+      i 	1	File changed.
+      x 	0	Styling threw an error.
+      ----------------------------------------
+      Please review the changes carefully!
+
+---
+
+    Code
+      cat(catch_style_file_output(file.path("public-api", "xyzdir-dirty",
+        "clean-sample-with-scope-tokens.R")), sep = "\n")
+    Output
+      Styling  1  files:
+       clean-sample-with-scope-tokens.R v 
+      ----------------------------------------
+      Status	Count	Legend 
+      v 	1	File unchanged.
+      i 	0	File changed.
+      x 	0	Styling threw an error.
+      ----------------------------------------
+
+---
+
+    Code
+      cat(catch_style_file_output(file.path("public-api", "xyzdir-dirty",
+        "dirty-sample-with-scope-spaces.R")), sep = "\n")
+    Output
+      Styling  1  files:
+       dirty-sample-with-scope-spaces.R i 
+      ----------------------------------------
+      Status	Count	Legend 
+      v 	0	File unchanged.
+      i 	1	File changed.
+      x 	0	Styling threw an error.
+      ----------------------------------------
+      Please review the changes carefully!
+

tests/testthat/_snaps/public_api-3.md

@@ -0,0 +1,7 @@
+# No sensitive to decimal option
+
+    Code
+      style_text("1")
+    Output
+      1
+