Jonathan Hodgson
5 years ago
parent
f2251d9af5
commit
aea3ba2730
3 changed files with 179 additions and 115 deletions
@ -0,0 +1,88 @@ |
||||
# This file provides my current word completion |
||||
# Unlike standard completion provided by zsh, this completion is based on the current word rather than the current command |
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Prompts the user to select a wordlist from the wordlists folder |
||||
wordlistSelect() { |
||||
fd -a --type f --hidden --follow --color=always --exclude .git --exclude \*.md --exclude \*.gif --exclude \*.jpg --exclude \*.png --exclude \*.lua --exclude \*.jar --exclude \*.pl '' /usr/share/wordlists/ | fzf --preview 'bat --color=always {}' |
||||
} |
||||
|
||||
word_replace(){ |
||||
local ret=1 |
||||
local word="$1" |
||||
local cmd="$2" |
||||
case "$word" in |
||||
wl) wordlistSelect; return 0 ;; |
||||
myip) ip route | grep -oE '(dev|src) [^ ]+' | sed 'N;s/\n/,/;s/src //;s/dev //' | awk -F',' '{print $2 " " $1}' | sort -u | fzf -1 --no-preview | cut -d' ' -f1; return 0 ;; |
||||
esac |
||||
return "$ret" |
||||
} |
||||
|
||||
currentwordcomplete(){ |
||||
local tokens cmd swap ret=1 lastWord |
||||
# http://zsh.sourceforge.net/FAQ/zshfaq03.html |
||||
# http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags |
||||
|
||||
# Use zsh's shell parsing to split lbuffer into items |
||||
# This takes into account quoting and escaping |
||||
tokens=(${(z)LBUFFER}) |
||||
|
||||
# If there isn't anythng typed, fall back to old tab binding |
||||
if [ ${#tokens} -lt 1 ]; then |
||||
zle ${currentword_default_completion:-expand-or-complete} |
||||
return |
||||
fi |
||||
|
||||
# Assume the first element |
||||
# TODO: make this work for multiple commands chained with | or > or && etc. |
||||
# TODO: make this work when command prepended with variables eg a=2 foo bar |
||||
# foo is the command name |
||||
cmd="${tokens[1]}" |
||||
lastWord="${tokens[-1]}" |
||||
|
||||
# Check we haven't pushed space |
||||
if [ "${LBUFFER[-1]}" != " " ]; then |
||||
swap="$(word_replace "$lastWord" "$cmd")" |
||||
ret="$?" |
||||
|
||||
# This part checks if the part after an = is completable |
||||
if [ "$ret" -ne "0" ]; then |
||||
local afterEqual="${lastWord##*=}" |
||||
local beforeEqual="${lastWord%=*}" |
||||
# If they are different, there is an equals in the word |
||||
if [ "$afterEqual" != "$lastWord" ]; then |
||||
swap="${beforeEqual}=$(word_replace "$afterEqual" "$cmd")" |
||||
ret="$?" |
||||
fi |
||||
fi |
||||
fi |
||||
|
||||
|
||||
if [ "$ret" -eq "0" ]; then |
||||
if [ -n "$swap" ]; then |
||||
tokens[-1]="$swap" |
||||
LBUFFER="${tokens[@]}" |
||||
fi |
||||
zle reset-prompt |
||||
return 0 |
||||
else |
||||
zle ${currentword_default_completion:-expand-or-complete} |
||||
return |
||||
fi |
||||
} |
||||
|
||||
# Record what ctrl+i is currently set to |
||||
# That way we can call it if jhcompletion doesn't result in anything |
||||
[ -z "$currentword_default_completion" ] && { |
||||
binding=$(bindkey '^I') |
||||
[[ $binding =~ 'undefined-key' ]] || currentword_default_completion=$binding[(s: :w)2] |
||||
unset binding |
||||
} |
||||
zle -N currentwordcomplete |
||||
bindkey '^I' currentwordcomplete |
||||
|
||||
|
||||
|
||||
@ -0,0 +1,72 @@ |
||||
# This file will try to provide completion before the default completion system |
||||
# This allows me to overide parts of command completion. Normally, this is so I can use fzf. |
||||
|
||||
overidecomplete(){ |
||||
local tokens cmd toadd ret=1 lastWord |
||||
# http://zsh.sourceforge.net/FAQ/zshfaq03.html |
||||
# http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags |
||||
|
||||
# Use zsh's shell parsing to split lbuffer into items |
||||
# This takes into account quoting and escaping |
||||
tokens=(${(z)LBUFFER}) |
||||
|
||||
# If there isn't anythng typed, fall back to old tab binding |
||||
if [ ${#tokens} -lt 1 ]; then |
||||
zle ${overide_default_completion:-expand-or-complete} |
||||
return |
||||
fi |
||||
|
||||
# Assume the first element |
||||
# TODO: make this work for multiple commands chained with | or > or && etc. |
||||
# TODO: make this work when command prepended with variables eg a=2 foo bar |
||||
# foo is the command name |
||||
cmd="${tokens[1]}" |
||||
lastWord="${tokens[-1]}" |
||||
|
||||
# If using sudo, check the second word |
||||
[ "$cmd" = "sudo" ] && cmd="${tokens[2]}" |
||||
|
||||
# Check we have pushed space |
||||
# This means that we are not trying to complete a partial word - leave that to zsh's completion system |
||||
if [ "${LBUFFER[-1]}" = " " ]; then |
||||
case "$cmd" in |
||||
# Pacman and yay have almost the same syntac so for simplicities sake, treat them the same |
||||
pacman|yay) |
||||
case "$lastWord" in |
||||
# If I want to install something, give a list of things to install |
||||
-S) toadd="$($cmd -Slq | fzf -m --preview "$cmd -Si {1}" | tr '\n' ' ')"; ret=0 ;; |
||||
# If I want to uninstall something, give a list of things to uninstall |
||||
-R*) toadd="$($cmd -Qq | fzf -m --preview "$cmd -Qi {1}" | tr '\n' ' ')"; ret=0 ;; |
||||
esac ;; |
||||
esac |
||||
fi |
||||
|
||||
|
||||
if [ "$ret" -eq "0" ]; then |
||||
if [ -n "$toadd" ]; then |
||||
tokens+=("$toadd") |
||||
LBUFFER="${tokens[@]}" |
||||
fi |
||||
zle reset-prompt |
||||
return 0 |
||||
else |
||||
zle ${overide_default_completion:-expand-or-complete} |
||||
# Redrawing here means I can use fzf in my completion functions |
||||
# This is not ideal, I would preferably run this after fzf in the completion functions but can't because they are not widgets. |
||||
zle reset-prompt |
||||
return |
||||
fi |
||||
} |
||||
|
||||
# Record what ctrl+i is currently set to |
||||
# That way we can call it if jhcompletion doesn't result in anything |
||||
[ -z "$overide_default_completion" ] && { |
||||
binding=$(bindkey '^I') |
||||
[[ $binding =~ 'undefined-key' ]] || overide_default_completion=$binding[(s: :w)2] |
||||
unset binding |
||||
} |
||||
zle -N overidecomplete |
||||
bindkey '^I' overidecomplete |
||||
|
||||
|
||||
|
||||
Loading…
Reference in new issue