mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-08 10:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel: recognized nvim-style errors

Browse Source
This commit is contained in:
Scott Prager
2015-04-06 13:37:09 -04:00
parent 676133aa9b
commit 920e5905d8
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/msgpack_rpc/channel.c
View File

@@ -225,7 +225,25 @@ Object channel_send_call(uint64_t id,
channel->pending_requests--; channel->pending_requests--;
if (frame.errored) { if (frame.errored) {
api_set_error(err, Exception, "%s", frame.result.data.string.data); if (frame.result.type == kObjectTypeString) {
api_set_error(err, Exception, "%s", frame.result.data.string.data);
} else if (frame.result.type == kObjectTypeArray) {
// Should be an error in the form [type, message]
Array array = frame.result.data.array;
if (array.size == 2 && array.items[0].type == kObjectTypeInteger
&& (array.items[0].data.integer == kErrorTypeException
|| array.items[0].data.integer == kErrorTypeValidation)
&& array.items[1].type == kObjectTypeString) {
err->type = (ErrorType) array.items[0].data.integer;
xstrlcpy(err->msg, array.items[1].data.string.data, sizeof(err->msg));
err->set = true;
} else {
api_set_error(err, Exception, "%s", "unknown error");
}
} else {
api_set_error(err, Exception, "%s", "unknown error");
}
api_free_object(frame.result); api_free_object(frame.result);
} }

6
test/functional/api/server_requests_spec.lua
View File

@@ -148,5 +148,11 @@ describe('server -> client', function()
-- Call get_line_slice(buf, range [0,0], includes start, includes end) -- Call get_line_slice(buf, range [0,0], includes start, includes end)
eq({'SOME TEXT'}, eval("rpcrequest(vim, 'buffer_get_line_slice', "..buf..", 0, 0, 1, 1)")) eq({'SOME TEXT'}, eval("rpcrequest(vim, 'buffer_get_line_slice', "..buf..", 0, 0, 1, 1)"))
end) end)
it('returns an error if the request failed', function()
local status, err = pcall(eval, "rpcrequest(vim, 'does-not-exist')")
eq(false, status)
eq(true, string.match(err, ': (.*)') == 'Failed to evaluate expression')
end)
end) end)
end) end)