From 66fcd7370e0332cdce046023b7717d6769a85b46 Mon Sep 17 00:00:00 2001
From: mattirn <matti.rintanikkola@gmail.com>
Date: Fri, 19 Jun 2020 19:11:41 +0200
Subject: [PATCH] Builtins title is shown in command help without commands,
 fixes #546

---
 .../java/org/jline/console/impl/SystemRegistryImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/console/src/main/java/org/jline/console/impl/SystemRegistryImpl.java b/console/src/main/java/org/jline/console/impl/SystemRegistryImpl.java
index db12cf130..5b01b48e4 100644
--- a/console/src/main/java/org/jline/console/impl/SystemRegistryImpl.java
+++ b/console/src/main/java/org/jline/console/impl/SystemRegistryImpl.java
@@ -1389,7 +1389,7 @@ private void helpTopic(List<String> topics) {
                 printCommands(systemCommands.keySet(), max);
             }
         }
-        if (isInTopics(topics, "Builtins")) {
+        if (isInTopics(topics, "Builtins") && !builtinCommands.isEmpty()) {
             printHeader("Builtins");
             if (withInfo) {
                 for (Map.Entry<String, String> entry : builtinCommands.entrySet()) {
@@ -1400,7 +1400,7 @@ private void helpTopic(List<String> topics) {
             }
         }
         for (CommandRegistry r : commandRegistries) {
-            if (isBuiltinRegistry(r) || !isInTopics(topics, r.name())) {
+            if (isBuiltinRegistry(r) || !isInTopics(topics, r.name()) || r.commandNames().isEmpty()) {
                 continue;
             }
             TreeSet<String> cmds = new TreeSet<>(r.commandNames());
@@ -1413,7 +1413,7 @@ private void helpTopic(List<String> topics) {
                 printCommands(cmds, max);
             }
         }
-        if (consoleId != null && isInTopics(topics, "Scripts")) {
+        if (consoleId != null && isInTopics(topics, "Scripts") && !scriptStore.getScripts().isEmpty()) {
             printHeader("Scripts");
             if (withInfo) {
                 for (String c : scriptStore.getScripts()) {