init

Author: AmirSa12

src/zsh.ts

@@ -21,12 +21,24 @@ _${name}() {
     local shellCompDirectiveFilterDirs=${ShellCompDirective.ShellCompDirectiveFilterDirs}
     local shellCompDirectiveKeepOrder=${ShellCompDirective.ShellCompDirectiveKeepOrder}
 
-    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder
+    local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder isNewWord
     local -a completions
 
     __${name}_debug "\\n========= starting completion logic =========="
     __${name}_debug "CURRENT: \${CURRENT}, words[*]: \${words[*]}"
 
+    # Track whether the cursor is positioned on a new (empty) word so we can
+    # pass an empty argument to the CLI when the user has already completed
+    # the previous token (e.g. after typing a space).
+    isNewWord=0
+    if [ \${#words[@]} -ge \${CURRENT} ] && [ -z "\${words[\${CURRENT}]}" ]; then
+        isNewWord=1
+        __${name}_debug "Detected empty current word via words[\${CURRENT}]"
+    elif [ -n "\${BUFFER}" ] && [ "\${BUFFER[-1]}" = " " ]; then
+        isNewWord=1
+        __${name}_debug "Detected trailing space in buffer"
+    fi
+
     # The user could have moved the cursor backwards on the command-line.
     # We need to trigger completion from the $CURRENT location, so we need
     # to truncate the command-line ($words) up to the $CURRENT location.
@@ -48,7 +60,7 @@ _${name}() {
 
     # Prepare the command to obtain completions, ensuring arguments are quoted for eval
     local -a args_to_quote=("\${(@)words[2,-1]}")
-    if [ "\${lastChar}" = "" ]; then
+    if [ "\${lastChar}" = "" ] || [ $isNewWord -eq 1 ]; then
         # If the last parameter is complete (there is a space following it)
         # We add an extra empty parameter so we can indicate this to the go completion code.
         __${name}_debug "Adding extra empty parameter"