GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-17 01:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(remote): restore previous --remote-expr output formatting (#23988)

Browse Source 
- Use tostring() as that's what print() uses internally.
- Do not append trailing new line.
This commit is contained in:
zeertzjq
2023-06-11 22:12:32 +08:00
committed by GitHub
parent dcb341315a
commit bde59e8147
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/lua/vim/_editor.lua
View File

@ -940,14 +940,13 @@ function vim._cs_remote(rcid, server_addr, connect_error, args)
if rcid == 0 then if rcid == 0 then
return { errmsg = connection_failure_errmsg('Send failed.') } return { errmsg = connection_failure_errmsg('Send failed.') }
end end
vim.fn.rpcrequest(rcid, 'nvim_input', args[2]) vim.rpcrequest(rcid, 'nvim_input', args[2])
return { should_exit = true, tabbed = false } return { should_exit = true, tabbed = false }
elseif subcmd == 'expr' then elseif subcmd == 'expr' then
if rcid == 0 then if rcid == 0 then
return { errmsg = connection_failure_errmsg('Send expression failed.') } return { errmsg = connection_failure_errmsg('Send expression failed.') }
end end
local expr = 'string(' .. args[2] .. ')' local res = tostring(vim.rpcrequest(rcid, 'nvim_eval', args[2]))
local res = vim.fn.rpcrequest(rcid, 'nvim_eval', expr)
return { result = res, should_exit = true, tabbed = false } return { result = res, should_exit = true, tabbed = false }
elseif subcmd ~= '' then elseif subcmd ~= '' then
return { errmsg = 'Unknown option argument: ' .. args[1] } return { errmsg = 'Unknown option argument: ' .. args[1] }

1
src/nvim/main.c
View File

@ -967,7 +967,6 @@ static void remote_request(mparm_T *params, int remote_args, char *server_addr,
os_exit(2); os_exit(2);
} }
os_msg(rvobj.data.dictionary.items[i].value.data.string.data); os_msg(rvobj.data.dictionary.items[i].value.data.string.data);
os_msg("\n");
} else if (strequal(rvobj.data.dictionary.items[i].key.data, "tabbed")) { } else if (strequal(rvobj.data.dictionary.items[i].key.data, "tabbed")) {
if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) { if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) {
os_errmsg("vim._cs_remote returned an unexpected type for 'tabbed'\n"); os_errmsg("vim._cs_remote returned an unexpected type for 'tabbed'\n");

9
test/functional/core/remote_spec.lua
View File

@ -8,7 +8,6 @@ local exec_lua = helpers.exec_lua
local expect = helpers.expect local expect = helpers.expect
local funcs = helpers.funcs local funcs = helpers.funcs
local insert = helpers.insert local insert = helpers.insert
local is_os = helpers.is_os
local nvim_prog = helpers.nvim_prog local nvim_prog = helpers.nvim_prog
local new_argv = helpers.new_argv local new_argv = helpers.new_argv
local neq = helpers.neq local neq = helpers.neq
@ -105,10 +104,12 @@ describe('Remote', function()
end) end)
it('evaluate expressions', function() it('evaluate expressions', function()
local linesep = is_os('win') and '\r\n' or '\n' eq({ '0', '' }, run_remote('--remote-expr', 'setline(1, "Yo")'))
eq({ "function('get')" .. linesep, '' }, run_remote('--remote-expr', 'function("get")')) eq({ 'Yo', '' }, run_remote('--remote-expr', 'getline(1)'))
eq({ '0' .. linesep, '' }, run_remote('--remote-expr', 'setline(1, "Yo")'))
expect('Yo') expect('Yo')
eq({ '1.25', '' }, run_remote('--remote-expr', '1.25'))
eq({ 'no', '' }, run_remote('--remote-expr', '0z6E6F'))
eq({ '\t', '' }, run_remote('--remote-expr', '"\t"'))
end) end)
end) end)