From 386744ff10e45a64b758f3dbd11a7cbf33de1c00 Mon Sep 17 00:00:00 2001
From: Googler <twerth@google.com>
Date: Mon, 10 Jun 2024 08:20:20 -0700
Subject: [PATCH] Do not print empty `<dl></dl>` tags when an option category
 is empty.

PiperOrigin-RevId: 641908436
Change-Id: I218d8a2df72818fd9dadb5cc272e4a3b3b73bfcf
---
 .../devtools/common/options/OptionsParser.java       | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/google/devtools/common/options/OptionsParser.java b/src/main/java/com/google/devtools/common/options/OptionsParser.java
index 1759c3fe16bb03..5dbc3e22202322 100644
--- a/src/main/java/com/google/devtools/common/options/OptionsParser.java
+++ b/src/main/java/com/google/devtools/common/options/OptionsParser.java
@@ -535,15 +535,13 @@ public String describeOptionsHtml(Escaper escaper, String productName) {
 
     for (Map.Entry<OptionDocumentationCategory, List<OptionDefinition>> e :
         optionsByCategory.entrySet()) {
-      desc.append("<dl>");
-      String categoryDescription = optionCategoryDescriptions.get(e.getKey());
       List<OptionDefinition> categorizedOptionsList = e.getValue();
-
-      // Describe the category if we're going to end up using it at all.
-      if (!categorizedOptionsList.isEmpty()) {
-        desc.append(escaper.escape(categoryDescription)).append(":\n");
+      if (categorizedOptionsList.isEmpty()) {
+        continue;
       }
-      // Describe the options in this category.
+      String categoryDescription = optionCategoryDescriptions.get(e.getKey());
+
+      desc.append("<dl>").append(escaper.escape(categoryDescription)).append(":\n");
       for (OptionDefinition optionDef : categorizedOptionsList) {
         OptionsUsage.getUsageHtml(optionDef, desc, escaper, impl.getOptionsData(), true);
       }