mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1476: lines put in non-current window are not displayed

Browse Source 
Problem:    Lines put in non-current window are not displayed. (Marius
            Gedminas)
Solution:   Don't increment the topline when inserting just above it.
            (closes vim/vim#12212)

e7f05a8780

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-04-22 22:56:24 +08:00
parent 1cb46abff1
commit 60f21d96c6
4 changed files with 106 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/mark.c
View File

@@ -1100,12 +1100,12 @@ void ex_changes(exarg_T *eap)
} \ } \
} }
// Adjust marks between line1 and line2 (inclusive) to move 'amount' lines. // Adjust marks between "line1" and "line2" (inclusive) to move "amount" lines.
// Must be called before changed_*(), appended_lines() or deleted_lines(). // Must be called before changed_*(), appended_lines() or deleted_lines().
// May be called before or after changing the text. // May be called before or after changing the text.
// When deleting lines line1 to line2, use an 'amount' of MAXLNUM: The marks // When deleting lines "line1" to "line2", use an "amount" of MAXLNUM: The
// within this range are made invalid. // marks within this range are made invalid.
// If 'amount_after' is non-zero adjust marks after line2. // If "amount_after" is non-zero adjust marks after "line2".
// Example: Delete lines 34 and 35: mark_adjust(34, 35, MAXLNUM, -2); // Example: Delete lines 34 and 35: mark_adjust(34, 35, MAXLNUM, -2);
// Example: Insert two lines below 55: mark_adjust(56, MAXLNUM, 2, 0); // Example: Insert two lines below 55: mark_adjust(56, MAXLNUM, 2, 0);
// or: mark_adjust(56, 55, MAXLNUM, 2); // or: mark_adjust(56, 55, MAXLNUM, 2);
@@ -1240,7 +1240,9 @@ static void mark_adjust_internal(linenr_T line1, linenr_T line2, linenr_T amount
} else { } else {
win->w_topline = line1 - 1; win->w_topline = line1 - 1;
} }
} else { // keep topline on the same line } else if (win->w_topline > line1) {
// keep topline on the same line, unless inserting just
// above it (we probably want to see that line then)
win->w_topline += amount; win->w_topline += amount;
} }
win->w_topfill = 0; win->w_topfill = 0;

28
test/functional/legacy/put_spec.lua
View File

@@ -1,4 +1,5 @@
local helpers = require('test.functional.helpers')(after_each) local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
local clear = helpers.clear local clear = helpers.clear
local exec_lua = helpers.exec_lua local exec_lua = helpers.exec_lua
local meths = helpers.meths local meths = helpers.meths
@@ -42,4 +43,31 @@ describe('put', function()
bwipe! bwipe!
]] ]]
end) end)
-- oldtest: Test_put_other_window()
it('above topline in buffer in two splits', function()
local screen = Screen.new(80, 10)
screen:attach()
source([[
40vsplit
0put ='some text at the top'
put =' one more text'
put =' two more text'
put =' three more text'
put =' four more text'
]])
screen:expect([[
some text at the top │some text at the top |
one more text │ one more text |
two more text │ two more text |
three more text │ three more text |
^four more text │ four more text |
│ |
~ │~ |
~ │~ |
[No Name] [+] [No Name] [+] |
|
]])
end)
end) end)

103
test/functional/ui/popupmenu_spec.lua
View File

