mirror of
https://github.com/zsh-users/zsh
synced 2024-09-06 08:25:56 +00:00
42116: multibyte support for ZLE vi-mode word motion
This commit is contained in:
Jun-ichi Takimoto
parent
aab0f6d763
commit
5f33a93afb
|
|
@ -1,3 +1,8 @@
|
|||
2017-12-18 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
|
||||
|
||||
* 42116: Src/Zle/zle_word.c, Src/Zle/textobjects.c, Src/Zle/zle.h,
|
||||
Test/X02zlevi.ztst: multibyte support for Zle vi-mode word motion
|
||||
|
||||
2017-12-15 Peter Stephenson <p.stephenson@samsung.com>
|
||||
|
||||
* 42123 (tweaked further): Src/exec.c: need to take account of
|
||||
|
|
|
|||
|
|
@ -30,13 +30,6 @@
|
|||
#include "zle.mdh"
|
||||
#include "textobjects.pro"
|
||||
|
||||
/* class of character: 0 is whitespace, 1 is word character, 2 is other */
|
||||
static int
|
||||
wordclass(ZLE_CHAR_T x)
|
||||
{
|
||||
return (ZC_iblank(x) ? 0 : ((ZC_ialnum(x) || (ZWC('_') == x)) ? 1 : 2));
|
||||
}
|
||||
|
||||
static int
|
||||
blankwordclass(ZLE_CHAR_T x)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ typedef wint_t ZLE_INT_T;
|
|||
#define ZC_inblank iswspace
|
||||
#define ZC_iupper iswupper
|
||||
#define ZC_iword(x) wcsitype((x), IWORD)
|
||||
#define ZC_ipunct iswpunct
|
||||
|
||||
#define ZC_tolower towlower
|
||||
#define ZC_toupper towupper
|
||||
|
|
@ -153,6 +154,7 @@ static inline int ZS_strncmp(ZLE_STRING_T s1, ZLE_STRING_T s2, size_t l)
|
|||
#define ZC_inblank inblank
|
||||
#define ZC_iupper isupper
|
||||
#define ZC_iword iword
|
||||
#define ZC_ipunct ispunct
|
||||
|
||||
#define ZC_tolower tulower
|
||||
#define ZC_toupper tuupper
|
||||
|
|
|
|||
|
|
@ -64,7 +64,18 @@ forwardword(char **args)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#define Z_vialnum(X) (ZC_ialnum(X) || (ZWC('_') == X))
|
||||
/*
|
||||
* class of character (for vi-mode word motion)
|
||||
* 0: blank, 1: alnum or _, 2: punctuation, 3: the others
|
||||
*/
|
||||
|
||||
/**/
|
||||
int
|
||||
wordclass(ZLE_CHAR_T x)
|
||||
{
|
||||
return (ZC_iblank(x) ? 0 : ((ZC_ialnum(x) || (ZWC('_') == x)) ? 1 :
|
||||
ZC_ipunct(x) ? 2 : 3));
|
||||
}
|
||||
|
||||
/**/
|
||||
int
|
||||
|
|
@ -81,13 +92,10 @@ viforwardword(char **args)
|
|||
}
|
||||
while (n--) {
|
||||
int nl;
|
||||
if (Z_vialnum(zleline[zlecs]))
|
||||
while (zlecs != zlell && Z_vialnum(zleline[zlecs]))
|
||||
INCCS();
|
||||
else
|
||||
while (zlecs != zlell && !Z_vialnum(zleline[zlecs]) &&
|
||||
!ZC_inblank(zleline[zlecs]))
|
||||
INCCS();
|
||||
int cc = wordclass(zleline[zlecs]);
|
||||
while (zlecs != zlell && wordclass(zleline[zlecs]) == cc) {
|
||||
INCCS();
|
||||
}
|
||||
if (wordflag && !n)
|
||||
return 0;
|
||||
nl = (zleline[zlecs] == ZWC('\n'));
|
||||
|
|
@ -208,26 +216,17 @@ viforwardwordend(char **args)
|
|||
zlecs = pos;
|
||||
}
|
||||
if (zlecs != zlell) {
|
||||
int cc;
|
||||
pos = zlecs;
|
||||
INCPOS(pos);
|
||||
if (Z_vialnum(zleline[pos])) {
|
||||
for (;;) {
|
||||
zlecs = pos;
|
||||
if (zlecs == zlell)
|
||||
cc = wordclass(zleline[pos]);
|
||||
for (;;) {
|
||||
zlecs = pos;
|
||||
if (zlecs == zlell)
|
||||
break;
|
||||
INCPOS(pos);
|
||||
if (wordclass(zleline[pos]) != cc)
|
||||
break;
|
||||
INCPOS(pos);
|
||||
if (!Z_vialnum(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
for (;;) {
|
||||
zlecs = pos;
|
||||
if (zlecs == zlell)
|
||||
break;
|
||||
INCPOS(pos);
|
||||
if (Z_vialnum(zleline[pos]) || ZC_inblank(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -295,24 +294,14 @@ vibackwardword(char **args)
|
|||
}
|
||||
if (zlecs) {
|
||||
int pos = zlecs;
|
||||
if (Z_vialnum(zleline[pos])) {
|
||||
for (;;) {
|
||||
zlecs = pos;
|
||||
if (zlecs == 0)
|
||||
break;
|
||||
DECPOS(pos);
|
||||
if (!Z_vialnum(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
for (;;) {
|
||||
zlecs = pos;
|
||||
if (zlecs == 0)
|
||||
break;
|
||||
DECPOS(pos);
|
||||
if (Z_vialnum(zleline[pos]) || ZC_inblank(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
int cc = wordclass(zleline[pos]);
|
||||
for (;;) {
|
||||
zlecs = pos;
|
||||
if (zlecs == 0)
|
||||
break;
|
||||
DECPOS(pos);
|
||||
if (wordclass(zleline[pos]) != cc || ZC_inblank(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -368,17 +357,10 @@ vibackwardwordend(char **args)
|
|||
return ret;
|
||||
}
|
||||
while (n-- && zlecs > 1) {
|
||||
int start = 0;
|
||||
if (Z_vialnum(zleline[zlecs]))
|
||||
start = 1;
|
||||
else if (!ZC_inblank(zleline[zlecs]))
|
||||
start = 2;
|
||||
int cc = wordclass(zleline[zlecs]);
|
||||
DECCS();
|
||||
while (zlecs) {
|
||||
int same = (start != 1) && ZC_iblank(zleline[zlecs]);
|
||||
if (start)
|
||||
same |= Z_vialnum(zleline[zlecs]);
|
||||
if (same == (start == 2))
|
||||
if (wordclass(zleline[zlecs]) != cc || ZC_iblank(zleline[zlecs]))
|
||||
break;
|
||||
DECCS();
|
||||
}
|
||||
|
|
@ -494,26 +476,17 @@ vibackwardkillword(UNUSED(char **args))
|
|||
x = pos;
|
||||
}
|
||||
if (x > lim) {
|
||||
int cc;
|
||||
int pos = x;
|
||||
DECPOS(pos);
|
||||
if (Z_vialnum(zleline[pos])) {
|
||||
for (;;) {
|
||||
x = pos;
|
||||
if (x <= lim)
|
||||
break;
|
||||
DECPOS(pos);
|
||||
if (!Z_vialnum(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
for (;;) {
|
||||
x = pos;
|
||||
if (x <= lim)
|
||||
break;
|
||||
DECPOS(pos);
|
||||
if (Z_vialnum(zleline[pos]) || ZC_iblank(zleline[pos]))
|
||||
break;
|
||||
}
|
||||
cc = wordclass(zleline[pos]);
|
||||
for (;;) {
|
||||
x = pos;
|
||||
if (x < lim)
|
||||
break;
|
||||
DECPOS(pos);
|
||||
if (wordclass(zleline[pos]) != cc)
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,16 @@
|
|||
# Tests of the vi mode of ZLE
|
||||
|
||||
%prep
|
||||
unset -m LC_\*
|
||||
ZSH_TEST_LANG=
|
||||
langs=(en_{US,GB}.{UTF-,utf}8 en.UTF-8
|
||||
$(locale -a 2>/dev/null | egrep 'utf8|UTF-8'))
|
||||
for LANG in $langs; do
|
||||
if [[ é = ? ]]; then
|
||||
ZSH_TEST_LANG=$LANG
|
||||
break;
|
||||
fi
|
||||
done
|
||||
if [[ $OSTYPE = cygwin ]]; then
|
||||
ZTST_unimplemented="the zsh/zpty module does not work on Cygwin"
|
||||
elif ( zmodload zsh/zpty 2>/dev/null ); then
|
||||
|
|
@ -463,12 +473,12 @@
|
|||
> aww
|
||||
>CURSOR: 0
|
||||
|
||||
zletest $' --ww ww--\eo\eoww\eo\eo--\eo\eo ww\e' gei{a,=,b,c,=,d,e,=,f}$'\e'
|
||||
zletest $' --ww ww--\eo\eoww\eo\eo--\eo\eo ww\e' gei{a,=,b,c,d,=,e,f,=,g}$'\e'
|
||||
0:backward word end
|
||||
>BUFFER: f -=-wew wdw-=-
|
||||
>c
|
||||
>wbw
|
||||
>
|
||||
>BUFFER: g -=-wfw wew-=-
|
||||
>d
|
||||
>wcw
|
||||
>b
|
||||
>-=-
|
||||
>a
|
||||
> ww
|
||||
|
|
@ -529,6 +539,15 @@
|
|||
> wwe
|
||||
>CURSOR: 29
|
||||
|
||||
if [[ -z $ZSH_TEST_LANG ]]; then
|
||||
ZTST_skip="no UTF-8 locale for Zle vi-mode test"
|
||||
else
|
||||
zletest $'/あいう/えお/かき\ebxgegex0wxex'
|
||||
fi
|
||||
0:word motion with multibyte characters
|
||||
>BUFFER: /い/え/き
|
||||
>CURSOR: 2
|
||||
|
||||
zletest $' ----word ---- word word---- ----\e42|daw30|daw22|daw14|daw2|daw'
|
||||
0:delete all word on blanks
|
||||
>BUFFER: word
|
||||
|
|
|
|||
Loading…
Reference in a new issue