IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

ex_getln: Do not crash with :append/:insert/:change

Browse Source 
This change effectively disables history for lines inserted using this method. 
Not a big problem since it does not work for them in Vim in first place.

Also solves a bug(?): ex_window() run while in :append mode opens search history 
in Vim for some reason. Now it opens empty cmdline window.
This commit is contained in:
ZyX 2016-04-29 19:10:50 +03:00
parent 126e475807
commit 37f1ee0084
2 changed files with 65 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/ex_getln.c
View File

@ -289,7 +289,9 @@ static uint8_t *command_line_enter(int firstc, long count, int indent)
if (ccline.cmdbuff != NULL) {
// Put line in history buffer (":" and "=" only when it was typed).
if (ccline.cmdlen && s->firstc != NUL
if (s->histype != HIST_INVALID
&& ccline.cmdlen
&& s->firstc != NUL
&& (s->some_key_typed || s->histype == HIST_SEARCH)) {
add_to_history(s->histype, ccline.cmdbuff, true,
s->histype == HIST_SEARCH ? s->firstc : NUL);
@ -1268,7 +1270,7 @@ static int command_line_handle_key(CommandLineState *s)
case K_KPAGEUP:
case K_PAGEDOWN:
case K_KPAGEDOWN:
if (hislen == 0 || s->firstc == NUL) {
if (s->histype == HIST_INVALID || hislen == 0 || s->firstc == NUL) {
// no history
return command_line_not_changed(s);
}
@ -4294,7 +4296,7 @@ static HistoryType hist_char2type(const int c)
return HIST_SEARCH;
}
default: {
assert(false);
return HIST_INVALID;
}
}
// Silence -Wreturn-type
@ -4519,8 +4521,10 @@ add_to_history (
histentry_T *hisptr;
int len;
if (hislen == 0) /* no history */
if (hislen == 0 || histype == HIST_INVALID) { // no history
return;
}
assert(histype != HIST_DEFAULT);
if (cmdmod.keeppatterns && histype == HIST_SEARCH)
return;
@ -4991,7 +4995,6 @@ static int ex_window(void)
win_T *wp;
int i;
linenr_T lnum;
int histtype;
garray_T winsizes;
char_u typestr[2];
int save_restart_edit = restart_edit;
@ -5040,7 +5043,7 @@ static int ex_window(void)
/* Showing the prompt may have set need_wait_return, reset it. */
need_wait_return = FALSE;
histtype = hist_char2type(cmdwin_type);
const int histtype = hist_char2type(cmdwin_type);
if (histtype == HIST_CMD || histtype == HIST_DEBUG) {
if (p_wc == TAB) {
add_map((char_u *)"<buffer> <Tab> <C-X><C-V>", INSERT);
@ -5055,7 +5058,7 @@ static int ex_window(void)
/* Fill the buffer with the history. */
init_history();
if (hislen > 0) {
if (hislen > 0 && histtype != HIST_INVALID) {
i = hisidx[histtype];
if (i >= 0) {
lnum = 0;

54
test/functional/ex_cmds/append_spec.lua Normal file
View File

@ -0,0 +1,54 @@
local helpers = require('test.functional.helpers')
local eq = helpers.eq
local feed = helpers.feed
local clear = helpers.clear
local funcs = helpers.funcs
local command = helpers.command
local curbufmeths = helpers.curbufmeths
before_each(function()
clear()
curbufmeths.set_lines(0, 1, true, { 'foo', 'bar', 'baz' })
end)
local buffer_contents = function()
return curbufmeths.get_lines(0, -1, false)
end
local cmdtest = function(cmd, prep, ret1)
describe(':' .. cmd, function()
it(cmd .. 's' .. prep .. ' the current line by default', function()
command(cmd .. '\nabc\ndef\n')
eq(ret1, buffer_contents())
end)
-- Used to crash because this invokes history processing which uses
-- hist_char2type which after fdb68e35e4c729c7ed097d8ade1da29e5b3f4b31
-- crashed.
it(cmd .. 's' .. prep .. ' the current line by default when feeding',
function()
feed(':' .. cmd .. '\nabc\ndef\n.\n')
eq(ret1, buffer_contents())
end)
-- This used to crash since that commit as well.
it('opens empty cmdline window', function()
local hisline = '" Some comment to be stored in history'
feed(':' .. hisline .. '<CR>')
feed(':' .. cmd .. '<CR>abc<CR>def<C-f>')
eq({ 'def' }, buffer_contents())
eq(hisline, funcs.histget(':', -2))
eq(cmd, funcs.histget(':'))
-- Test that command-line window was launched
eq('nofile', curbufmeths.get_option('buftype'))
eq('n', funcs.mode(1))
feed('<CR>')
eq('c', funcs.mode(1))
feed('.<CR>')
eq('n', funcs.mode(1))
eq(ret1, buffer_contents())
end)
end)
end
cmdtest('insert', ' before', { 'abc', 'def', 'foo', 'bar', 'baz' })
cmdtest('append', ' after', { 'foo', 'abc', 'def', 'bar', 'baz' })
cmdtest('change', '', { 'abc', 'def', 'bar', 'baz' })