Mercurial > vim
changeset 32311:10a03ae8ba60 v9.0.1487
patch 9.0.1487: Content-type header for LSP channel not according to spec
Commit: https://github.com/vim/vim/commit/c3eddd2068620ceb4e475961192c1d8cae3350cd
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Tue Apr 25 14:54:54 2023 +0100
patch 9.0.1487: Content-type header for LSP channel not according to spec
Problem: Content-type header for LSP channel not according to spec.
Solution: Use "vscode-jsonrpc" instead of "vim-jsonrpc". (Yegappan
Lakshmanan, closes #12295)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 25 Apr 2023 16:00:09 +0200 |
| parents | c6eab83d1ba9 |
| children | fcac9fad9e23 |
| files | src/json.c src/testdir/test_channel.vim src/testdir/test_channel_lsp.py src/version.c |
| diffstat | 4 files changed, 10 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/json.c +++ b/src/json.c @@ -103,9 +103,10 @@ json_encode_lsp_msg(typval_T *val) ga_append(&ga, NUL); ga_init2(&lspga, 1, 4000); + // Header according to LSP specification. vim_snprintf((char *)IObuff, IOSIZE, "Content-Length: %u\r\n" - "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n\r\n", + "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n\r\n", ga.ga_len - 1); ga_concat(&lspga, IObuff); ga_concat_len(&lspga, ga.ga_data, ga.ga_len);
--- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -2670,7 +2670,7 @@ func LspTests(port) " " Test for sending a raw message " let g:lspNotif = [] " let s = "Content-Length: 62\r\n" - " let s ..= "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n" + " let s ..= "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n" " let s ..= "\r\n" " let s ..= '{"method":"echo","jsonrpc":"2.0","params":{"m":"raw-message"}}' " call ch_sendraw(ch, s)
--- a/src/testdir/test_channel_lsp.py +++ b/src/testdir/test_channel_lsp.py @@ -35,7 +35,7 @@ class ThreadedTCPRequestHandler(socketse v['id'] = msgid s = json.dumps(v) resp = "Content-Length: " + str(len(s)) + "\r\n" - resp += "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n" + resp += "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n" resp += "\r\n" resp += s if self.debug: @@ -46,7 +46,7 @@ class ThreadedTCPRequestHandler(socketse v = 'wrong-payload' s = json.dumps(v) resp = "Content-Length: " + str(len(s)) + "\r\n" - resp += "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n" + resp += "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n" resp += "\r\n" resp += s self.request.sendall(resp.encode('utf-8')) @@ -60,7 +60,7 @@ class ThreadedTCPRequestHandler(socketse def send_empty_payload(self): resp = "Content-Length: 0\r\n" - resp += "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n" + resp += "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n" resp += "\r\n" self.request.sendall(resp.encode('utf-8')) @@ -71,7 +71,7 @@ class ThreadedTCPRequestHandler(socketse resp = "Host: abc.vim.org\r\n" resp += "User-Agent: Python\r\n" resp += "Accept-Language: en-US,en\r\n" - resp += "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n" + resp += "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n" resp += "Content-Length: " + str(len(s)) + "\r\n" resp += "\r\n" resp += s @@ -93,7 +93,7 @@ class ThreadedTCPRequestHandler(socketse # test for sending the http header without length v = {'jsonrpc': '2.0', 'id': msgid, 'result': resp_dict} s = json.dumps(v) - resp = "Content-Type: application/vim-jsonrpc; charset=utf-8\r\n" + resp = "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n" resp += "\r\n" resp += s self.request.sendall(resp.encode('utf-8'))