mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 21:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8651 from MichaHoffmann/feature_refactor_channel

Browse Source 
channel.c: refactor spaghetti code
This commit is contained in:
Björn Linse
2018-07-15 19:55:53 +02:00
committed by GitHub
parent c230ef24a2 099718ae6d
commit dfe79b67a5
4 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/api/private/dispatch.c
View File

@@ -32,16 +32,17 @@ static void msgpack_rpc_add_method_handler(String method,
/// @param name API method name /// @param name API method name
/// @param name_len name size (includes terminating NUL) /// @param name_len name size (includes terminating NUL)
MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name, MsgpackRpcRequestHandler msgpack_rpc_get_handler_for(const char *name,
size_t name_len) size_t name_len,
Error *error)
{ {
String m = { .data = (char *)name, .size = name_len }; String m = { .data = (char *)name, .size = name_len };
MsgpackRpcRequestHandler rv = MsgpackRpcRequestHandler rv =
map_get(String, MsgpackRpcRequestHandler)(methods, m); map_get(String, MsgpackRpcRequestHandler)(methods, m);
if (!rv.fn) { if (!rv.fn) {
rv.fn = msgpack_rpc_handle_missing_method; api_set_error(error, kErrorTypeException, "Invalid method: %s",
m.size > 0 ? m.data : "<empty>");
} }
return rv; return rv;
} }

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

@@ -1162,11 +1162,12 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
} }
Array args = call.items[1].data.array; Array args = call.items[1].data.array;
MsgpackRpcRequestHandler handler = msgpack_rpc_get_handler_for(name.data, MsgpackRpcRequestHandler handler =
name.size); msgpack_rpc_get_handler_for(name.data,
if (handler.fn == msgpack_rpc_handle_missing_method) { name.size,
api_set_error(&nested_error, kErrorTypeException, "Invalid method: %s", &nested_error);
name.size > 0 ? name.data : "<empty>");
if (ERROR_SET(&nested_error)) {
break; break;
} }
Object result = handler.fn(channel_id, args, &nested_error); Object result = handler.fn(channel_id, args, &nested_error);

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

@@ -287,7 +287,6 @@ static void parse_msgpack(Channel *channel)
} }
} }
static void handle_request(Channel *channel, msgpack_object *request) static void handle_request(Channel *channel, msgpack_object *request)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_ALL
{ {
@@ -313,27 +312,24 @@ static void handle_request(Channel *channel, msgpack_object *request)
return; return;
} }
// Retrieve the request handler
MsgpackRpcRequestHandler handler; MsgpackRpcRequestHandler handler;
Array args = ARRAY_DICT_INIT;
msgpack_object *method = msgpack_rpc_method(request); msgpack_object *method = msgpack_rpc_method(request);
handler = msgpack_rpc_get_handler_for(method->via.bin.ptr,
method->via.bin.size,
&error);
if (method) { // check method arguments
handler = msgpack_rpc_get_handler_for(method->via.bin.ptr, Array args = ARRAY_DICT_INIT;
method->via.bin.size); if (!ERROR_SET(&error)
if (handler.fn == msgpack_rpc_handle_missing_method) { && !msgpack_rpc_to_array(msgpack_rpc_args(request), &args)) {
String m = method->via.bin.size > 0 api_set_error(&error, kErrorTypeException, "Invalid method arguments");
? cbuf_to_string(method->via.bin.ptr, method->via.bin.size) }
: cstr_to_string("<empty>");
ADD(args, STRING_OBJ(m)); if (ERROR_SET(&error)) {
handler.async = true; send_error(channel, request_id, error.msg);
} else if (!msgpack_rpc_to_array(msgpack_rpc_args(request), &args)) { api_clear_error(&error);
handler.fn = msgpack_rpc_handle_invalid_arguments; api_free_array(args);
handler.async = true; return;
}
} else {
handler.fn = msgpack_rpc_handle_missing_method;
handler.async = true;
} }
RequestEvent *evdata = xmalloc(sizeof(RequestEvent)); RequestEvent *evdata = xmalloc(sizeof(RequestEvent));

19
src/nvim/msgpack_rpc/helpers.c
View File

@@ -488,25 +488,6 @@ void msgpack_rpc_from_dictionary(Dictionary result, msgpack_packer *res)
} }
} }
/// Handler executed when an invalid method name is passed
Object msgpack_rpc_handle_missing_method(uint64_t channel_id,
Array args,
Error *error)
{
api_set_error(error, kErrorTypeException, "Invalid method: %s",
args.size > 0 ? args.items[0].data.string.data : "?");
return NIL;
}
/// Handler executed when malformated arguments are passed
Object msgpack_rpc_handle_invalid_arguments(uint64_t channel_id,
Array args,
Error *error)
{
api_set_error(error, kErrorTypeException, "Invalid method arguments");
return NIL;
}
/// Serializes a msgpack-rpc request or notification(id == 0) /// Serializes a msgpack-rpc request or notification(id == 0)
void msgpack_rpc_serialize_request(uint64_t request_id, void msgpack_rpc_serialize_request(uint64_t request_id,
const String method, const String method,