diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Doc/Zsh/contrib.yo | 11 | ||||
| -rw-r--r-- | Functions/Zle/replace-string | 38 | ||||
| -rw-r--r-- | Functions/Zle/replace-string-again | 45 |
4 files changed, 63 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog index af717e8ee..498f1f34b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2006-10-10 Peter Stephenson <pws@csr.com> + * 22854: Doc/Zsh/contrib.yo, Functions/Zle/replace-string, + Functions/Zle/replace-string-again: separate out back end + as separate widget to repeat replacement. + * 22853: Src/utils.c: unquoted ^ at end of bindkey string treated literally. diff --git a/Doc/Zsh/contrib.yo b/Doc/Zsh/contrib.yo index 32fb283dc..bb03fa68a 100644 --- a/Doc/Zsh/contrib.yo +++ b/Doc/Zsh/contrib.yo @@ -1055,8 +1055,10 @@ not used. Hence it is still possible to call tt(executed-named-cmd) and similar functions while reading a value. ) tindex(replace-string) +tindex(replace-string-again) tindex(replace-pattern) -item(tt(replace-string), tt(replace-pattern))( +xitem(tt(replace-string), tt(replace-pattern)) +item(tt(replace-string-again), tt(replace-pattern-again))( The function tt(replace-string) implements two widgets. If defined under the same name as the function, it prompts for two strings; the first (source) string will be replaced by the second @@ -1082,6 +1084,13 @@ tt(:zle:replace-string)) to tt(true). In addition, a positive numeric argument forces the previous values to be offered, a negative or zero argument forces them not to be. +The function tt(replace-string-again) can be used to repeat the +previous replacement; no prompting is done. As with tt(replace-string), if +the name of the widget contains the word `tt(pattern)', pattern matching +is performed, else a literal string replacement. Note that the +previous source and replacement text are the same whether pattern or string +matching is used. + For example, starting from the line: example(print This line contains fan and fond) diff --git a/Functions/Zle/replace-string b/Functions/Zle/replace-string index 577e9174d..31a7567db 100644 --- a/Functions/Zle/replace-string +++ b/Functions/Zle/replace-string @@ -1,11 +1,11 @@ emulate -L zsh setopt extendedglob -autoload read-from-minibuffer +autoload -U read-from-minibuffer replace-string-again local p1="Replace: " p2=" with: " -local REPLY MATCH MBEGIN MEND curwidget=$WIDGET previous -local -a match mbegin mend +# Saving curwidget is necessary to avoid the widget name being overwritten. +local REPLY previous curwidget=$WIDGET if (( ${+NUMERIC} )); then (( $NUMERIC > 0 )) && previous=1 @@ -20,34 +20,4 @@ read-from-minibuffer "$p1$_replace_string_src$p2" \ ${previous:+$_replace_string_rep} || return 1 _replace_string_rep=$REPLY -if [[ $curwidget = *pattern* ]]; then - local rep2 - # The following horror is so that an & preceded by an even - # number of backslashes is active, without stripping backslashes, - # while preceded by an odd number of backslashes is inactive, - # with one backslash being stripped. A similar logic applies - # to \digit. - local rep=$_replace_string_rep - while [[ $rep = (#b)([^\\]#)(\\\\)#(\\|)(\&|\\<->|\\\{<->\})(*) ]]; do - if [[ -n $match[3] ]]; then - # Expression is quoted, strip quotes - rep2="${match[1]}${match[2]}${match[4]}" - else - rep2+="${match[1]}${match[2]}" - if [[ $match[4] = \& ]]; then - rep2+='${MATCH}' - elif [[ $match[4] = \\\{* ]]; then - rep2+='${match['${match[4][3,-2]}']}' - else - rep2+='${match['${match[4][2,-1]}']}' - fi - fi - rep=${match[5]} - done - rep2+=$rep - LBUFFER=${LBUFFER//(#bm)$~_replace_string_src/${(e)rep2}} - RBUFFER=${RBUFFER//(#bm)$~_replace_string_src/${(e)rep2}} -else - LBUFFER=${LBUFFER//$_replace_string_src/$_replace_string_rep} - RBUFFER=${RBUFFER//$_replace_string_src/$_replace_string_rep} -fi +replace-string-again $curwidget diff --git a/Functions/Zle/replace-string-again b/Functions/Zle/replace-string-again new file mode 100644 index 000000000..122f0a8ee --- /dev/null +++ b/Functions/Zle/replace-string-again @@ -0,0 +1,45 @@ +# Back end for replace-string; can be called as a widget to repeat +# the previous replacement. _replace_string_src and _replace_string_rep +# are global. + +# When called from replace-string, we need to use the widget +# name passed to decide whether to do pattern matching: the widget +# may since have been overwritten. +local MATCH MBEGIN MEND curwidget=${1:-$WIDGET} +local -a match mbegin mend + +if [[ -z $_replace_string_src ]]; then + zle -M No string to replace. +fi + +if [[ $curwidget = *pattern* ]]; then + local rep2 + # The following horror is so that an & preceded by an even + # number of backslashes is active, without stripping backslashes, + # while preceded by an odd number of backslashes is inactive, + # with one backslash being stripped. A similar logic applies + # to \digit. + local rep=$_replace_string_rep + while [[ $rep = (#b)([^\\]#)(\\\\)#(\\|)(\&|\\<->|\\\{<->\})(*) ]]; do + if [[ -n $match[3] ]]; then + # Expression is quoted, strip quotes + rep2="${match[1]}${match[2]}${match[4]}" + else + rep2+="${match[1]}${match[2]}" + if [[ $match[4] = \& ]]; then + rep2+='${MATCH}' + elif [[ $match[4] = \\\{* ]]; then + rep2+='${match['${match[4][3,-2]}']}' + else + rep2+='${match['${match[4][2,-1]}']}' + fi + fi + rep=${match[5]} + done + rep2+=$rep + LBUFFER=${LBUFFER//(#bm)$~_replace_string_src/${(e)rep2}} + RBUFFER=${RBUFFER//(#bm)$~_replace_string_src/${(e)rep2}} +else + LBUFFER=${LBUFFER//$_replace_string_src/$_replace_string_rep} + RBUFFER=${RBUFFER//$_replace_string_src/$_replace_string_rep} +fi |