From a9b6af5b231227f8ab91f922adc5e0d0a2e6fc08 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Tue, 2 Jan 2024 21:01:17 +0100
Subject: [PATCH] refactor(minikube): standardize completion generation

Closes #10763
---
 plugins/minikube/minikube.plugin.zsh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugins/minikube/minikube.plugin.zsh b/plugins/minikube/minikube.plugin.zsh
index e87abceaf..0d2737052 100644
--- a/plugins/minikube/minikube.plugin.zsh
+++ b/plugins/minikube/minikube.plugin.zsh
@@ -1,13 +1,13 @@
-# Autocompletion for Minikube.
-#
-if (( $+commands[minikube] )); then
-    __MINIKUBE_COMPLETION_FILE="${ZSH_CACHE_DIR}/minikube_completion"
-
-    if [[ ! -f $__MINIKUBE_COMPLETION_FILE ]]; then
-        minikube completion zsh >! $__MINIKUBE_COMPLETION_FILE
-    fi
-
-    [[ -f $__MINIKUBE_COMPLETION_FILE ]] && source $__MINIKUBE_COMPLETION_FILE
-
-    unset __MINIKUBE_COMPLETION_FILE
+if (( ! $+commands[minikube] )); then
+  return
 fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `minikube`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_minikube" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _minikube
+  _comps[minikube]=_minikube
+fi
+
+minikube completion zsh >| "$ZSH_CACHE_DIR/completions/_minikube" &|