mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-05 17:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ext_cmdline: added indent

Browse Source
This commit is contained in:
Dongdong Zhou
2017-06-26 15:27:49 +01:00
committed by Björn Linse
parent 461ae69824
commit fb389a6b4b
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/ui_events.in.h
View File

@@ -67,7 +67,7 @@ void popupmenu_select(Integer selected)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void tabline_update(Tabpage current, Array tabs) void tabline_update(Tabpage current, Array tabs)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_show(Array content, Integer pos, String firstc, String prompt, Integer level) void cmdline_show(Array content, Integer pos, String firstc, String prompt, Integer indent, Integer level)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;
void cmdline_pos(Integer pos, Integer level) void cmdline_pos(Integer pos, Integer level)
FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY; FUNC_API_SINCE(3) FUNC_API_REMOTE_ONLY;

6
src/nvim/ex_getln.c
View File

@@ -2726,7 +2726,11 @@ void ui_ext_cmdline_show(void)
ADD(text, STRING_OBJ(cstr_to_string("Normal"))); ADD(text, STRING_OBJ(cstr_to_string("Normal")));
ADD(text, STRING_OBJ(cstr_to_string((char *)(ccline.cmdbuff)))); ADD(text, STRING_OBJ(cstr_to_string((char *)(ccline.cmdbuff))));
ADD(content, ARRAY_OBJ(text)); ADD(content, ARRAY_OBJ(text));
ui_call_cmdline_show(content, ccline.cmdpos, cchar_to_string((char)ccline.cmdfirstc), cstr_to_string((char *)(ccline.cmdprompt)), ccline.level); ui_call_cmdline_show(content, ccline.cmdpos,
cchar_to_string((char)ccline.cmdfirstc),
cstr_to_string((char *)(ccline.cmdprompt)),
ccline.cmdindent,
ccline.level);
} }
/* /*

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

@@ -7,7 +7,7 @@ if helpers.pending_win32(pending) then return end
describe('External command line completion', function() describe('External command line completion', function()
local screen local screen
local shown = false local shown = false
local firstc, prompt, content, pos, char, shift, level, current_hide_level, in_function local firstc, prompt, content, pos, char, shift, indent, level, current_hide_level, in_function
before_each(function() before_each(function()
clear() clear()
@@ -19,7 +19,7 @@ describe('External command line completion', function()
current_hide_level = data[1] current_hide_level = data[1]
elseif name == "cmdline_show" then elseif name == "cmdline_show" then
shown = true shown = true
content, pos, firstc, prompt, level = unpack(data) content, pos, firstc, prompt, indent, level = unpack(data)
elseif name == "cmdline_char" then elseif name == "cmdline_char" then
char, shift = unpack(data) char, shift = unpack(data)
elseif name == "cmdline_pos" then elseif name == "cmdline_pos" then
@@ -171,6 +171,7 @@ describe('External command line completion', function()
| |
]], nil, nil, function() ]], nil, nil, function()
eq(true, in_function) eq(true, in_function)
eq(2, indent)
end) end)
feed('line1<cr>') feed('line1<cr>')
@@ -182,6 +183,7 @@ describe('External command line completion', function()
| |
]], nil, nil, function() ]], nil, nil, function()
eq(true, in_function) eq(true, in_function)
eq(2, indent)
end) end)
feed('endfunction<cr>') feed('endfunction<cr>')
@@ -195,6 +197,17 @@ describe('External command line completion', function()
eq(false, in_function) eq(false, in_function)
end) end)
feed(':sign<c-f>')
screen:expect([[
|
[No Name] |
:sign^ |
[Command Line] |
|
]], nil, nil, function()
eq(false, in_function)
end)
end) end)
end) end)
end) end)