chore: Keep raw component up to date, use it for assembling the NEWS (

#823)
cynkra · Nov 23, 2024 · a924e0e · a924e0e
1 parent 778f0a2
commit a924e0e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/R/auto.R b/R/auto.R
@@ -252,6 +252,8 @@ merge_dev_news <- function(fledgeling, new_version) {
     unlist(fledgeling[["news"]]$news[seq_len(n_dev)], recursive = FALSE)
   )
 
+  raw <- format_news_subsections(news, header_level = 2)
+
   new_section <- tibble::tibble(
     start = 3,
     end = NA,
@@ -260,7 +262,7 @@ merge_dev_news <- function(fledgeling, new_version) {
     date = maybe_date(fledgeling[["news"]]),
     nickname = NA,
     news = list(news),
-    raw = "",
+    raw = raw,
     title = "",
     section_state = "new"
   )

diff --git a/R/fledgling.R b/R/fledgling.R
@@ -233,24 +233,21 @@ write_news_section <- function(df) {
     )
   )
 
-  # If only uncategorized items for the version, no subheaders
-  if (length(df$news[[1]]) == 1 && names(df$news[[1]]) == default_type()) {
-    section_lines <- c(
-      version_header, "",
-      paste(df$news[[1]][[1]], collapse = "\n"), ""
-    )
+  if (isTRUE(df$h2)) {
+    header_level <- 3
   } else {
-    if (isTRUE(df$h2)) {
-      header_level <- 3
-    } else {
-      header_level <- 2
-    }
+    header_level <- 2
+  }
 
-    section_lines <- c(
-      version_header, "",
-      format_news_subsections(df$news[[1]], header_level), ""
-    )
+  raw <- df$raw
+
+  # If only uncategorized items for the version, no subheaders
+  if (grepl(paste0("^#+ ", default_type()), raw)) {
+    raw <- gsub("^#+ [^\n]*\n\n", "", raw)
   }
+
+  section_lines <- c(version_header, "", raw, "")
+
   paste0(section_lines, collapse = "\n")
 }
 

diff --git a/R/update-news.R b/R/update-news.R
@@ -24,7 +24,7 @@ update_news_impl <- function(commits,
   dev_header_present <- isTRUE(
     grepl(
       "(development version)",
-      fledgeling[["news"]][["title"]][1]
+      fledgeling[["news"]]$title[[1]]
     )
   )
 
@@ -62,7 +62,8 @@ update_news_impl <- function(commits,
         fledgeling[["news"]]$news[[1]]
       )
       combined <- purrr::discard(combined, purrr::is_empty)
-      fledgeling[["news"]]$news[[1]] <- regroup_news(combined)
+      regrouped <- regroup_news(combined)
+      fledgeling[["news"]]$raw[[1]] <- format_news_subsections(regrouped, header_level = 2)
       fledgeling[["news"]][1, ]$section_state <- "new"
     }
 
@@ -101,6 +102,8 @@ update_news_impl <- function(commits,
       news <- parse_news_md(news_lines)
     }
 
+    raw <- format_news_subsections(news, header_level = 2)
+
     section_df <- tibble::tibble(
       start = 3,
       end = NA,
@@ -109,15 +112,15 @@ update_news_impl <- function(commits,
       date = maybe_date(fledgeling[["news"]]),
       nickname = NA,
       news = list(news),
-      raw = "",
+      raw = raw,
       title = "",
       section_state = "new"
     )
 
     if (initializing) {
       fledgeling[["news"]] <- section_df
     } else {
-      fledgeling[["news"]] <- rbind(
+      fledgeling[["news"]] <- vctrs::vec_rbind(
         section_df,
         fledgeling[["news"]]
       )