From e65a777d2d39e696e500845ef46ed9abec9e2ecd Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 12 Aug 2021 20:24:15 +0100
Subject: [PATCH] Automated changelog: remove `Uncategorized` header in output
 and place items at top (#34037)

* Remove "Uncategorized" header in output and place items at top

* Tweak comment

* Make compatible with changes to use headings instead of bullets
---
 bin/plugin/commands/changelog.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/plugin/commands/changelog.js b/bin/plugin/commands/changelog.js
index 75aa7a2e0b6b4b..89de4704362aea 100644
--- a/bin/plugin/commands/changelog.js
+++ b/bin/plugin/commands/changelog.js
@@ -675,7 +675,10 @@ async function getChangelog( settings ) {
 
 			// Avoids double nesting such as "Documentation" feature under
 			// the "Documentation" section.
-			if ( group !== featureName ) {
+			if (
+				group !== featureName &&
+				featureName !== UNKNOWN_FEATURE_FALLBACK_NAME
+			) {
 				// Start new <ul> for the Feature group.
 				changelog += '#### ' + featureName + '\n';
 			}
@@ -709,11 +712,11 @@ async function getChangelog( settings ) {
 function sortFeatureGroups( featureGroups ) {
 	return Object.keys( featureGroups ).sort(
 		( featureAName, featureBName ) => {
-			// Sort "Unknown" to always be at the end
+			// Sort "uncategorized" items to *always* be at the top of the section
 			if ( featureAName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
-				return 1;
-			} else if ( featureBName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
 				return -1;
+			} else if ( featureBName === UNKNOWN_FEATURE_FALLBACK_NAME ) {
+				return 1;
 			}
 
 			// Sort by greatest number of PRs in the group first.