Merge pull request #8651 from MichaHoffmann/feature_refactor_channel

channel.c: refactor spaghetti code

2 files changed, 10 insertions, 8 deletions

diff --git a/src/nvim/api/private/dispatch.c b/src/nvim/api/private/dispatch.c
index 5207a57b88..dec2b6c185 100644
--- a/src/nvim/api/private/dispatch.c
+++ b/src/nvim/api/private/dispatch.c
@@ -32,16 +32,17 @@ static void msgpack_rpc_add_method_handler(String method,
 /// @param name API method name
 /// @param name_len name size (includes terminating NUL)
 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 };
   MsgpackRpcRequestHandler rv =
     map_get(String, MsgpackRpcRequestHandler)(methods, m);
 
   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;
 }
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 002d9da781..03567ddfd8 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1162,11 +1162,12 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
     }
     Array args = call.items[1].data.array;
 
-    MsgpackRpcRequestHandler handler = msgpack_rpc_get_handler_for(name.data,
-                                                                   name.size);
-    if (handler.fn == msgpack_rpc_handle_missing_method) {
-      api_set_error(&nested_error, kErrorTypeException, "Invalid method: %s",
-                    name.size > 0 ? name.data : "<empty>");
+    MsgpackRpcRequestHandler handler =
+        msgpack_rpc_get_handler_for(name.data,
+                                    name.size,
+                                    &nested_error);
+
+    if (ERROR_SET(&nested_error)) {
       break;
     }
     Object result = handler.fn(channel_id, args, &nested_error);