Skip to content

Commit 68bf6b0

Browse files
committed
Fix fallback
1 parent 3ca2025 commit 68bf6b0

1 file changed

Lines changed: 8 additions & 17 deletions

File tree

shell/kubectl_fzf.plugin.zsh

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@ __kubectl_fzf_debug()
88
fi
99
}
1010

11-
__kubectl_fzf_query_from_word()
12-
{
13-
local currentWord query
14-
if [[ $currentWord != " " ]]; then
15-
query="$currentWord"
16-
query=${query#-l}
17-
query=${query#--field-selector}
18-
query=${query#=}
19-
fi
20-
echo "$query"
21-
}
22-
2311
__kubectl_fzf_get_completions()
2412
{
2513
local cmdArgs requestComp
@@ -36,20 +24,20 @@ __kubectl_fzf_get_completions()
3624
__kubectl_fzf_debug "completion output: ${completionOutput}, exit code ${exitCode}"
3725

3826
if [[ $exitCode == 5 ]]; then
39-
# No completion available
27+
__kubectl_fzf_debug "No completion available"
4028
echo "error: No completion available: $requestComp"
4129
return
4230
fi
4331
if [[ $exitCode == 6 ]]; then
44-
# Unknow resource type, fallback to default completion
32+
__kubectl_fzf_debug "Unknow resource type, fallback to default completion"
4533
fallback="true"
4634
return
4735
fi
4836
if [[ $exitCode != 0 ]]; then
49-
# Error on completion
50-
echo "error when calling kubectl-fzf-completion: $requestComp. Output: $completionOutput"
37+
__kubectl_fzf_debug "error on completion"
5138
return
5239
fi
40+
__kubectl_fzf_debug "No error"
5341
}
5442

5543
__kubectl_fzf_kubectl() {
@@ -76,13 +64,16 @@ __kubectl_fzf_kubectl() {
7664
__kubectl_fzf_get_completions "$cmdArgs" "$currentWord"
7765
zle -R "Processing completion output"
7866
if [[ "$completionOutput" == "" ]]; then
67+
__kubectl_fzf_debug "Empty completion output"
7968
return
8069
fi
81-
if [[ -z "$fallback" ]]; then
70+
if [[ -n "$fallback" ]]; then
71+
__kubectl_fzf_debug "Fallback detected: '$fallback'"
8272
zle "${kubectl_fzf_default_completion:-expand-or-complete}"
8373
return
8474
fi
8575
if [[ "$completionOutput" == error* ]]; then
76+
__kubectl_fzf_debug "Output starts with error, fallingback: $completionOutput"
8677
zle "${kubectl_fzf_default_completion:-expand-or-complete}"
8778
return
8879
fi

0 commit comments

Comments
 (0)