mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2024-12-29 04:49:39 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(zsh): widget decoration when non-existent

Browse source 
This commit fixes commit f72c1464ab.
When the widget is undefined, we need to define it instead of decoraring
it.
This PR also makes the logic more robust and in case the decoration
function is used in other cases, expand its usage.
This commit is contained in:
Polo 2024-07-11 19:13:07 +02:00 committed by Jan De Dobbeleer
parent 816ac87dc3
commit 31d5de095e
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/shell/scripts/omp.zsh
View file

@ -156,12 +156,13 @@ function enable_poshtooltips() {
# Helper function for posh::decorate_widget # Helper function for posh::decorate_widget
# It calls the posh function right after the original definition of the widget # It calls the posh function right after the original definition of the widget
# $1 is the name of the widget to call # $1 is the posh widget name
# $2 is the posh widget name # $2.. are the name of the widget to call + potential args
posh::call_widget() posh::call_widget()
{ {
builtin zle "${1}" && local posh_widget=$1;shift
${2} builtin zle "${@}" &&
${posh_widget}
} }
# decorate_widget # decorate_widget
@ -171,21 +172,35 @@ posh::call_widget()
# $2: The name of the posh function to decorate it with # $2: The name of the posh function to decorate it with
function posh::decorate_widget() { function posh::decorate_widget() {
typeset -F SECONDS typeset -F SECONDS
local prefix=orig-s$SECONDS-r$RANDOM # unique each time, in case we're sourced more than once local prefix=orig-s$SECONDS-r$RANDOM # unique
cur_widget=${1} orig_widget=${1};shift
posh_widget=${2} posh_widget=${1};shift
# from this point $@ does not have $1 $2 anymore
case ${widgets[$cur_widget]:-""} in case ${widgets[$orig_widget]:-""} in
# Already decorated: do nothing. # Already decorated: do nothing.
user:_posh-decorated-*);; user:_posh-decorated-*);;
# User defined
user:*) user:*)
zle -N $prefix-$cur_widget ${widgets[$cur_widget]#*:} zle -N $prefix-$orig_widget ${widgets[$orig_widget]#*:}
eval "_posh-decorated-${(q)prefix}-${(q)cur_widget}() { posh::call_widget ${(q)prefix}-${(q)cur_widget} ${(q)posh_widget} -- \"\$@\" }" eval "_posh-decorated-${(q)prefix}-${(q)orig_widget}() { posh::call_widget ${(q)posh_widget} ${(q)prefix}-${(q)orig_widget} -- \"\$@\" }"
zle -N $cur_widget _posh-decorated-$prefix-$cur_widget;; zle -N $orig_widget _posh-decorated-$prefix-$orig_widget;;
# For now, do not decorate if it's not a user:* # Built-in
*);; builtin:*)
eval "_posh-decorated-${(q)prefix}-${(q)orig_widget}() { posh::call_widget ${(q)posh_widget} .${(q)orig_widget} -- \"\$@\" }"
zle -N $orig_widget _posh-decorated-$prefix-$orig_widget;;
# non-existent
*)
if [[ $orig_widget == zle-* ]] && (( ! ${+widgets[$orig_widget]} )); then
# The widget is a zle one and does not exist, we can safely create it
# Otherwise, do nothing
eval "_posh-decorated-${(q)prefix}-${(q)orig_widget}() { ${(q)posh_widget} }"
zle -N $orig_widget _posh-decorated-$prefix-$orig_widget
fi
;;
esac esac
} }