From 237c4e7c25754769d8fb59fa910d44abbd9d4563 Mon Sep 17 00:00:00 2001
From: Luca Bilke <bilke@tralios.de>
Date: Wed, 15 May 2024 11:42:36 +0200
Subject: [PATCH] updates
---
.config/nvim | 2 +-
.config/zsh/completions/_helm | 206 ++++++++++++++++++++++++++++++++++
.config/zsh/completions/_kube | 41 +------
3 files changed, 208 insertions(+), 41 deletions(-)
create mode 100644 .config/zsh/completions/_helm
mode change 100644 => 120000 .config/zsh/completions/_kube
diff --git a/.config/nvim b/.config/nvim
index 86810540..dcb1db48 160000
--- a/.config/nvim
+++ b/.config/nvim
@@ -1 +1 @@
-Subproject commit 86810540de88d32755f5704d999b976d1fcf233f
+Subproject commit dcb1db488b5226478642885d5616cceea1e6260e
diff --git a/.config/zsh/completions/_helm b/.config/zsh/completions/_helm
new file mode 100644
index 00000000..0ab749f9
--- /dev/null
+++ b/.config/zsh/completions/_helm
@@ -0,0 +1,206 @@
+#compdef helm
+
+# zsh completion for helm -*- shell-script -*-
+
+__helm_debug()
+{
+ local file="$BASH_COMP_DEBUG_FILE"
+ if [[ -n ${file} ]]; then
+ echo "$*" >> "${file}"
+ fi
+}
+
+_helm()
+{
+ local shellCompDirectiveError=1
+ local shellCompDirectiveNoSpace=2
+ local shellCompDirectiveNoFileComp=4
+ local shellCompDirectiveFilterFileExt=8
+ local shellCompDirectiveFilterDirs=16
+
+ local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace
+ local -a completions
+
+ __helm_debug "\n========= starting completion logic =========="
+ __helm_debug "CURRENT: ${CURRENT}, words[*]: ${words[*]}"
+
+ # 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.
+ # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+ words=("${=words[1,CURRENT]}")
+ __helm_debug "Truncated words[*]: ${words[*]},"
+
+ lastParam=${words[-1]}
+ lastChar=${lastParam[-1]}
+ __helm_debug "lastParam: ${lastParam}, lastChar: ${lastChar}"
+
+ # For zsh, when completing a flag with an = (e.g., helm -n=<TAB>)
+ # completions must be prefixed with the flag
+ setopt local_options BASH_REMATCH
+ if [[ "${lastParam}" =~ '-.*=' ]]; then
+ # We are dealing with a flag with an =
+ flagPrefix="-P ${BASH_REMATCH}"
+ fi
+
+ # Prepare the command to obtain completions
+ requestComp="${words[1]} __complete ${words[2,-1]}"
+ if [ "${lastChar}" = "" ]; 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.
+ __helm_debug "Adding extra empty parameter"
+ requestComp="${requestComp} \"\""
+ fi
+
+ __helm_debug "About to call: eval ${requestComp}"
+
+ # Use eval to handle any environment variables and such
+ out=$(eval ${requestComp} 2>/dev/null)
+ __helm_debug "completion output: ${out}"
+
+ # Extract the directive integer following a : from the last line
+ local lastLine
+ while IFS='\n' read -r line; do
+ lastLine=${line}
+ done < <(printf "%s\n" "${out[@]}")
+ __helm_debug "last line: ${lastLine}"
+
+ if [ "${lastLine[1]}" = : ]; then
+ directive=${lastLine[2,-1]}
+ # Remove the directive including the : and the newline
+ local suffix
+ (( suffix=${#lastLine}+2))
+ out=${out[1,-$suffix]}
+ else
+ # There is no directive specified. Leave $out as is.
+ __helm_debug "No directive found. Setting do default"
+ directive=0
+ fi
+
+ __helm_debug "directive: ${directive}"
+ __helm_debug "completions: ${out}"
+ __helm_debug "flagPrefix: ${flagPrefix}"
+
+ if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then
+ __helm_debug "Completion received error. Ignoring completions."
+ return
+ fi
+
+ local activeHelpMarker="_activeHelp_ "
+ local endIndex=${#activeHelpMarker}
+ local startIndex=$((${#activeHelpMarker}+1))
+ local hasActiveHelp=0
+ while IFS='\n' read -r comp; do
+ # Check if this is an activeHelp statement (i.e., prefixed with $activeHelpMarker)
+ if [ "${comp[1,$endIndex]}" = "$activeHelpMarker" ];then
+ __helm_debug "ActiveHelp found: $comp"
+ comp="${comp[$startIndex,-1]}"
+ if [ -n "$comp" ]; then
+ compadd -x "${comp}"
+ __helm_debug "ActiveHelp will need delimiter"
+ hasActiveHelp=1
+ fi
+
+ continue
+ fi
+
+ if [ -n "$comp" ]; then
+ # If requested, completions are returned with a description.
+ # The description is preceded by a TAB character.
+ # For zsh's _describe, we need to use a : instead of a TAB.
+ # We first need to escape any : as part of the completion itself.
+ comp=${comp//:/\\:}
+
+ local tab="$(printf '\t')"
+ comp=${comp//$tab/:}
+
+ __helm_debug "Adding completion: ${comp}"
+ completions+=${comp}
+ lastComp=$comp
+ fi
+ done < <(printf "%s\n" "${out[@]}")
+
+ # Add a delimiter after the activeHelp statements, but only if:
+ # - there are completions following the activeHelp statements, or
+ # - file completion will be performed (so there will be choices after the activeHelp)
+ if [ $hasActiveHelp -eq 1 ]; then
+ if [ ${#completions} -ne 0 ] || [ $((directive & shellCompDirectiveNoFileComp)) -eq 0 ]; then
+ __helm_debug "Adding activeHelp delimiter"
+ compadd -x "--"
+ hasActiveHelp=0
+ fi
+ fi
+
+ if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then
+ __helm_debug "Activating nospace."
+ noSpace="-S ''"
+ fi
+
+ if [ $((directive & shellCompDirectiveFilterFileExt)) -ne 0 ]; then
+ # File extension filtering
+ local filteringCmd
+ filteringCmd='_files'
+ for filter in ${completions[@]}; do
+ if [ ${filter[1]} != '*' ]; then
+ # zsh requires a glob pattern to do file filtering
+ filter="\*.$filter"
+ fi
+ filteringCmd+=" -g $filter"
+ done
+ filteringCmd+=" ${flagPrefix}"
+
+ __helm_debug "File filtering command: $filteringCmd"
+ _arguments '*:filename:'"$filteringCmd"
+ elif [ $((directive & shellCompDirectiveFilterDirs)) -ne 0 ]; then
+ # File completion for directories only
+ local subdir
+ subdir="${completions[1]}"
+ if [ -n "$subdir" ]; then
+ __helm_debug "Listing directories in $subdir"
+ pushd "${subdir}" >/dev/null 2>&1
+ else
+ __helm_debug "Listing directories in ."
+ fi
+
+ local result
+ _arguments '*:dirname:_files -/'" ${flagPrefix}"
+ result=$?
+ if [ -n "$subdir" ]; then
+ popd >/dev/null 2>&1
+ fi
+ return $result
+ else
+ __helm_debug "Calling _describe"
+ if eval _describe "completions" completions $flagPrefix $noSpace; then
+ __helm_debug "_describe found some completions"
+
+ # Return the success of having called _describe
+ return 0
+ else
+ __helm_debug "_describe did not find completions."
+ __helm_debug "Checking if we should do file completion."
+ if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then
+ __helm_debug "deactivating file completion"
+
+ # We must return an error code here to let zsh know that there were no
+ # completions found by _describe; this is what will trigger other
+ # matching algorithms to attempt to find completions.
+ # For example zsh can match letters in the middle of words.
+ return 1
+ else
+ # Perform file completion
+ __helm_debug "Activating file completion"
+
+ # We must return the result of this command, so it must be the
+ # last command, or else we must store its result to return it.
+ _arguments '*:filename:_files'" ${flagPrefix}"
+ fi
+ fi
+ fi
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "$funcstack[1]" = "_helm" ]; then
+ _helm
+fi
+compdef _helm helm
diff --git a/.config/zsh/completions/_kube b/.config/zsh/completions/_kube
deleted file mode 100644
index e2104745..00000000
--- a/.config/zsh/completions/_kube
+++ /dev/null
@@ -1,40 +0,0 @@
-#compdef kube
-
-local curcontext="$curcontext" state line expl ret=1
-
-function _kube_clusters() {
- find "$TRALIOS_KUBECONFIG_DIR" \
- -maxdepth 1 \
- -type f \
- -regex ".*\.ya?ml" |
- xargs -n 1 basename |
- sed 's/\.ya\?ml$//'
-}
-
-function _kube_args() {
- index=$1
- kubeconfig=$(find "$TRALIOS_KUBECONFIG_DIR" -maxdepth 1 -type f -regex ".*/${words[3]}\.ya?ml")
-
- case "${words[2]}" in
- (shell)
- case "$index" in
- (3)
- kubectl --kubeconfig "${kubeconfig}" get namespaces | tail -n +2 | awk "{ print \$1 }"
- ;;
- (4)
- kubectl --kubeconfig "${kubeconfig}" -n "${words[4]}" get pods | tail -n +2 | awk "{ print \$1 }"
- ;;
- esac
- ;;
- (pv_migrate)
- if [ "$index" = "3" ]; then
- _kube_clusters
- fi
- ;;
- esac
-}
-
-_arguments '1:action:(shell k9s ctl dash prom traefik rook debug_start debug_kill pv_migrate)'
-_arguments '2:cluster:($(_kube_clusters))'
-_arguments '3:arguments:($(_kube_args 3))'
-_arguments '4:arguments:($(_kube_args 4))'
diff --git a/.config/zsh/completions/_kube b/.config/zsh/completions/_kube
new file mode 120000
index 00000000..9edc3f3b
--- /dev/null
+++ b/.config/zsh/completions/_kube
@@ -0,0 +1 @@
+../../../../../../../Documents/dev/tralios/tralios-kube/_kube
\ No newline at end of file