mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-01-23 02:35:38 +01:00
feat(fancy-ctrl-z): Toggle between last two suspended jobs in every case
Allows using the fancy-ctrl-z functionality of toggling between the last two suspended jobs (`%+` and `%-`, respectively) even if there are more than two jobs suspended. Made the whole implementation more robust, especially in case Ctrl-Z is pressed with an existing non-empty prompt buffer. Fixed a bug where jobs with multiple different working directories would cause the back-and-forth functionality to not work.
This commit is contained in:
parent
6f7a50dca8
commit
2bbd7156c3
2 changed files with 58 additions and 22 deletions
|
|
@ -1,16 +1,38 @@
|
|||
fancy-ctrl-z () {
|
||||
if [[ $#BUFFER -eq 0 ]]; then
|
||||
BUFFER="fg"
|
||||
local -i hascmd=$(( ${#BUFFER} > 0 ))
|
||||
local -a sjobs=("${(@f)$(jobs -s)}")
|
||||
local -a opts=("${(@f)$(setopt)}")
|
||||
local -i isverbose=$opts[(Ie)verbose]
|
||||
# In Zsh, arrays are 1-indexed, and an empty array has size 1, not 0.
|
||||
# So we must check the first element's length to see whether it describes a
|
||||
# suspended job.
|
||||
local -i nsjobs="${#${(@)sjobs}}"
|
||||
local -i hassjob=$(( ${#sjobs[1]} > 0 ))
|
||||
local -i hassjobs=$(( nsjobs >= 2 ))
|
||||
# Whether the ^Z action will result in a side effect to the terminal.
|
||||
local -i sideeffect=$(( hassjob || hassjobs || isverbose ))
|
||||
|
||||
IFS=$'\n' local num_jobs=($(jobs))
|
||||
if [[ "${#num_jobs[@]}" -eq 2 ]]; then
|
||||
BUFFER="fg %-"
|
||||
fi
|
||||
|
||||
zle accept-line -w
|
||||
else
|
||||
if (( hascmd && sideeffect )); then
|
||||
# Save the current command.
|
||||
# It will be restored after the side-effect is over, e.g., if the
|
||||
# foregrounded job is put to the background again.
|
||||
zle push-input -w
|
||||
zle clear-screen -w
|
||||
fi
|
||||
|
||||
if (( hassjobs )); then
|
||||
# Multiple suspended jobs: foreground the second-to-last suspended job.
|
||||
BUFFER="fg %-"
|
||||
zle accept-line -w
|
||||
elif (( hassjob )); then
|
||||
# Single suspended job: foreground it.
|
||||
# "fg %-" would result in an error as the only suspended job is the
|
||||
# last one, which is referenced by "fg" or "fg %+".
|
||||
BUFFER="fg %+"
|
||||
zle accept-line -w
|
||||
elif (( isverbose )); then
|
||||
# No suspended jobs, but verbose mode, let show the "fg: no current job".
|
||||
BUFFER="fg"
|
||||
zle accept-line -w
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue