0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 9.0.1753: can't move to last non-blank char

Problem: can't move to last non-blank char
Solution: Make g<end> behave like that

Make it possible to move to last non-blank char on a line

We can distinguish between g0 and g^ to move to the very first character
and the first non-blank char.

And while we can move to the last screen char, we cannot go to the last
non-blank screen char.

Since I think g$ is the more widely used and known movement command (and
g<end> is synonymous to it) change the behaviour of g<end> to move to
last non-screen char instead and don't have this be the same command as
the g$ command anymore.

If you want to keep the old behaviour, you can use:

```
nnoremap g<end> g$
```

Add a test to verify the behaviour.

closes: #12593

Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Christian Brabandt
2023-08-19 15:53:16 +02:00
parent 2b6a12af4d
commit b5f6fe9ca2
4 changed files with 36 additions and 2 deletions

View File

@@ -242,8 +242,8 @@ gM Like "g0", but to halfway the text of the line.
Thus "10gM" is near the start of the text and "90gM" Thus "10gM" is near the start of the text and "90gM"
is near the end of the text. is near the end of the text.
*g$* *g<End>* *g$*
g$ or g<End> When lines wrap ('wrap' on): To the last character of g$ When lines wrap ('wrap' on): To the last character of
the screen line and [count - 1] screen lines downward the screen line and [count - 1] screen lines downward
|inclusive|. Differs from "$" when a line is wider |inclusive|. Differs from "$" when a line is wider
than the screen. than the screen.
@@ -255,6 +255,9 @@ g$ or g<End> When lines wrap ('wrap' on): To the last character of
instead of going to the end of the line. instead of going to the end of the line.
When 'virtualedit' is enabled moves to the end of the When 'virtualedit' is enabled moves to the end of the
screen line. screen line.
*g<End>*
g<End> Like |g$| but to the last non-blank character
instead of the last character.
*bar* *bar*
| To screen column [count] in the current line. | To screen column [count] in the current line.

View File

@@ -5821,6 +5821,10 @@ nv_g_dollar_cmd(cmdarg_T *cap)
oparg_T *oap = cap->oap; oparg_T *oap = cap->oap;
int i; int i;
int col_off = curwin_col_off(); int col_off = curwin_col_off();
int flag = FALSE;
if (cap->nchar == K_END)
flag = TRUE;
oap->motion_type = MCHAR; oap->motion_type = MCHAR;
oap->inclusive = TRUE; oap->inclusive = TRUE;
@@ -5886,6 +5890,13 @@ nv_g_dollar_cmd(cmdarg_T *cap)
// Make sure we stick in this column. // Make sure we stick in this column.
update_curswant_force(); update_curswant_force();
} }
if (flag)
{
do
i = gchar_cursor();
while (VIM_ISWHITE(i) && oneleft() == OK);
curwin->w_valid &= ~VALID_WCOL;
}
} }
/* /*

View File

@@ -4104,4 +4104,22 @@ func Test_normal_click_on_double_width_char()
let &mouse = save_mouse let &mouse = save_mouse
endfunc endfunc
func Test_normal33_g_cmd_nonblank()
" Test that g$ goes to the last non-blank char and g<end> to the last
" visible column
20vnew
setlocal nowrap nonumber signcolumn=no
call setline(1, ['fooo fooo fooo fooo fooo fooo fooo fooo '])
exe "normal 0g\<end>"
call assert_equal(11, col('.'))
normal 0g$
call assert_equal(20, col('.'))
setlocal wrap
exe "normal 0g\<end>"
call assert_equal(11, col('.'))
normal 0g$
call assert_equal(20, col('.'))
bw!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1753,
/**/ /**/
1752, 1752,
/**/ /**/