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

fix(zsh): use POSH_PID as unique identifier instead of random

Browse source
This commit is contained in:
Jan De Dobbeleer 2024-07-13 21:20:40 +02:00 committed by Jan De Dobbeleer
parent 34a9b62a16
commit 4aba8fa9db
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -171,8 +171,6 @@ posh::call_widget()
# $1: The name of the widget to decorate # $1: The name of the widget to decorate
# $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
local prefix=orig-s$SECONDS-r$RANDOM # unique
orig_widget=${1};shift orig_widget=${1};shift
posh_widget=${1};shift posh_widget=${1};shift
# from this point $@ does not have $1 $2 anymore # from this point $@ does not have $1 $2 anymore
@ -183,22 +181,22 @@ function posh::decorate_widget() {
# User defined # User defined
user:*) user:*)
zle -N $prefix-$orig_widget ${widgets[$orig_widget]#*:} zle -N $POSH_PID-$orig_widget ${widgets[$orig_widget]#*:}
eval "_posh-decorated-${(q)prefix}-${(q)orig_widget}() { posh::call_widget ${(q)posh_widget} ${(q)prefix}-${(q)orig_widget} -- \"\$@\" }" eval "_posh-decorated-${(q)POSH_PID}-${(q)orig_widget}() { posh::call_widget ${(q)posh_widget} ${(q)POSH_PID}-${(q)orig_widget} -- \"\$@\" }"
zle -N $orig_widget _posh-decorated-$prefix-$orig_widget;; zle -N $orig_widget _posh-decorated-$POSH_PID-$orig_widget;;
# Built-in # Built-in
builtin:*) builtin:*)
eval "_posh-decorated-${(q)prefix}-${(q)orig_widget}() { posh::call_widget ${(q)posh_widget} .${(q)orig_widget} -- \"\$@\" }" eval "_posh-decorated-${(q)POSH_PID}-${(q)orig_widget}() { posh::call_widget ${(q)posh_widget} .${(q)orig_widget} -- \"\$@\" }"
zle -N $orig_widget _posh-decorated-$prefix-$orig_widget;; zle -N $orig_widget _posh-decorated-$POSH_PID-$orig_widget;;
# non-existent # non-existent
*) *)
if [[ $orig_widget == zle-* ]] && (( ! ${+widgets[$orig_widget]} )); then if [[ $orig_widget == zle-* ]] && (( ! ${+widgets[$orig_widget]} )); then
# The widget is a zle one and does not exist, we can safely create it # The widget is a zle one and does not exist, we can safely create it
# Otherwise, do nothing # Otherwise, do nothing
eval "_posh-decorated-${(q)prefix}-${(q)orig_widget}() { ${(q)posh_widget} }" eval "_posh-decorated-${(q)POSH_PID}-${(q)orig_widget}() { ${(q)posh_widget} }"
zle -N $orig_widget _posh-decorated-$prefix-$orig_widget zle -N $orig_widget _posh-decorated-$POSH_PID-$orig_widget
fi fi
;; ;;
esac esac