From a3e7260d0985747340427391e8e03c3defd1e4b4 Mon Sep 17 00:00:00 2001 From: oldfatcrab Date: Tue, 17 Oct 2023 02:24:55 -0700 Subject: [PATCH 1/4] Quick and dirty approach to add alias `$desc` --- fzf-tab.zsh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fzf-tab.zsh b/fzf-tab.zsh index b81716d..391e75a 100644 --- a/fzf-tab.zsh +++ b/fzf-tab.zsh @@ -71,13 +71,19 @@ else # dscr - the string to show to users # word - the string to be inserted - local dscr word i + local dscr word i __tmp_alias + for i in {1..$#__hits}; do word=$__hits[i] dscr=$__dscr[i] if [[ -n $dscr ]]; then dscr=${dscr//$'\n'} elif [[ -n $word ]]; then - dscr=$word + __tmp_alias=(${(s/ is an alias for /)$(type $word)}) + if [[ ${#__tmp_alias} -eq 2 ]]; then + dscr="$__tmp_alias[1] :=> $__tmp_alias[2]" + else + dscr=$word + fi fi _ftb_compcap+=$dscr$'\2'$__tmp_value$'\0word\0'$word done From 6598cbc1f4984ce9849bcf1ddc58bc51ec231783 Mon Sep 17 00:00:00 2001 From: oldfatcrab Date: Wed, 18 Oct 2023 01:29:43 -0700 Subject: [PATCH 2/4] add alias to description --- fzf-tab.zsh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fzf-tab.zsh b/fzf-tab.zsh index 391e75a..253cae7 100644 --- a/fzf-tab.zsh +++ b/fzf-tab.zsh @@ -77,13 +77,10 @@ word=$__hits[i] dscr=$__dscr[i] if [[ -n $dscr ]]; then dscr=${dscr//$'\n'} + elif [[ "$expl" == '[alias]' ]]; then + dscr="$(echo $(alias $word) | sed 's/=/ :=> /')" elif [[ -n $word ]]; then - __tmp_alias=(${(s/ is an alias for /)$(type $word)}) - if [[ ${#__tmp_alias} -eq 2 ]]; then - dscr="$__tmp_alias[1] :=> $__tmp_alias[2]" - else - dscr=$word - fi + dscr=$word fi _ftb_compcap+=$dscr$'\2'$__tmp_value$'\0word\0'$word done From 1dd5156c8b80d4aba5891c132246ac8c4b12cf06 Mon Sep 17 00:00:00 2001 From: oldfatcrab Date: Wed, 18 Oct 2023 02:03:40 -0700 Subject: [PATCH 3/4] remove var --- fzf-tab.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fzf-tab.zsh b/fzf-tab.zsh index 253cae7..dd629b1 100644 --- a/fzf-tab.zsh +++ b/fzf-tab.zsh @@ -71,7 +71,7 @@ else # dscr - the string to show to users # word - the string to be inserted - local dscr word i __tmp_alias + local dscr word i for i in {1..$#__hits}; do word=$__hits[i] dscr=$__dscr[i] From 9aa5c99dda23c48c62df298e11d68da98a851956 Mon Sep 17 00:00:00 2001 From: oldfatcrab Date: Wed, 18 Oct 2023 04:22:26 -0700 Subject: [PATCH 4/4] remove newline --- fzf-tab.zsh | 1 - 1 file changed, 1 deletion(-) diff --git a/fzf-tab.zsh b/fzf-tab.zsh index dd629b1..9f10e5e 100644 --- a/fzf-tab.zsh +++ b/fzf-tab.zsh @@ -72,7 +72,6 @@ # dscr - the string to show to users # word - the string to be inserted local dscr word i - for i in {1..$#__hits}; do word=$__hits[i] dscr=$__dscr[i] if [[ -n $dscr ]]; then