@@ -1372,11 +1372,11 @@ describe('builtin popupmenu', function()
U{n: qui }{s: }eniam, quis nostrud | U{n: qui }{s: }eniam, quis nostrud |
e{n: officia }{s: }co laboris nisi ut aliquip ex | e{n: officia }{s: }co laboris nisi ut aliquip ex |
{4:[No}{n: deserunt }{s: }{4: }| {4:[No}{n: deserunt }{s: }{4: }|
L{n: mollit }{s: }sit amet, consectetur | Est{n: mollit }{s: } |
a{n: anim }{s: }sed do eiusmod tempor | L{n: anim }{s: }sit amet, consectetur |
i{n: id }{s: }re et dolore magna aliqua. | a{n: id }{s: }sed do eiusmod tempor |
U{n: est }{s: }eniam, quis nostrud | i{n: est }{s: }re et dolore magna aliqua. |
e{n: laborum }{c: }co laboris nisi ut aliquip ex | U{n: laborum }{c: }eniam, quis nostrud |
{3:[No}{s: Est }{c: }{3: }| {3:[No}{s: Est }{c: }{3: }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1390,11 +1390,11 @@ describe('builtin popupmenu', function()
U{n: qui }{s: }eniam, quis nostrud | U{n: qui }{s: }eniam, quis nostrud |
e{n: officia }{s: }co laboris nisi ut aliquip ex | e{n: officia }{s: }co laboris nisi ut aliquip ex |
{4:[No}{n: deserunt }{s: }{4: }| {4:[No}{n: deserunt }{s: }{4: }|
U{n: mollit }{s: }eniam, quis nostrud | i{n: mollit }{s: }re et dolore magna aliqua. |
e{n: anim }{s: }co laboris nisi ut aliquip ex | U{n: anim }{s: }eniam, quis nostrud |
e{n: id }{s: }at. Duis aute irure dolor in | e{n: id }{s: }co laboris nisi ut aliquip ex |
r{n: est }{s: }oluptate velit esse cillum | e{n: est }{s: }at. Duis aute irure dolor in |
d{n: laborum }{c: }ulla pariatur. Excepteur sint | r{n: laborum }{c: }oluptate velit esse cillum |
{3:[No}{s: Est }{c: }{3: }| {3:[No}{s: Est }{c: }{3: }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1408,11 +1408,11 @@ describe('builtin popupmenu', function()
U{n: enim }veniam, quis nostrud | U{n: enim }veniam, quis nostrud |
e{n: exercitation }mco laboris nisi ut aliquip ex | e{n: exercitation }mco laboris nisi ut aliquip ex |
{4:[No}{n: ex }{4: }| {4:[No}{n: ex }{4: }|
U{n: ea }veniam, quis nostrud | i{n: ea }ore et dolore magna aliqua. |
e{n: esse }mco laboris nisi ut aliquip ex | U{n: esse }veniam, quis nostrud |
e{n: eu }uat. Duis aute irure dolor in | e{n: eu }mco laboris nisi ut aliquip ex |
r{s: est }voluptate velit esse cillum | e{s: est }uat. Duis aute irure dolor in |
dolore eu fugiat nulla pariatur. Excepteur sint | reprehenderit in voluptate velit esse cillum |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1426,11 +1426,11 @@ describe('builtin popupmenu', function()
U{n: enim }veniam, quis nostrud | U{n: enim }veniam, quis nostrud |
e{n: exercitation }mco laboris nisi ut aliquip ex | e{n: exercitation }mco laboris nisi ut aliquip ex |
{4:[No}{n: ex }{4: }| {4:[No}{n: ex }{4: }|
L{n: ea } sit amet, consectetur | Est{n: ea } |
a{n: esse } sed do eiusmod tempor | L{n: esse } sit amet, consectetur |
i{n: eu }ore et dolore magna aliqua. | a{n: eu } sed do eiusmod tempor |
U{s: est }veniam, quis nostrud | i{s: est }ore et dolore magna aliqua. |
exercitation ullamco laboris nisi ut aliquip ex | Ut enim ad minim veniam, quis nostrud |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1444,11 +1444,11 @@ describe('builtin popupmenu', function()
Ut enim ad minim veniam, quis nostrud | Ut enim ad minim veniam, quis nostrud |
exercitation ullamco laboris nisi ut aliquip ex | exercitation ullamco laboris nisi ut aliquip ex |
{4:[No Name] [+] }| {4:[No Name] [+] }|
Est es |
Lorem ipsum dolor sit amet, consectetur | Lorem ipsum dolor sit amet, consectetur |
adipisicing elit, sed do eiusmod tempor | adipisicing elit, sed do eiusmod tempor |
incididunt ut labore et dolore magna aliqua. | incididunt ut labore et dolore magna aliqua. |
Ut enim ad minim veniam, quis nostrud | Ut enim ad minim veniam, quis nostrud |
exercitation ullamco laboris nisi ut aliquip ex |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1462,11 +1462,11 @@ describe('builtin popupmenu', function()
Ut enim ad minim veniam, quis nostrud | Ut enim ad minim veniam, quis nostrud |
exercitation ullamco laboris nisi ut aliquip ex | exercitation ullamco laboris nisi ut aliquip ex |
{4:[No Name] [+] }| {4:[No Name] [+] }|
incididunt ut labore et dolore magna aliqua. |
Ut enim ad minim veniam, quis nostrud | Ut enim ad minim veniam, quis nostrud |
exercitation ullamco laboris nisi ut aliquip ex | exercitation ullamco laboris nisi ut aliquip ex |
ea commodo consequat. Duis aute irure dolor in | ea commodo consequat. Duis aute irure dolor in |
reprehenderit in voluptate velit esse cillum | reprehenderit in voluptate velit esse cillum |
dolore eu fugiat nulla pariatur. Excepteur sint |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1480,11 +1480,11 @@ describe('builtin popupmenu', function()
U{n: enim }veniam, quis nostrud | U{n: enim }veniam, quis nostrud |
e{n: exercitation }mco laboris nisi ut aliquip ex | e{n: exercitation }mco laboris nisi ut aliquip ex |
{4:[No}{n: ex }{4: }| {4:[No}{n: ex }{4: }|
U{n: ea }veniam, quis nostrud | i{n: ea }ore et dolore magna aliqua. |
e{n: esse }mco laboris nisi ut aliquip ex | U{n: esse }veniam, quis nostrud |
e{n: eu }uat. Duis aute irure dolor in | e{n: eu }mco laboris nisi ut aliquip ex |
r{s: est }voluptate velit esse cillum | e{s: est }uat. Duis aute irure dolor in |
dolore eu fugiat nulla pariatur. Excepteur sint | reprehenderit in voluptate velit esse cillum |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 65} |
]]) ]])
@@ -1498,11 +1498,11 @@ describe('builtin popupmenu', function()
U{n: enim }veniam, quis nostrud | U{n: enim }veniam, quis nostrud |
e{n: exercitation }mco laboris nisi ut aliquip ex | e{n: exercitation }mco laboris nisi ut aliquip ex |
{4:[No}{n: ex }{4: }| {4:[No}{n: ex }{4: }|
U{n: ea }veniam, quis nostrud | i{n: ea }ore et dolore magna aliqua. |
e{n: esse }mco laboris nisi ut aliquip ex | U{n: esse }veniam, quis nostrud |
e{s: eu }uat. Duis aute irure dolor in | e{s: eu }mco laboris nisi ut aliquip ex |
r{n: est }voluptate velit esse cillum | e{n: est }uat. Duis aute irure dolor in |
dolore eu fugiat nulla pariatur. Excepteur sint | reprehenderit in voluptate velit esse cillum |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 22 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 22 of 65} |
]]) ]])
@@ -1516,16 +1516,15 @@ describe('builtin popupmenu', function()
U{n: enim }veniam, quis nostrud | U{n: enim }veniam, quis nostrud |
e{n: exercitation }mco laboris nisi ut aliquip ex | e{n: exercitation }mco laboris nisi ut aliquip ex |
{4:[No}{n: ex }{4: }| {4:[No}{n: ex }{4: }|
r{n: ea }voluptate velit esse cillum | e{n: ea }uat. Duis aute irure dolor in |
d{n: esse }nulla pariatur. Excepteur sint | r{n: esse }voluptate velit esse cillum |
o{s: eu }t non proident, sunt in culpa | d{s: eu }nulla pariatur. Excepteur sint |
q{n: est }unt mollit anim id est | o{n: est }t non proident, sunt in culpa |
laborum. | qui officia deserunt mollit anim id est |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 22 of 65} | {2:-- Keyword Local completion (^N^P) }{5:match 22 of 65} |
]]) ]])
funcs.complete(4, {'ea', 'eeeeeeeeeeeeeeeeee', 'ei', 'eo', 'eu', 'ey', 'eå', 'eä', 'eö'}) funcs.complete(4, {'ea', 'eeeeeeeeeeeeeeeeee', 'ei', 'eo', 'eu', 'ey', 'eå', 'eä', 'eö'})
screen:expect([[ screen:expect([[
Est eu^ | Est eu^ |
@@ -1535,11 +1534,11 @@ describe('builtin popupmenu', function()
{n: eo }iam, quis nostrud | {n: eo }iam, quis nostrud |
{n: eu } laboris nisi ut aliquip ex | {n: eu } laboris nisi ut aliquip ex |
{4:[N}{n: ey }{4: }| {4:[N}{n: ey }{4: }|
{n: eå }uptate velit esse cillum | {n: eå }. Duis aute irure dolor in |
{n: eä }la pariatur. Excepteur sint | {n: eä }uptate velit esse cillum |
{n: eö }on proident, sunt in culpa | {n: eö }la pariatur. Excepteur sint |
occaecat cupidatat non proident, sunt in culpa |
qui officia deserunt mollit anim id est | qui officia deserunt mollit anim id est |
laborum. |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- Keyword Local completion (^N^P) }{5:match 1 of 9} | {2:-- Keyword Local completion (^N^P) }{5:match 1 of 9} |
]]) ]])
@@ -1553,11 +1552,11 @@ describe('builtin popupmenu', function()
{n: eo } veniam, quis nostrud | {n: eo } veniam, quis nostrud |
{n: eu }amco laboris nisi ut aliquip ex | {n: eu }amco laboris nisi ut aliquip ex |
{4:[N}{n: ey }{4: }| {4:[N}{n: ey }{4: }|
{n: eå } voluptate velit esse cillum | {n: eå }quat. Duis aute irure dolor in |
{n: eä } nulla pariatur. Excepteur sint | {n: eä } voluptate velit esse cillum |
{n: eö }at non proident, sunt in culpa | {n: eö } nulla pariatur. Excepteur sint |
occaecat cupidatat non proident, sunt in culpa |
qui officia deserunt mollit anim id est | qui officia deserunt mollit anim id est |
laborum. |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])
@@ -1571,11 +1570,11 @@ describe('builtin popupmenu', function()
{n: eo } veniam, quis nostrud | {n: eo } veniam, quis nostrud |
{n: eu }amco laboris nisi ut aliquip ex | {n: eu }amco laboris nisi ut aliquip ex |
{4:[N}{n: ey }{4: }| {4:[N}{n: ey }{4: }|
{n: eå } voluptate velit esse cillum | {n: eå }quat. Duis aute irure dolor in |
{n: eä } nulla pariatur. Excepteur sint | {n: eä } voluptate velit esse cillum |
{n: eö }at non proident, sunt in culpa | {n: eö } nulla pariatur. Excepteur sint |
occaecat cupidatat non proident, sunt in culpa |
qui officia deserunt mollit anim id est | qui officia deserunt mollit anim id est |
laborum. |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])
@@ -1589,11 +1588,11 @@ describe('builtin popupmenu', function()
Ut enim ad minim veniam, quis nostrud | Ut enim ad minim veniam, quis nostrud |
exercitation ullamco laboris nisi ut aliquip ex | exercitation ullamco laboris nisi ut aliquip ex |
{4:[No Name] [+] }| {4:[No Name] [+] }|
ea commodo consequat. Duis aute irure dolor in |
reprehenderit in voluptate velit esse cillum | reprehenderit in voluptate velit esse cillum |
dolore eu fugiat nulla pariatur. Excepteur sint | dolore eu fugiat nulla pariatur. Excepteur sint |
occaecat cupidatat non proident, sunt in culpa | occaecat cupidatat non proident, sunt in culpa |
qui officia deserunt mollit anim id est | qui officia deserunt mollit anim id est |
laborum. |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])
@@ -1607,11 +1606,11 @@ describe('builtin popupmenu', function()
Ut enim ad minim veniam, quis nostrud | Ut enim ad minim veniam, quis nostrud |
exercitation ullamco laboris nisi ut aliquip ex | exercitation ullamco laboris nisi ut aliquip ex |
{4:[No Name] [+] }| {4:[No Name] [+] }|
ea commodo consequat. Duis aute irure dolor in |
reprehenderit in voluptate velit esse cillum | reprehenderit in voluptate velit esse cillum |
dolore eu fugiat nulla pariatur. Excepteur sint | dolore eu fugiat nulla pariatur. Excepteur sint |
occaecat cupidatat non proident, sunt in culpa | occaecat cupidatat non proident, sunt in culpa |
qui officia deserunt mollit anim id est | qui officia deserunt mollit anim id est |
laborum. |
{3:[No Name] [+] }| {3:[No Name] [+] }|
{2:-- INSERT --} | {2:-- INSERT --} |
]]) ]])

20
test/old/testdir/test_put.vim
View File

@@ -1,6 +1,7 @@
" Tests for put commands, e.g. ":put", "p", "gp", "P", "gP", etc. " Tests for put commands, e.g. ":put", "p", "gp", "P", "gP", etc.
source check.vim source check.vim
source screendump.vim
func Test_put_block() func Test_put_block()
new new
@@ -246,5 +247,24 @@ func Test_put_visual_block_mode()
bwipe! bwipe!
set ve= set ve=
endfunc
func Test_put_other_window()
CheckRunVimInTerminal
let lines =<< trim END
40vsplit
0put ='some text at the top'
put =' one more text'
put =' two more text'
put =' three more text'
put =' four more text'
END
call writefile(lines, 'Xtest_put_other', 'D')
let buf = RunVimInTerminal('-S Xtest_put_other', #{rows: 10})
call VerifyScreenDump(buf, 'Test_put_other_window_1', {})
call StopVimInTerminal(buf)
endfunc endfunc