Unfunction kitty-integration in zsh
This commit is contained in:
Roman Perepelitsa
parent
59505d17d5
commit
9bba38bd11
@ -33,6 +33,7 @@ fi
|
|||||||
if [[ -r "$_ksi_file" ]]; then
|
if [[ -r "$_ksi_file" ]]; then
|
||||||
'builtin' 'autoload' '-Uz' '--' "$_ksi_file"
|
'builtin' 'autoload' '-Uz' '--' "$_ksi_file"
|
||||||
"${_ksi_file:t}"
|
"${_ksi_file:t}"
|
||||||
|
'builtin' 'unfunction' '--' "${_ksi_file:t}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
'builtin' 'unset' '_ksi_file'
|
'builtin' 'unset' '_ksi_file'
|
||||||
|
|||||||
@ -12,6 +12,7 @@
|
|||||||
# if [[ -n $KITTY_INSTALLATION_DIR ]]; then
|
# if [[ -n $KITTY_INSTALLATION_DIR ]]; then
|
||||||
# autoload -Uz -- "$KITTY_INSTALLATION_DIR"/shell-integration/zsh/kitty-integration
|
# autoload -Uz -- "$KITTY_INSTALLATION_DIR"/shell-integration/zsh/kitty-integration
|
||||||
# kitty-integration
|
# kitty-integration
|
||||||
|
# unfunction kitty-integration
|
||||||
# fi
|
# fi
|
||||||
#
|
#
|
||||||
# Implementation note: We can assume that alias expansion is disabled in this
|
# Implementation note: We can assume that alias expansion is disabled in this
|
||||||
@ -23,244 +24,234 @@ builtin emulate -L zsh -o no_warn_create_global
|
|||||||
|
|
||||||
[[ -o interactive ]] || builtin return 0 # non-interactive shell
|
[[ -o interactive ]] || builtin return 0 # non-interactive shell
|
||||||
[[ -n $KITTY_SHELL_INTEGRATION ]] || builtin return 0 # integration disabled
|
[[ -n $KITTY_SHELL_INTEGRATION ]] || builtin return 0 # integration disabled
|
||||||
(( ! _ksi_state )) || builtin return 0 # already initialized
|
(( ! $+_ksi_state )) || builtin return 0 # already initialized
|
||||||
|
|
||||||
if (( ! $+_ksi_state )); then
|
# 0: no OSC 133 [AC] marks have been written yet.
|
||||||
# 0: not initialized; deferred initialization can start now.
|
# 1: the last written OSC 133 C has not been closed with D yet.
|
||||||
# 1: not initialized; waiting for deferred initialization.
|
# 2: none of the above.
|
||||||
# 2: initialized; no OSC 133 [AC] marks have been written yet.
|
builtin typeset -gi _ksi_state
|
||||||
# 3: initialized; the last written OSC 133 C has not been closed with D yet.
|
|
||||||
# 4: initialized; none of the above.
|
|
||||||
builtin typeset -gi _ksi_state=1
|
|
||||||
|
|
||||||
# Asks Kitty to print $@ to its stdout. This is for debugging.
|
# Asks Kitty to print $@ to its stdout. This is for debugging.
|
||||||
_ksi_debug_print() {
|
_ksi_debug_print() {
|
||||||
builtin local data
|
builtin local data
|
||||||
data=$(command base64 <<<"${(j: :}@}") || builtin return
|
data=$(command base64 <<<"${(j: :}@}") || builtin return
|
||||||
builtin printf '\eP@kitty-print|%s\e\\' "${data//$'\n'}"
|
builtin printf '\eP@kitty-print|%s\e\\' "${data//$'\n'}"
|
||||||
}
|
}
|
||||||
|
|
||||||
_ksi_deferred_init() {
|
# We defer initialization until precmd for several reasons:
|
||||||
(( _ksi_state = 0, 1 )) # `, 1` in case err_return is set
|
#
|
||||||
kitty-integration
|
# - Oh My Zsh and many other configs remove zle-line-init and
|
||||||
}
|
# zle-line-finish hooks when they initialize.
|
||||||
|
# - By deferring initialization we allow user rc files to opt out from some
|
||||||
|
# parts of integration. For example, if a zshrc theme prints OSC 133
|
||||||
|
# marks, it can append " no-prompt-mark" to KITTY_SHELL_INTEGRATION during
|
||||||
|
# intialization to avoid redundant marks from our code.
|
||||||
|
builtin typeset -ag precmd_functions
|
||||||
|
precmd_functions+=(_ksi_deferred_init)
|
||||||
|
|
||||||
# We defer initialization until precmd for several reasons:
|
_ksi_deferred_init() {
|
||||||
#
|
builtin emulate -L zsh -o no_warn_create_global
|
||||||
# - Oh My Zsh and many other configs remove zle-line-init and
|
|
||||||
# zle-line-finish hooks when they initialize.
|
|
||||||
# - By deferring initialization we allow user rc files to opt out from some
|
|
||||||
# parts of integration. For example, if a zshrc theme prints OSC 133
|
|
||||||
# marks, it can append " no-prompt-mark" to KITTY_SHELL_INTEGRATION during
|
|
||||||
# intialization to avoid redundant marks from our code.
|
|
||||||
builtin typeset -ag precmd_functions
|
|
||||||
precmd_functions+=(_ksi_deferred_init)
|
|
||||||
builtin return
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The rest of kitty-integration performs deferred initialization. We are being
|
# Recognized options: no-cursor, no-title, no-prompt-mark, no-complete.
|
||||||
# run from _ksi_deferred_init here.
|
builtin local -a opt
|
||||||
|
opt=(${(s: :)KITTY_SHELL_INTEGRATION})
|
||||||
|
unset KITTY_SHELL_INTEGRATION
|
||||||
|
|
||||||
(( _ksi_state = 2 ))
|
# The directory where kitty-integration is located: /.../shell-integration/zsh.
|
||||||
|
builtin local self_dir=${functions_source[kitty-integration]:A:h}
|
||||||
|
# The directory with _kitty. We store it in a directory of its own rather than
|
||||||
|
# in $self_dir because we are adding it to fpath and we don't want any other
|
||||||
|
# files to be accidentally autoloadable.
|
||||||
|
builtin local comp_dir=$self_dir/completions
|
||||||
|
|
||||||
# Recognized options: no-cursor, no-title, no-prompt-mark, no-complete.
|
# Enable completions for `kitty` command.
|
||||||
builtin local -a opt
|
if (( ! opt[(Ie)no-complete] )) && [[ -r $comp_dir/_kitty ]]; then
|
||||||
opt=(${(s: :)KITTY_SHELL_INTEGRATION})
|
if (( $+functions[compdef] )); then
|
||||||
unset KITTY_SHELL_INTEGRATION
|
# If compdef is defined, then either compinit has already run or it's
|
||||||
|
# a shim that records all calls for the purpose of replaying them after
|
||||||
|
# compinit. Either way we clobber the existing completion for kitty and
|
||||||
|
# install our own.
|
||||||
|
builtin unset "functions[_kitty]"
|
||||||
|
builtin autoload -Uz -- $comp_dir/_kitty
|
||||||
|
compdef _kitty kitty
|
||||||
|
fi
|
||||||
|
|
||||||
# The directory where kitty-integration is located: /.../shell-integration/zsh.
|
# If compdef is not set, compinit has not run yet. In this case we must
|
||||||
builtin local self_dir=${functions_source[kitty-integration]:A:h}
|
# add our completions directory to fpath so that _kitty gets picked up by
|
||||||
# The directory with _kitty. We store it in a directory of its own rather than
|
# compinit.
|
||||||
# in $self_dir because we are adding it to fpath and we don't want any other
|
#
|
||||||
# files to be accidentally autoloadable.
|
# We extend fpath even if compinit has run because it might run again.
|
||||||
builtin local comp_dir=$self_dir/completions
|
# Without our completions directory in fpath compinit would our _comp
|
||||||
|
# mapping.
|
||||||
# Enable completions for `kitty` command.
|
builtin typeset -ga fpath
|
||||||
if (( ! opt[(Ie)no-complete] )) && [[ -r $comp_dir/_kitty ]]; then
|
fpath=($comp_dir ${fpath:#$comp_dir})
|
||||||
if (( $+functions[compdef] )); then
|
|
||||||
# If compdef is defined, then either compinit has already run or it's
|
|
||||||
# a shim that records all calls for the purpose of replaying them after
|
|
||||||
# compinit. Either way we clobber the existing completion for kitty and
|
|
||||||
# install our own.
|
|
||||||
builtin unset "functions[_kitty]"
|
|
||||||
builtin autoload -Uz -- $comp_dir/_kitty
|
|
||||||
compdef _kitty kitty
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If compdef is not set, compinit has not run yet. In this case we must
|
# Enable cursor shape changes depending on the current keymap.
|
||||||
# add our completions directory to fpath so that _kitty gets picked up by
|
if (( ! opt[(Ie)no-cursor] )); then
|
||||||
# compinit.
|
# This implementation leaks blinking block cursor into external commands
|
||||||
#
|
# executed from zle. For example, users of fzf-based widgets may find
|
||||||
# We extend fpath even if compinit has run because it might run again.
|
# themselves with a blinking block cursor within fzf.
|
||||||
# Without our completions directory in fpath compinit would our _comp
|
_ksi_zle_line_init _ksi_zle_line_finish _ksi_zle_keymap_select() {
|
||||||
# mapping.
|
case ${KEYMAP-} in
|
||||||
builtin typeset -ga fpath
|
vicmd|visual) builtin print -n '\e[1 q';; # blinking block cursor
|
||||||
fpath=($comp_dir ${fpath:#$comp_dir})
|
*) builtin print -n '\e[5 q';; # blinking bar cursor
|
||||||
fi
|
esac
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
# Enable cursor shape changes depending on the current keymap.
|
# Enable semantic markup with OSC 133.
|
||||||
if (( ! opt[(Ie)no-cursor] )); then
|
if (( ! opt[(Ie)no-prompt-mark] )); then
|
||||||
# This implementation leaks blinking block cursor into external commands
|
_ksi_precmd() {
|
||||||
# executed from zle. For example, users of fzf-based widgets may find
|
builtin local -i cmd_status=$?
|
||||||
# themselves with a blinking block cursor within fzf.
|
builtin emulate -L zsh -o no_warn_create_global
|
||||||
_ksi_zle_line_init _ksi_zle_line_finish _ksi_zle_keymap_select() {
|
|
||||||
case ${KEYMAP-} in
|
|
||||||
vicmd|visual) builtin print -n '\e[1 q';; # blinking block cursor
|
|
||||||
*) builtin print -n '\e[5 q';; # blinking bar cursor
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Enable semantic markup with OSC 133.
|
# Don't write OSC 133 D when our precmd handler is invoked from zle.
|
||||||
if (( ! opt[(Ie)no-prompt-mark] )); then
|
# Some plugins do that to update prompt on cd.
|
||||||
_ksi_precmd() {
|
if ! builtin zle; then
|
||||||
builtin local -i cmd_status=$?
|
# This code works incorrectly in the presence of a precmd or chpwd
|
||||||
builtin emulate -L zsh -o no_warn_create_global
|
# hook that prints. For example, sindresorhus/pure prints an empty
|
||||||
|
# line on precmd and marlonrichert/zsh-snap prints $PWD on chpwd.
|
||||||
# Don't write OSC 133 D when our precmd handler is invoked from zle.
|
# We'll end up writing our OSC 133 D mark too late.
|
||||||
# Some plugins do that to update prompt on cd.
|
|
||||||
if ! builtin zle; then
|
|
||||||
# This code works incorrectly in the presence of a precmd or chpwd
|
|
||||||
# hook that prints. For example, sindresorhus/pure prints an empty
|
|
||||||
# line on precmd and marlonrichert/zsh-snap prints $PWD on chpwd.
|
|
||||||
# We'll end up writing our OSC 133 D mark too late.
|
|
||||||
#
|
|
||||||
# Another failure mode is when the output of a command doesn't end
|
|
||||||
# with LF and prompst_sp is set (it is by default). In this case
|
|
||||||
# we'll incorrectly state that '%' from prompt_sp is a part of the
|
|
||||||
# command's output.
|
|
||||||
if (( _ksi_state == 3 )); then
|
|
||||||
# The last written OSC 133 C has not been closed with D yet.
|
|
||||||
# Close it and supply status.
|
|
||||||
builtin printf '\e]133;D;%s\a' $cmd_status
|
|
||||||
(( _ksi_state = 4 ))
|
|
||||||
elif (( _ksi_state == 4 )); then
|
|
||||||
# There might be an unclosed OSC 133 C. Close that.
|
|
||||||
builtin print -n '\e]133;D\a'
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
builtin local mark1=$'%{\e]133;A\a%}'
|
|
||||||
if [[ -o prompt_percent ]]; then
|
|
||||||
builtin typeset -g precmd_functions
|
|
||||||
if [[ ${precmd_functions[-1]} == _ksi_precmd ]]; then
|
|
||||||
# This is the best case for us: we can add our marks to PS1 and
|
|
||||||
# PS2. This way our marks will be printed whenever zsh
|
|
||||||
# redisplays prompt: on reset-prompt, on SIGWINCH, and on
|
|
||||||
# SIGCHLD if notify is set. Themes that update prompt
|
|
||||||
# asynchronously from a `zle -F` handler might still remove our
|
|
||||||
# marks. Oh well.
|
|
||||||
builtin local mark2=$'%{\e]133;A;k=s\a%}'
|
|
||||||
# Add marks conditionally to avoid a situation where we have
|
|
||||||
# several marks in place. These conditions can have false
|
|
||||||
# positives and false negatives though.
|
|
||||||
#
|
#
|
||||||
# - False positive (with prompt_percent): PS1="%(?.$mark1.)"
|
# Another failure mode is when the output of a command doesn't end
|
||||||
# - False negative (with prompt_subst): PS1='$mark1'
|
# with LF and prompst_sp is set (it is by default). In this case
|
||||||
[[ $PS1 == *$mark1* ]] || PS1=${mark1}${PS1}
|
# we'll incorrectly state that '%' from prompt_sp is a part of the
|
||||||
[[ $PS2 == *$mark2* ]] || PS2=${mark2}${PS2}
|
# command's output.
|
||||||
(( _ksi_state = 4 ))
|
if (( _ksi_state == 1 )); then
|
||||||
else
|
# The last written OSC 133 C has not been closed with D yet.
|
||||||
# If our precmd hook is not the last, we cannot rely on prompt
|
# Close it and supply status.
|
||||||
# changes to stick, so we don't even try. At least we can move
|
builtin printf '\e]133;D;%s\a' $cmd_status
|
||||||
# our hook to the end to have better luck next time. If there is
|
(( _ksi_state = 2 ))
|
||||||
# another piece of code that wants to take this privileged
|
elif (( _ksi_state == 2 )); then
|
||||||
# position, this won't work well. We'll break them as much as
|
# There might be an unclosed OSC 133 C. Close that.
|
||||||
# they are breaking us.
|
builtin print -n '\e]133;D\a'
|
||||||
precmd_functions=(${precmd_functions:#_ksi_precmd} _ksi_precmd)
|
|
||||||
# Plugins that invoke precmd hooks from zle do that before zle
|
|
||||||
# is trashed. This means that the cursor is in the middle of
|
|
||||||
# BUFFER and we cannot print our mark there. Prompt might
|
|
||||||
# already have a mark, so the following reset-prompt will write
|
|
||||||
# it. If it doesn't, there is nothing we can do.
|
|
||||||
if ! builtin zle; then
|
|
||||||
builtin print -rn -- $mark1[3,-3]
|
|
||||||
(( _ksi_state = 4 ))
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
elif ! builtin zle; then
|
|
||||||
# Without prompt_percent we cannot patch prompt. Just print the
|
|
||||||
# mark, except when we are invoked from zle. In the latter case we
|
|
||||||
# cannot do anything.
|
|
||||||
builtin print -rn -- $mark1[3,-3]
|
|
||||||
(( _ksi_state = 4 ))
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
_ksi_preexec() {
|
builtin local mark1=$'%{\e]133;A\a%}'
|
||||||
builtin emulate -L zsh -o no_warn_create_global
|
if [[ -o prompt_percent ]]; then
|
||||||
|
builtin typeset -g precmd_functions
|
||||||
|
if [[ ${precmd_functions[-1]} == _ksi_precmd ]]; then
|
||||||
|
# This is the best case for us: we can add our marks to PS1 and
|
||||||
|
# PS2. This way our marks will be printed whenever zsh
|
||||||
|
# redisplays prompt: on reset-prompt, on SIGWINCH, and on
|
||||||
|
# SIGCHLD if notify is set. Themes that update prompt
|
||||||
|
# asynchronously from a `zle -F` handler might still remove our
|
||||||
|
# marks. Oh well.
|
||||||
|
builtin local mark2=$'%{\e]133;A;k=s\a%}'
|
||||||
|
# Add marks conditionally to avoid a situation where we have
|
||||||
|
# several marks in place. These conditions can have false
|
||||||
|
# positives and false negatives though.
|
||||||
|
#
|
||||||
|
# - False positive (with prompt_percent): PS1="%(?.$mark1.)"
|
||||||
|
# - False negative (with prompt_subst): PS1='$mark1'
|
||||||
|
[[ $PS1 == *$mark1* ]] || PS1=${mark1}${PS1}
|
||||||
|
[[ $PS2 == *$mark2* ]] || PS2=${mark2}${PS2}
|
||||||
|
(( _ksi_state = 2 ))
|
||||||
|
else
|
||||||
|
# If our precmd hook is not the last, we cannot rely on prompt
|
||||||
|
# changes to stick, so we don't even try. At least we can move
|
||||||
|
# our hook to the end to have better luck next time. If there is
|
||||||
|
# another piece of code that wants to take this privileged
|
||||||
|
# position, this won't work well. We'll break them as much as
|
||||||
|
# they are breaking us.
|
||||||
|
precmd_functions=(${precmd_functions:#_ksi_precmd} _ksi_precmd)
|
||||||
|
# Plugins that invoke precmd hooks from zle do that before zle
|
||||||
|
# is trashed. This means that the cursor is in the middle of
|
||||||
|
# BUFFER and we cannot print our mark there. Prompt might
|
||||||
|
# already have a mark, so the following reset-prompt will write
|
||||||
|
# it. If it doesn't, there is nothing we can do.
|
||||||
|
if ! builtin zle; then
|
||||||
|
builtin print -rn -- $mark1[3,-3]
|
||||||
|
(( _ksi_state = 2 ))
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
elif ! builtin zle; then
|
||||||
|
# Without prompt_percent we cannot patch prompt. Just print the
|
||||||
|
# mark, except when we are invoked from zle. In the latter case we
|
||||||
|
# cannot do anything.
|
||||||
|
builtin print -rn -- $mark1[3,-3]
|
||||||
|
(( _ksi_state = 2 ))
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# This can potentially break user prompt. Oh well. The robustness of
|
_ksi_preexec() {
|
||||||
# this code can be improved in the case prompt_subst is set because
|
builtin emulate -L zsh -o no_warn_create_global
|
||||||
# it'll allow us distinguish (not perfectly but close enough) between
|
|
||||||
# our own prompt, user prompt, and our own prompt with user additions on
|
|
||||||
# top. We cannot force prompt_subst on the user though, so we would
|
|
||||||
# still need this code for the no_prompt_subst case.
|
|
||||||
PS1=${PS1//$'%{\e]133;A\a%}'}
|
|
||||||
PS2=${PS2//$'%{\e]133;A;k=s\a%}'}
|
|
||||||
|
|
||||||
# This will work incorrectly in the presence of a preexec hook that
|
# This can potentially break user prompt. Oh well. The robustness of
|
||||||
# prints. For example, if MichaelAquilina/zsh-you-should-use installs
|
# this code can be improved in the case prompt_subst is set because
|
||||||
# its preexec hook before us, we'll incorrectly mark its output as
|
# it'll allow us distinguish (not perfectly but close enough) between
|
||||||
# belonging to the command (as if the user typed it into zle) rather
|
# our own prompt, user prompt, and our own prompt with user additions on
|
||||||
# than command output.
|
# top. We cannot force prompt_subst on the user though, so we would
|
||||||
builtin print -n '\e]133;C\a'
|
# still need this code for the no_prompt_subst case.
|
||||||
(( _ksi_state = 3 ))
|
PS1=${PS1//$'%{\e]133;A\a%}'}
|
||||||
}
|
PS2=${PS2//$'%{\e]133;A;k=s\a%}'}
|
||||||
|
|
||||||
functions[_ksi_zle_line_init]+='
|
# This will work incorrectly in the presence of a preexec hook that
|
||||||
builtin print -n "\\e]133;B\\a"'
|
# prints. For example, if MichaelAquilina/zsh-you-should-use installs
|
||||||
fi
|
# its preexec hook before us, we'll incorrectly mark its output as
|
||||||
|
# belonging to the command (as if the user typed it into zle) rather
|
||||||
|
# than command output.
|
||||||
|
builtin print -n '\e]133;C\a'
|
||||||
|
(( _ksi_state = 1 ))
|
||||||
|
}
|
||||||
|
|
||||||
# Enable terminal title changes.
|
functions[_ksi_zle_line_init]+='
|
||||||
if (( ! opt[(Ie)no-title] )); then
|
builtin print -n "\\e]133;B\\a"'
|
||||||
# We don't use `print -P` because it depends on prompt options, which
|
fi
|
||||||
# we don't control and cannot change.
|
|
||||||
|
# Enable terminal title changes.
|
||||||
|
if (( ! opt[(Ie)no-title] )); then
|
||||||
|
# We don't use `print -P` because it depends on prompt options, which
|
||||||
|
# we don't control and cannot change.
|
||||||
|
#
|
||||||
|
# We use (V) in preexec to convert control characters to something visible
|
||||||
|
# (LF becomes \n, etc.). This isn't necessary in precmd because (%) does it
|
||||||
|
# for us.
|
||||||
|
functions[_ksi_precmd]+='
|
||||||
|
builtin printf "\\e]2;%s\\a" "${(%):-%(4~|…/%3~|%~)}"'
|
||||||
|
functions[_ksi_preexec]+='
|
||||||
|
builtin printf "\\e]2;%s\\a" "${(V)1}"'
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Some zsh users manually run `source ~/.zshrc` in order to apply rc file
|
||||||
|
# changes to the current shell. This is a terrible practice that breaks many
|
||||||
|
# things, including our shell integration. For example, Oh My Zsh and Prezto
|
||||||
|
# (both very popular among zsh users) will remove zle-line-init and
|
||||||
|
# zle-line-finish hooks if .zshrc is manually sourced. Prezto will also remove
|
||||||
|
# zle-keymap-select.
|
||||||
#
|
#
|
||||||
# We use (V) in preexec to convert control characters to something visible
|
# Another common (and much more robust) way to apply rc file changes to the
|
||||||
# (LF becomes \n, etc.). This isn't necessary in precmd because (%) does it
|
# current shell is `exec zsh`. This will remove our integration from the shell
|
||||||
# for us.
|
# unless it's explicitly invoked from .zshrc. This is not an issue with
|
||||||
functions[_ksi_precmd]+='
|
# `exec zsh` but rather with our implementation of automatic shell integration.
|
||||||
builtin printf "\\e]2;%s\\a" "${(%):-%(4~|…/%3~|%~)}"'
|
builtin autoload -Uz add-zle-hook-widget
|
||||||
functions[_ksi_preexec]+='
|
if (( $+functions[_ksi_zle_line_init] )); then
|
||||||
builtin printf "\\e]2;%s\\a" "${(V)1}"'
|
add-zle-hook-widget line-init _ksi_zle_line_init
|
||||||
fi
|
fi
|
||||||
|
if (( $+functions[_ksi_zle_line_finish] )); then
|
||||||
|
add-zle-hook-widget line-finish _ksi_zle_line_finish
|
||||||
|
fi
|
||||||
|
if (( $+functions[_ksi_zle_keymap_select] )); then
|
||||||
|
add-zle-hook-widget keymap-select _ksi_zle_keymap_select
|
||||||
|
fi
|
||||||
|
|
||||||
# Some zsh users manually run `source ~/.zshrc` in order to apply rc file
|
if (( $+functions[_ksi_preexec] )); then
|
||||||
# changes to the current shell. This is a terrible practice that breaks many
|
builtin typeset -ag preexec_functions
|
||||||
# things, including our shell integration. For example, Oh My Zsh and Prezto
|
preexec_functions+=(_ksi_preexec)
|
||||||
# (both very popular among zsh users) will remove zle-line-init and
|
fi
|
||||||
# zle-line-finish hooks if .zshrc is manually sourced. Prezto will also remove
|
|
||||||
# zle-keymap-select.
|
|
||||||
#
|
|
||||||
# Another common (and much more robust) way to apply rc file changes to the
|
|
||||||
# current shell is `exec zsh`. This will remove our integration from the shell
|
|
||||||
# unless it's explicitly invoked from .zshrc. This is not an issue with
|
|
||||||
# `exec zsh` but rather with our implementation of automatic shell integration.
|
|
||||||
builtin autoload -Uz add-zle-hook-widget
|
|
||||||
if (( $+functions[_ksi_zle_line_init] )); then
|
|
||||||
add-zle-hook-widget line-init _ksi_zle_line_init
|
|
||||||
fi
|
|
||||||
if (( $+functions[_ksi_zle_line_finish] )); then
|
|
||||||
add-zle-hook-widget line-finish _ksi_zle_line_finish
|
|
||||||
fi
|
|
||||||
if (( $+functions[_ksi_zle_keymap_select] )); then
|
|
||||||
add-zle-hook-widget keymap-select _ksi_zle_keymap_select
|
|
||||||
fi
|
|
||||||
|
|
||||||
if (( $+functions[_ksi_preexec] )); then
|
builtin typeset -ag precmd_functions
|
||||||
builtin typeset -ag preexec_functions
|
if (( $+functions[_ksi_precmd] )); then
|
||||||
preexec_functions+=(_ksi_preexec)
|
precmd_functions=(${precmd_functions:/_ksi_deferred_init/_ksi_precmd})
|
||||||
fi
|
_ksi_precmd
|
||||||
|
else
|
||||||
|
precmd_functions=(${precmd_functions:#_ksi_deferred_init})
|
||||||
|
fi
|
||||||
|
|
||||||
builtin typeset -ag precmd_functions
|
# Unfunction _ksi_deferred_init to save memory. Don't unfunction
|
||||||
if (( $+functions[_ksi_precmd] )); then
|
# kitty-integration though because decent public functions aren't supposed to
|
||||||
precmd_functions=(${precmd_functions:/_ksi_deferred_init/_ksi_precmd})
|
# to unfunction themselves when invoked.
|
||||||
_ksi_precmd
|
builtin unfunction _ksi_deferred_init
|
||||||
else
|
}
|
||||||
precmd_functions=(${precmd_functions:#_ksi_deferred_init})
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Unfunction what we don't need to save memory.
|
|
||||||
builtin unfunction _ksi_deferred_init kitty-integration
|
|
||||||
builtin autoload -Uz -- $self_dir/kitty-integration
|
|
||||||
|
|||||||
@ -16,5 +16,6 @@
|
|||||||
if [[ -r "$_ksi_file" ]]; then
|
if [[ -r "$_ksi_file" ]]; then
|
||||||
'builtin' 'autoload' '-Uz' '--' "$_ksi_file"
|
'builtin' 'autoload' '-Uz' '--' "$_ksi_file"
|
||||||
"${_ksi_file:t}"
|
"${_ksi_file:t}"
|
||||||
|
'builtin' 'unfunction' '--' "${_ksi_file:t}"
|
||||||
fi
|
fi
|
||||||
'builtin' 'unset' '_ksi_file'
|
'builtin' 'unset' '_ksi_file'
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user