From e31587ec1e5d18d5e99506587616b568e8ebd466 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 16 Nov 2022 18:05:27 +0530
Subject: [PATCH] Ensure auto-generated entries such as --help are present for
 completion by calling Validate()

---
 tools/cli/completion-main.go | 1 +
 tools/cmd/at/shell.go        | 1 +
 tools/cmd/tool/main.go       | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/tools/cli/completion-main.go b/tools/cli/completion-main.go
index d787c1e55..d9d4de6fb 100644
--- a/tools/cli/completion-main.go
+++ b/tools/cli/completion-main.go
@@ -88,6 +88,7 @@ func GenerateCompletions(args []string) error {
 		re(root)
 	}
 
+	root.Validate()
 	all_completions := make([]*Completions, 0, 1)
 	for _, argv := range all_argv {
 		all_completions = append(all_completions, root.GetCompletions(argv, init_completions[output_type]))
diff --git a/tools/cmd/at/shell.go b/tools/cmd/at/shell.go
index 64e83a622..c837ffc0d 100644
--- a/tools/cmd/at/shell.go
+++ b/tools/cmd/at/shell.go
@@ -186,6 +186,7 @@ func completions(before_cursor, after_cursor string) (ans *cli.Completions) {
 	root := cli.NewRootCommand()
 	c := root.AddSubCommand(&cli.Command{Name: "kitty-tool"})
 	EntryPoint(c)
+	root.Validate()
 	ans = root.GetCompletions(argv, nil)
 	ans.CurrentWordIdx = position_of_last_arg - len(prefix)
 	return
diff --git a/tools/cmd/tool/main.go b/tools/cmd/tool/main.go
index 50dffa85a..b39b81699 100644
--- a/tools/cmd/tool/main.go
+++ b/tools/cmd/tool/main.go
@@ -12,6 +12,8 @@ import (
 var _ = fmt.Print
 
 func KittyToolEntryPoints(root *cli.Command) {
+	root.Add(cli.OptionSpec{
+		Name: "--version", Type: "bool-set", Help: "The current kitty version."})
 	// @
 	at.EntryPoint(root)
 	// update-self