From 3269a44cfe41e1b4eb92f76dd16e8bc6a52e44d3 Mon Sep 17 00:00:00 2001 From: Daniele Pintore Date: Sat, 2 Aug 2025 13:05:08 +0200 Subject: [PATCH] Revert "add docker auto completions" This reverts commit eb419091c75ad05a82a5578526d777fdb0874755. --- .config/zsh/completions/_docker | 212 -------------------- .config/zsh/conf.d/03_auto_completition.zsh | 5 + .config/zsh/conf.d/_env.zsh | 2 - 3 files changed, 5 insertions(+), 214 deletions(-) delete mode 100644 .config/zsh/completions/_docker diff --git a/.config/zsh/completions/_docker b/.config/zsh/completions/_docker deleted file mode 100644 index 5a15120..0000000 --- a/.config/zsh/completions/_docker +++ /dev/null @@ -1,212 +0,0 @@ -#compdef docker -compdef _docker docker - -# zsh completion for docker -*- shell-script -*- - -__docker_debug() -{ - local file="$BASH_COMP_DEBUG_FILE" - if [[ -n ${file} ]]; then - echo "$*" >> "${file}" - fi -} - -_docker() -{ - local shellCompDirectiveError=1 - local shellCompDirectiveNoSpace=2 - local shellCompDirectiveNoFileComp=4 - local shellCompDirectiveFilterFileExt=8 - local shellCompDirectiveFilterDirs=16 - local shellCompDirectiveKeepOrder=32 - - local lastParam lastChar flagPrefix requestComp out directive comp lastComp noSpace keepOrder - local -a completions - - __docker_debug "\n========= starting completion logic ==========" - __docker_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]}") - __docker_debug "Truncated words[*]: ${words[*]}," - - lastParam=${words[-1]} - lastChar=${lastParam[-1]} - __docker_debug "lastParam: ${lastParam}, lastChar: ${lastChar}" - - # For zsh, when completing a flag with an = (e.g., docker -n=) - # 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. - __docker_debug "Adding extra empty parameter" - requestComp="${requestComp} \"\"" - fi - - __docker_debug "About to call: eval ${requestComp}" - - # Use eval to handle any environment variables and such - out=$(eval ${requestComp} 2>/dev/null) - __docker_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[@]}") - __docker_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. - __docker_debug "No directive found. Setting do default" - directive=0 - fi - - __docker_debug "directive: ${directive}" - __docker_debug "completions: ${out}" - __docker_debug "flagPrefix: ${flagPrefix}" - - if [ $((directive & shellCompDirectiveError)) -ne 0 ]; then - __docker_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 - __docker_debug "ActiveHelp found: $comp" - comp="${comp[$startIndex,-1]}" - if [ -n "$comp" ]; then - compadd -x "${comp}" - __docker_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/:} - - __docker_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 - __docker_debug "Adding activeHelp delimiter" - compadd -x "--" - hasActiveHelp=0 - fi - fi - - if [ $((directive & shellCompDirectiveNoSpace)) -ne 0 ]; then - __docker_debug "Activating nospace." - noSpace="-S ''" - fi - - if [ $((directive & shellCompDirectiveKeepOrder)) -ne 0 ]; then - __docker_debug "Activating keep order." - keepOrder="-V" - 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}" - - __docker_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 - __docker_debug "Listing directories in $subdir" - pushd "${subdir}" >/dev/null 2>&1 - else - __docker_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 - __docker_debug "Calling _describe" - if eval _describe $keepOrder "completions" completions $flagPrefix $noSpace; then - __docker_debug "_describe found some completions" - - # Return the success of having called _describe - return 0 - else - __docker_debug "_describe did not find completions." - __docker_debug "Checking if we should do file completion." - if [ $((directive & shellCompDirectiveNoFileComp)) -ne 0 ]; then - __docker_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 - __docker_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]" = "_docker" ]; then - _docker -fi diff --git a/.config/zsh/conf.d/03_auto_completition.zsh b/.config/zsh/conf.d/03_auto_completition.zsh index 618a068..e5bf75b 100644 --- a/.config/zsh/conf.d/03_auto_completition.zsh +++ b/.config/zsh/conf.d/03_auto_completition.zsh @@ -2,11 +2,13 @@ # Auto completition if [[ -o interactive ]]; then + function setup_completion { autoload -U compinit zstyle ':completion:*' menu select zmodload zsh/complist compinit _comp_options+=(globdots) # Include hidden files. + unset -f setup_completion # cleanup the function # dotfiles manager autocompletition trick for add and rm command # definition on the config functions file (functions/config.zsh) @@ -17,4 +19,7 @@ if [[ -o interactive ]]; then bindkey -M menuselect 'k' vi-up-line-or-history bindkey -M menuselect 'l' vi-forward-char bindkey -M menuselect 'j' vi-down-line-or-history +} + precmd_functions+=(setup_completion) fi + diff --git a/.config/zsh/conf.d/_env.zsh b/.config/zsh/conf.d/_env.zsh index b3e5ffc..c935c5f 100644 --- a/.config/zsh/conf.d/_env.zsh +++ b/.config/zsh/conf.d/_env.zsh @@ -11,8 +11,6 @@ path+=$ANDROID_HOME/tools path+=$ANDROID_HOME/tools/bin path+=$ANDROID_HOME/platform-tools -export FPATH="$ZDOTDIR/completions:$FPATH" - export EDITOR=nvim export QT_QPA_PLATFORMTHEME=qt5ct