From c03a945a3cfb6b114d02ef31df8252d851598be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc@mcornella.com>
Date: Sat, 22 Nov 2025 17:58:22 +0100
Subject: [PATCH] Use convention for completion file

---
 plugins/pulumi/pulumi.plugin.zsh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/plugins/pulumi/pulumi.plugin.zsh b/plugins/pulumi/pulumi.plugin.zsh
index 892bad306..4a8541251 100644
--- a/plugins/pulumi/pulumi.plugin.zsh
+++ b/plugins/pulumi/pulumi.plugin.zsh
@@ -1,16 +1,17 @@
-# Pulumi oh-my-zsh plugin (short aliases)
-
-if ! command -v pulumi &> /dev/null; then
+if (( ! $+commands[pulumi] )); then
   return
 fi
 
-# Load completion if available
-if pulumi gen-completion zsh &> /dev/null; then
-  autoload -U +X compinit && compinit
-  pulumi gen-completion zsh >! "${ZSH_CACHE_DIR:-$HOME/.zsh_cache}/_pulumi"
-  fpath=("${ZSH_CACHE_DIR:-$HOME/.zsh_cache}" $fpath)
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `pulumi`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_pulumi" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _pulumi
+  _comps[pulumi]=_pulumi
 fi
 
+pulumi gen-completion zsh >| "$ZSH_CACHE_DIR/completions/_pulumi" &|
+
 # Aliases
 alias p='pulumi'
 alias pu='pulumi up'