mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

API/nvim_command_output: handle :echon capture (#8265)

Browse Source 
ref https://github.com/neovim/python-client/pull/290
This commit is contained in:
Justin M. Keyes
2018-04-13 00:49:37 +02:00
committed by GitHub
parent 5e18550ddd
commit 1c3a849881
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/api/vim.c
View File

@@ -239,15 +239,17 @@ String nvim_command_output(String command, Error *err)
}
if (capture_local.ga_len > 1) {
// redir always(?) prepends a newline; remove it.
char *s = capture_local.ga_data;
assert(s[0] == '\n');
memmove(s, s + 1, (size_t)capture_local.ga_len);
s[capture_local.ga_len - 1] = '\0';
return (String) { // Caller will free the memory.
.data = s,
.size = (size_t)(capture_local.ga_len - 1),
String s = (String){
.data = capture_local.ga_data,
.size = (size_t)capture_local.ga_len,
};
// redir usually (except :echon) prepends a newline.
if (s.data[0] == '\n') {
memmove(s.data, s.data + 1, s.size);
s.data[s.size - 1] = '\0';
s.size = s.size - 1;
}
return s; // Caller will free the memory.
}
theend:

2
test/functional/api/vim_spec.lua
View File

@@ -73,6 +73,8 @@ describe('api', function()
it('captures command output', function()
eq('this is\nspinal tap',
nvim('command_output', [[echo "this is\nspinal tap"]]))
eq('no line ending!',
nvim('command_output', [[echon "no line ending!"]]))
end)
it('captures empty command output', function()