kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 11:15:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1279: display shows lines scrolled down erroneously (#22126)

Browse Source 
Problem:    Display shows lines scrolled down erroneously. (Yishai Lerner)
Solution:   Do not change "wl_lnum" at index zero. (closes vim/vim#11938)

61fdbfa1e3

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2023-02-05 09:37:12 +08:00 committed by GitHub
parent 4b9bb3a184
commit 5c4b503d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/change.c
View File

@ -296,7 +296,9 @@ static void changed_common(linenr_T lnum, colnr_T col, linenr_T lnume, linenr_T
for (int i = 0; i < wp->w_lines_valid; i++) {
if (wp->w_lines[i].wl_valid) {
if (wp->w_lines[i].wl_lnum >= lnum) {
if (wp->w_lines[i].wl_lnum < lnume) {
// Do not change wl_lnum at index zero, it is used to
// compare with w_topline. Invalidate it instead.
if (wp->w_lines[i].wl_lnum < lnume || i == 0) {
// line included in change
wp->w_lines[i].wl_valid = false;
} else if (xtra != 0) {

24
src/nvim/testdir/test_move.vim
View File

@ -1,5 +1,8 @@
" Test the ":move" command.
source check.vim
source screendump.vim
func Test_move()
enew!
call append(0, ['line 1', 'line 2', 'line 3'])
@ -43,4 +46,25 @@ func Test_move()
%bwipeout!
endfunc
func Test_move_undo()
CheckRunVimInTerminal
let lines =<< trim END
call setline(1, ['First', 'Second', 'Third', 'Fourth'])
END
call writefile(lines, 'Xtest_move_undo.vim', 'D')
let buf = RunVimInTerminal('-S Xtest_move_undo.vim', #{rows: 10, cols: 60, statusoff: 2})
call term_sendkeys(buf, "gg:move +1\<CR>")
call VerifyScreenDump(buf, 'Test_move_undo_1', {})
" here the display would show the last few lines scrolled down
call term_sendkeys(buf, "u")
call term_sendkeys(buf, ":\<Esc>")
call VerifyScreenDump(buf, 'Test_move_undo_2', {})
call StopVimInTerminal(buf)
endfunc
" vim: shiftwidth=2 sts=2 expandtab

49
test/functional/legacy/move_spec.lua Normal file
View File

@ -0,0 +1,49 @@
local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
local clear = helpers.clear
local feed = helpers.feed
local funcs = helpers.funcs
before_each(clear)
describe(':move', function()
-- oldtest: Test_move_undo()
it('redraws correctly when undone', function()
local screen = Screen.new(60, 10)
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
})
screen:attach()
funcs.setline(1, {'First', 'Second', 'Third', 'Fourth'})
feed('gg:move +1<CR>')
screen:expect([[
Second |
^First |
Third |
Fourth |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
:move +1 |
]])
-- here the display would show the last few lines scrolled down
feed('u')
feed(':<Esc>')
screen:expect([[
^First |
Second |
Third |
Fourth |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
|
]])
end)
end)