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

Merge pull request #8008 from bfredl/arrayfree

Browse Source 
ex_getln: clear cmdline_block after it's freed
This commit is contained in:
Björn Linse 2018-02-14 19:23:11 +01:00 committed by GitHub
commit 77286915a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/ex_getln.c
View File

@ -194,7 +194,8 @@ static int cmd_showtail; /* Only show path tail in lists ? */
static int new_cmdpos; /* position set by set_cmdline_pos() */
static Array cmdline_block; ///< currently displayed block of context
/// currently displayed block of context
static Array cmdline_block = ARRAY_DICT_INIT;
/*
* Type used by call_user_expand_func
@ -2990,6 +2991,7 @@ void ui_ext_cmdline_block_append(int indent, const char *line)
void ui_ext_cmdline_block_leave(void)
{
api_free_array(cmdline_block);
cmdline_block = (Array)ARRAY_DICT_INIT;
ui_call_cmdline_block_hide();
}

29
test/functional/ui/cmdline_spec.lua
View File

@ -348,6 +348,35 @@ describe('external cmdline', function()
{ { {}, ' line1'} } }, block)
end)
feed('endfunction<cr>')
screen:expect([[
^ |
{1:~ }|
{1:~ }|
{1:~ }|
|
]], nil, nil, function()
eq(nil, block)
end)
-- Try once more, to check buffer is reinitialized. #8007
feed(':function Bar()<cr>')
screen:expect([[
^ |
{1:~ }|
{1:~ }|
{1:~ }|
|
]], nil, nil, function()
eq({{
content = { { {}, "" } },
firstc = ":",
indent = 2,
pos = 0,
prompt = "",
}}, cmdline)
eq({ { { {}, 'function Bar()'} } }, block)
end)
feed('endfunction<cr>')
screen:expect([[