From: Mikael Magnusson <mikachu@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: edit-command-line: restrict editing to region if it is active
Date: Sat, 8 Aug 2020 12:18:57 +0200 [thread overview]
Message-ID: <20200808101857.26868-1-mikachu@gmail.com> (raw)
In-Reply-To: <20200808095148.21555-1-mikachu@gmail.com>
---
Functions/Zle/edit-command-line | 36 +++++++++++++++++++++++++++++-------
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line
index 8aaeb738e5..3781244b27 100644
--- a/Functions/Zle/edit-command-line
+++ b/Functions/Zle/edit-command-line
@@ -7,9 +7,20 @@
# except that it will handle multi-line buffers properly.
emulate -L zsh
-local prebuffer
-# see below comment for why this is needed
-if (( ! ZLE_RECURSIVE )); then
+local left right prebuffer buffer=$BUFFER lbuffer=$LBUFFER
+# set up parameters depending on which context we are called from,
+# see below comment for more details
+if (( REGION_ACTIVE )); then
+ if (( CURSOR < MARK )); then
+ left=$CURSOR right=$MARK
+ lbuffer=
+ else
+ left=$MARK right=$CURSOR
+ lbuffer[right-left,-1]=
+ fi
+ (( left++ ))
+ buffer=$BUFFER[left,right]
+elif (( ! ZLE_RECURSIVE )); then
prebuffer=$PREBUFFER
fi
@@ -29,10 +40,10 @@ fi
fi
case $editor in
(*vim*)
- integer byteoffset=$(( $#PREBUFFER + $#LBUFFER + 1 ))
+ integer byteoffset=$(( $#prebuffer + $#lbuffer + 1 ))
"${(@)editor}" -c "normal! ${byteoffset}go" -- $1;;
(*emacs*)
- local lines=( "${(@f):-"$PREBUFFER$LBUFFER"}" )
+ local lines=( "${(@f):-"$prebuffer$lbuffer"}" )
"${(@)editor}" +${#lines}:$((${#lines[-1]} + 1)) $1;;
(*) "${(@)editor}" $1;;
esac
@@ -48,13 +59,24 @@ fi
# the following point)
# - when we are at PS2 (CONTEXT == cont && ! ZLE_RECURSIVE) we do want the
# break or otherwise the text from PREBUFFER will be inserted twice
+ # - when the region is active, we only want to change the parts of BUFFER
+ # covered by the region, and any PREBUFFER stays as PREBUFFER
# - in all other cases (that I can think of) we also just want to set
# $BUFFER directly.
- if [[ $CONTEXT != cont ]] || (( ZLE_RECURSIVE )); then
+ if (( REGION_ACTIVE )); then
+ # adjust the length of the region to the length of the edited text
+ local prelen=$#BUFFER
+ BUFFER[left,right]="$(<$1)"
+ if (( MARK > CURSOR )); then
+ (( MARK += $#BUFFER - prelen ))
+ else
+ (( CURSOR += $#BUFFER - prelen ))
+ fi
+ elif [[ $CONTEXT != cont ]] || (( ZLE_RECURSIVE )); then
BUFFER="$(<$1)"
else
print -Rz - "$(<$1)"
zle send-break
fi
-} =(<<<"$prebuffer$BUFFER")
+} =(<<<"$prebuffer$buffer")
--
2.15.1
prev parent reply other threads:[~2020-08-08 10:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-08 9:51 PATCH: edit-command-line: when possible, set $BUFFER directly Mikael Magnusson
2020-08-08 10:17 ` PATCH: edit-command-line: add editor style Mikael Magnusson
2020-08-08 10:18 ` Mikael Magnusson [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200808101857.26868-1-mikachu@gmail.com \
--to=mikachu@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).