From 1926ae41845c3b6e2045b29225365c8a2e4eb1da Mon Sep 17 00:00:00 2001 From: Yegappan Lakshmanan Date: Thu, 21 Sep 2023 16:36:28 +0200 Subject: patch 9.0.1924: LSP server message still wrongly handled (after 9.0.1922) Problem: LSP server message still wrongly handled (after 9.0.1922) Solution: Handle 'method' messages properly, don't discard them, add tests. closes: #13141 Signed-off-by: Christian Brabandt Co-authored-by: Yegappan Lakshmanan --- src/channel.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/channel.c') diff --git a/src/channel.c b/src/channel.c index 4326ca7c11..1de376884a 100644 --- a/src/channel.c +++ b/src/channel.c @@ -2466,6 +2466,12 @@ channel_get_json( d = item->jq_value->vval.v_dict; if (d == NULL) goto nextitem; + // When looking for a response message from the LSP server, + // ignore new LSP request and notification messages.  LSP + // request and notification messages have the "method" field in + // the header and the response messages do not have this field. + if (dict_has_key(d, "method")) + goto nextitem; di = dict_find(d, (char_u *)"id", -1); if (di == NULL) goto nextitem; @@ -2927,16 +2933,9 @@ may_invoke_callback(channel_T *channel, ch_part_T part) seq_nr = 0; if (d != NULL) { - // When looking for a response message from the LSP server, - // ignore new LSP request and notification messages. LSP - // request and notification messages have the "method" field in - // the header and the response messages do not have this field. - if (!dict_has_key(d, "method")) - { - di = dict_find(d, (char_u *)"id", -1); - if (di != NULL && di->di_tv.v_type == VAR_NUMBER) - seq_nr = di->di_tv.vval.v_number; - } + di = dict_find(d, (char_u *)"id", -1); + if (di != NULL && di->di_tv.v_type == VAR_NUMBER) + seq_nr = di->di_tv.vval.v_number; } argv[1] = *listtv; -- cgit v1.2.3