From 0f10556b5449727c2d36602c7cce08d8b367d760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Sun, 24 Nov 2024 19:57:19 +0100
Subject: [PATCH 1/3] Style

---
 R/auto.R | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/R/auto.R b/R/auto.R
index 89f01926..1e338f98 100644
--- a/R/auto.R
+++ b/R/auto.R
@@ -253,10 +253,9 @@ merge_dev_news <- function(fledgeling, new_version) {
 
   raw <- write_news_sections(fledgeling[["news"]][seq_len(n_dev), ])
   versions <- parse_news_md(raw)
+  news <- news_from_versions(versions)
 
-  news <- regroup_news(
-    unlist(news_from_versions(versions), recursive = FALSE)
-  )
+  news <- regroup_news(unlist(news, recursive = FALSE))
 
   raw <- format_news_subsections(news, header_level = 2)
 

From f9f662107ef6a2d33dcb7004386ba04960d40618 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Sun, 24 Nov 2024 19:57:44 +0100
Subject: [PATCH 2/3] Do not add news column

---
 R/auto.R        | 1 -
 R/update-news.R | 1 -
 2 files changed, 2 deletions(-)

diff --git a/R/auto.R b/R/auto.R
index 1e338f98..fd305608 100644
--- a/R/auto.R
+++ b/R/auto.R
@@ -266,7 +266,6 @@ merge_dev_news <- function(fledgeling, new_version) {
     version = new_version,
     date = maybe_date(fledgeling[["news"]]),
     nickname = NA,
-    news = list(news),
     raw = raw,
     title = "",
     section_state = "new"
diff --git a/R/update-news.R b/R/update-news.R
index d5c6b52e..42845ffd 100644
--- a/R/update-news.R
+++ b/R/update-news.R
@@ -124,7 +124,6 @@ add_news_to_fledgeling <- function(
     version = new_version,
     date = maybe_date(fledgeling[["news"]]),
     nickname = NA,
-    news = list(news),
     raw = raw,
     title = "",
     section_state = "new"

From 809f3dde2c476a271215df67c7ddaf0e5b98cbe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill@cynkra.com>
Date: Sun, 24 Nov 2024 19:58:03 +0100
Subject: [PATCH 3/3] Move code

---
 R/update-news.R | 64 ++++++++++++++++++++++++-------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/R/update-news.R b/R/update-news.R
index 42845ffd..fc40bbfb 100644
--- a/R/update-news.R
+++ b/R/update-news.R
@@ -22,38 +22,6 @@ update_news_impl <- function(commits,
   add_news_to_fledgeling(fledgeling, news_lines, which, news_items)
 }
 
-add_news_to_fledgeling_samedev <- function(fledgeling, news_lines) {
-  # Append and regroup
-  initializing <- is.null(fledgeling[["news"]])
-
-  if (initializing) {
-    fledgeling[["news"]] <- tibble::tibble(
-      start = 3,
-      h2 = FALSE,
-      version = fledgeling[["version"]],
-      date = "",
-      nickname = "",
-      original = "",
-      news = list(parse_news_lines(news_lines)),
-      raw = news_lines,
-      section_state = "new"
-    )
-  } else {
-    old_news <- news_from_versions(parse_news_md(fledgeling[["news"]]$raw[[1]]))[[1]]
-    combined <- c(parse_news_lines(news_lines), old_news)
-    combined <- purrr::discard(combined, purrr::is_empty)
-    regrouped <- regroup_news(combined)
-    fledgeling[["news"]]$raw[[1]] <- format_news_subsections(regrouped, header_level = 2)
-    fledgeling[["news"]][1, ]$section_state <- "new"
-  }
-
-  if (fledge_chatty()) {
-    cli_alert("Added items to {.file {news_path()}}.")
-  }
-
-  fledgeling
-}
-
 add_news_to_fledgeling <- function(
   fledgeling,
   news_lines,
@@ -145,6 +113,38 @@ add_news_to_fledgeling <- function(
   fledgeling
 }
 
+
+add_news_to_fledgeling_samedev <- function(fledgeling, news_lines) {
+  # Append and regroup
+  initializing <- is.null(fledgeling[["news"]])
+
+  if (initializing) {
+    fledgeling[["news"]] <- tibble::tibble(
+      start = 3,
+      h2 = FALSE,
+      version = fledgeling[["version"]],
+      date = "",
+      nickname = "",
+      original = "",
+      raw = news_lines,
+      section_state = "new"
+    )
+  } else {
+    old_news <- news_from_versions(parse_news_md(fledgeling[["news"]]$raw[[1]]))[[1]]
+    combined <- c(parse_news_lines(news_lines), old_news)
+    combined <- purrr::discard(combined, purrr::is_empty)
+    regrouped <- regroup_news(combined)
+    fledgeling[["news"]]$raw[[1]] <- format_news_subsections(regrouped, header_level = 2)
+    fledgeling[["news"]][1, ]$section_state <- "new"
+  }
+
+  if (fledge_chatty()) {
+    cli_alert("Added items to {.file {news_path()}}.")
+  }
+
+  fledgeling
+}
+
 news_path <- function() {
   "NEWS.md"
 }