IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(remote): report connection error, missing return values

Browse Source
This commit is contained in:
Charlie Groves 2022-03-10 17:26:20 -05:00
parent 29c3632285
commit 2be938a251
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/main.c
View File

@ -820,9 +820,13 @@ static void handle_remote_client(mparm_T *params, int remote_args,
if (server_addr != NULL) { if (server_addr != NULL) {
rc_id = channel_connect(false, server_addr, true, on_data, 50, &error); rc_id = channel_connect(false, server_addr, true, on_data, 50, &error);
} }
if (error) {
Boolean should_exit = true; mch_msg("Failed to connect to server ");
Boolean tabbed; mch_msg(server_addr);
mch_msg("\nReason: ");
mch_msg(error);
mch_msg("Continuing with remote command in case we can execute locally\n");
}
int t_argc = remote_args; int t_argc = remote_args;
Array args = ARRAY_DICT_INIT; Array args = ARRAY_DICT_INIT;
@ -853,6 +857,9 @@ static void handle_remote_client(mparm_T *params, int remote_args,
os_exit(2); os_exit(2);
} }
TriState should_exit = kNone;
TriState tabbed = kNone;
for (size_t i = 0; i < rvobj.data.dictionary.size ; i++) { for (size_t i = 0; i < rvobj.data.dictionary.size ; i++) {
if (strcmp(rvobj.data.dictionary.items[i].key.data, "errmsg") == 0) { if (strcmp(rvobj.data.dictionary.items[i].key.data, "errmsg") == 0) {
if (rvobj.data.dictionary.items[i].value.type != kObjectTypeString) { if (rvobj.data.dictionary.items[i].value.type != kObjectTypeString) {
@ -867,21 +874,25 @@ static void handle_remote_client(mparm_T *params, int remote_args,
mch_errmsg("vim._cs_remote returned an unexpected type for 'tabbed'\n"); mch_errmsg("vim._cs_remote returned an unexpected type for 'tabbed'\n");
os_exit(2); os_exit(2);
} }
tabbed = rvobj.data.dictionary.items[i].value.data.boolean; tabbed = rvobj.data.dictionary.items[i].value.data.boolean ? kTrue : kFalse;
} else if (strcmp(rvobj.data.dictionary.items[i].key.data, "should_exit") == 0) { } else if (strcmp(rvobj.data.dictionary.items[i].key.data, "should_exit") == 0) {
if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) { if (rvobj.data.dictionary.items[i].value.type != kObjectTypeBoolean) {
mch_errmsg("vim._cs_remote returned an unexpected type for 'should_exit'\n"); mch_errmsg("vim._cs_remote returned an unexpected type for 'should_exit'\n");
os_exit(2); os_exit(2);
} }
should_exit = rvobj.data.dictionary.items[i].value.data.boolean; should_exit = rvobj.data.dictionary.items[i].value.data.boolean ? kTrue : kFalse;
} }
} }
if (should_exit == kNone || tabbed == kNone) {
mch_errmsg("vim._cs_remote didn't return a value for should_exit or tabbed, bailing\n");
os_exit(2);
}
api_free_object(o); api_free_object(o);
if (should_exit) { if (should_exit == kTrue) {
os_exit(0); os_exit(0);
} }
if (tabbed) { if (tabbed == kTrue) {
params->window_count = argc - remote_args - 1; params->window_count = argc - remote_args - 1;
params->window_layout = WIN_TABS; params->window_layout = WIN_TABS;
} }