mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.0.1374: CTRL-A does not work with an empty line
Problem: CTRL-A does not work with an empty line. (Alex)
Solution: Decrement the end only once. (Hirohito Higashi, closes vim/vim#2387)
5fe6bdf858
This commit is contained in:
parent
b2d7b70f4d
commit
3c3c733c3c
@ -4418,7 +4418,7 @@ void op_addsub(oparg_T *oap, linenr_T Prenum1, bool g_cmd)
|
||||
length = (colnr_T)STRLEN(ml_get(pos.lnum));
|
||||
} else {
|
||||
// oap->motion_type == kMTCharWise
|
||||
if (!oap->inclusive) {
|
||||
if (pos.lnum == oap->start.lnum && !oap->inclusive) {
|
||||
dec(&(oap->end));
|
||||
}
|
||||
length = (colnr_T)STRLEN(ml_get(pos.lnum));
|
||||
|
@ -364,11 +364,25 @@ endfunc
|
||||
" Expected:
|
||||
" 1) Ctrl-a on visually selected zero
|
||||
" 111
|
||||
"
|
||||
" Also: 019 with "01" selected increments to "029".
|
||||
func Test_visual_increment_15()
|
||||
call setline(1, ["101"])
|
||||
exec "norm! lv\<C-A>"
|
||||
call assert_equal(["111"], getline(1, '$'))
|
||||
call assert_equal([0, 1, 2, 0], getpos('.'))
|
||||
|
||||
call setline(1, ["019"])
|
||||
exec "norm! 0vl\<C-A>"
|
||||
call assert_equal("029", getline(1))
|
||||
|
||||
call setline(1, ["01239"])
|
||||
exec "norm! 0vlll\<C-A>"
|
||||
call assert_equal("01249", getline(1))
|
||||
|
||||
call setline(1, ["01299"])
|
||||
exec "norm! 0vlll\<C-A>"
|
||||
call assert_equal("1309", getline(1))
|
||||
endfunc
|
||||
|
||||
" 16) increment right aligned numbers
|
||||
@ -756,5 +770,12 @@ func Test_normal_increment_03()
|
||||
call assert_equal([0, 3, 25, 0], getpos('.'))
|
||||
endfunc
|
||||
|
||||
func Test_increment_empty_line()
|
||||
new
|
||||
call setline(1, ['0', '0', '0', '0', '0', '0', ''])
|
||||
exe "normal Gvgg\<C-A>"
|
||||
call assert_equal(['1', '1', '1', '1', '1', '1', ''], getline(1, 7))
|
||||
bwipe!
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
Loading…
Reference in New Issue
Block a user