extern/ohmyzsh
1
0
Fork 1
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-26 08:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(sudo): allow different $EDITOR settings and fix zsh-syntax-highlighting redraw

Browse Source
This commit is contained in:
Marc Cornellà 2021-08-19 18:20:57 +02:00
parent a1847dc860
commit 190325049e
No known key found for this signature in database
GPG Key ID: 0314585E776A9C1B
1 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
plugins/sudo/sudo.plugin.zsh
View File

@ -25,6 +25,7 @@ __sudo-replace-buffer() {
} }
sudo-command-line() { sudo-command-line() {
# If line is empty, get the last run command from history
[[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)" [[ -z $BUFFER ]] && LBUFFER="$(fc -ln -1)"
# Save beginning space # Save beginning space
@ -34,29 +35,56 @@ sudo-command-line() {
LBUFFER="${LBUFFER:1}" LBUFFER="${LBUFFER:1}"
fi fi
# Get the first part of the typed command and check if it's an alias to $EDITOR # If $EDITOR is not set, just toggle the sudo prefix on and off
# If so, locally change $EDITOR to the alias so that it matches below if [[ -z "$EDITOR" ]]; then
if [[ -n "$EDITOR" ]]; then case "$BUFFER" in
sudoedit\ *) __sudo-replace-buffer "sudoedit" "" ;;
sudo\ *) __sudo-replace-buffer "sudo" "" ;;
*) LBUFFER="sudo $LBUFFER" ;;
esac
else
# Check if the typed command is really an alias to $EDITOR
# Get the first part of the typed command
local cmd="${${(Az)BUFFER}[1]}" local cmd="${${(Az)BUFFER}[1]}"
if [[ "${aliases[$cmd]} " = (\$EDITOR|$EDITOR)\ * ]]; then # Get the first part of the alias of the same name as $cmd, or $cmd if no alias matches
local EDITOR="$cmd" local realcmd="${${(Az)aliases[$cmd]}[1]:-$cmd}"
fi # Get the first part of the $EDITOR command ($EDITOR may have arguments after it)
local editorcmd="${${(Az)EDITOR}[1]}"
# Note: ${var:c} makes a $PATH search and expands $var to the full path
# The if condition is met when:
# - $realcmd is '$EDITOR'
# - $realcmd is "cmd" and $EDITOR is "cmd"
# - $realcmd is "cmd" and $EDITOR is "cmd --with --arguments"
# - $realcmd is "/path/to/cmd" and $EDITOR is "cmd"
# - $realcmd is "/path/to/cmd" and $EDITOR is "/path/to/cmd"
# or
# - $realcmd is "cmd" and $EDITOR is "cmd"
# - $realcmd is "cmd" and $EDITOR is "/path/to/cmd"
# or
# - $realcmd is "cmd" and $EDITOR is /alternative/path/to/cmd that appears in $PATH
if [[ "$realcmd" = (\$EDITOR|$editorcmd|${editorcmd:c}) \
|| "${realcmd:c}" = ($editorcmd|${editorcmd:c}) ]] \
|| builtin which -a "$realcmd" | command grep -Fx -q "$editorcmd"; then
editorcmd="$cmd" # replace $editorcmd with the typed command so it matches below
fi fi
if [[ -n $EDITOR && $BUFFER = $EDITOR\ * ]]; then # Check for editor commands in the typed command and replace accordingly
__sudo-replace-buffer "$EDITOR" "sudoedit" case "$BUFFER" in
elif [[ -n $EDITOR && $BUFFER = \$EDITOR\ * ]]; then $editorcmd\ *) __sudo-replace-buffer "$editorcmd" "sudoedit" ;;
__sudo-replace-buffer "\$EDITOR" "sudoedit" \$EDITOR\ *) __sudo-replace-buffer '$EDITOR' "sudoedit" ;;
elif [[ $BUFFER = sudoedit\ * ]]; then sudoedit\ *) __sudo-replace-buffer "sudoedit" "$EDITOR" ;;
__sudo-replace-buffer "sudoedit" "$EDITOR" sudo\ *) __sudo-replace-buffer "sudo" "" ;;
elif [[ $BUFFER = sudo\ * ]]; then *) LBUFFER="sudo $LBUFFER" ;;
__sudo-replace-buffer "sudo" "" esac
else
LBUFFER="sudo $LBUFFER"
fi fi
# Preserve beginning space # Preserve beginning space
LBUFFER="${WHITESPACE}${LBUFFER}" LBUFFER="${WHITESPACE}${LBUFFER}"
# Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
zle redisplay
} }
zle -N sudo-command-line zle -N sudo-command-line