Merge branch 'main' into split-roxygen

Author: lorenzwalthert

R/addins.R

@@ -157,7 +157,7 @@ set_style_transformers <- function() {
       current_style
     )
   if (!is.null(new_style)) {
-    parsed_new_style <- rlang::with_handlers(
+    parsed_new_style <- rlang::try_fetch(
       {
         transformers <- eval(parse(text = new_style))
         style_text(
@@ -208,7 +208,7 @@ communicate_addins_style_transformers <- function() {
 #'   [make_transformer()].
 #' @keywords internal
 try_transform_as_r_file <- function(context, transformer) {
-  rlang::with_handlers(
+  rlang::try_fetch(
     transformer(context$contents),
     error = function(e) {
       preamble_for_unsaved <- paste(

R/io.R

@@ -20,7 +20,7 @@ transform_utf8 <- function(path, fun, dry) {
 #' @keywords internal
 transform_utf8_one <- function(path, fun, dry) {
   rlang::arg_match(dry, c("on", "off", "fail"))
-  rlang::with_handlers(
+  rlang::try_fetch(
     {
       file_with_info <- read_utf8(path)
       # only write back when changed OR when there was a missing newline
@@ -70,7 +70,7 @@ transform_utf8_one <- function(path, fun, dry) {
 #' @param path A path to a file to read.
 #' @keywords internal
 read_utf8 <- function(path) {
-  out <- rlang::with_handlers(
+  out <- rlang::try_fetch(
     read_utf8_bare(path),
     warning = function(w) w,
     error = function(e) e

R/nest.R

@@ -330,33 +330,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/parse.R

@@ -15,7 +15,7 @@
 #'
 #' styler:::parse_safely("a + 3 -4 -> \n glück + 1")
 parse_safely <- function(text, ...) {
-  tried_parsing <- rlang::with_handlers(
+  tried_parsing <- rlang::try_fetch(
     parse(text = text, ...),
     error = function(e) e,
     warning = function(w) w

R/roxygen-examples-parse.R

@@ -66,7 +66,7 @@ parse_roxygen <- function(roxygen) {
 #' )
 #' @keywords internal
 roxygen_remove_extra_brace <- function(parsed) {
-  parsed <- rlang::with_handlers(
+  parsed <- rlang::try_fetch(
     {
       parse(text = paste0(gsub("^\\\\[[:alpha:]]*", "", parsed), collapse = ""))
       parsed
@@ -92,7 +92,7 @@ roxygen_remove_extra_brace <- function(parsed) {
             parsed <- parsed[-last(linebreak)]
           }
           # try if can be parsed (need remve dontrun)
-          worth_trying_to_remove_brace <- rlang::with_handlers(
+          worth_trying_to_remove_brace <- rlang::try_fetch(
             {
               # this will error informatively
               parse(text = gsub("^\\\\[[:alpha:]]+", "", parsed))
@@ -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])) "",

R/roxygen-examples.R

@@ -35,7 +35,7 @@ style_roxygen_code_example_one <- function(example_one,
   ) %>%
     flatten_chr()
   if (bare$example_type == "examplesIf") {
-    rlang::with_handlers(
+    rlang::try_fetch(
       parse_text(unmasked[1L]),
       error = function(e) {
         abort(paste0(

R/transform-files.R

@@ -413,7 +413,7 @@ parse_tree_must_be_identical <- function(transformers) {
 #' @keywords internal
 verify_roundtrip <- function(old_text, new_text, parsable_only = FALSE) {
   if (parsable_only) {
-    rlang::with_handlers(
+    rlang::try_fetch(
       parse_safely(new_text),
       error = function(e) {
         rlang::abort(paste0(