thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1924: LSP server message still wrongly handled (after 9.0.1922)

Browse Source 
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 <cb@256bit.org>
Co-authored-by: Yegappan Lakshmanan <yegappan@yahoo.com>
This commit is contained in:
Yegappan Lakshmanan
2023-09-21 16:36:28 +02:00
committed by Christian Brabandt
parent db54e989b5
commit 1926ae4184
5 changed files with 80 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/channel.c
View File

@@ -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;