From 48a59f8f4f3eced84b21a473527b00ef1b9b5bd2 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Fri, 30 Apr 2021 13:40:20 +0200 Subject: Add formatting_seq_sync, change formatting and formatting_sync --- runtime/lua/vim/lsp.lua | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'runtime/lua/vim/lsp.lua') diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 26700288af..d54420844e 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -890,6 +890,42 @@ function lsp.start_client(config) end) end + --@private + --- Sends a request to the server and synchronously waits for the response. + --- + --- This is a wrapper around {client.request} + --- + --@param method (string) LSP method name. + --@param params (table) LSP request params. + --@param timeout_ms (number, optional, default=100) Maximum time in + ---milliseconds to wait for a result. + --@param bufnr (number) Buffer handle (0 for current). + --@returns { err, result }, where `err` and `result` come from the |lsp-handler|. + ---On timeout, cancel or error, returns `(nil, err)` where `err` is a + ---string describing the failure reason. If the request was unsuccessful + ---returns `nil`. + --@see |vim.lsp.buf_request_sync()| + function client.request_sync(method, params, timeout_ms, bufnr) + local request_result = nil + local function _sync_handler(err, _, result) + request_result = { error = err, result = result } + end + + local success, request_id = client.request(method, params, _sync_handler, + bufnr) + if not success then return nil end + + local wait_result, reason = vim.wait(timeout_ms or 100, function() + return request_result ~= nil + end, 10) + + if not wait_result then + client.cancel_request(request_id) + return nil, wait_result_reason[reason] + end + return request_result + end + --@private --- Sends a notification to an LSP server. --- -- cgit From 54368736d0aa30284b73bf0a78fa295d8e835c8f Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 2 May 2021 15:23:13 +0200 Subject: doc clarification --- runtime/lua/vim/lsp.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/lua/vim/lsp.lua') diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index d54420844e..96b404aa51 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -900,7 +900,7 @@ function lsp.start_client(config) --@param timeout_ms (number, optional, default=100) Maximum time in ---milliseconds to wait for a result. --@param bufnr (number) Buffer handle (0 for current). - --@returns { err, result }, where `err` and `result` come from the |lsp-handler|. + --@returns { err=err, result=result }, a dictionary, where `err` and `result` come from the |lsp-handler|. ---On timeout, cancel or error, returns `(nil, err)` where `err` is a ---string describing the failure reason. If the request was unsuccessful ---returns `nil`. @@ -908,7 +908,7 @@ function lsp.start_client(config) function client.request_sync(method, params, timeout_ms, bufnr) local request_result = nil local function _sync_handler(err, _, result) - request_result = { error = err, result = result } + request_result = { err = err, result = result } end local success, request_id = client.request(method, params, _sync_handler, -- cgit From d923f38882d8c6f6966552073147cf35a85fe369 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 2 May 2021 16:24:58 +0200 Subject: Add client.request_sync doc --- runtime/lua/vim/lsp.lua | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'runtime/lua/vim/lsp.lua') diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 96b404aa51..9091d310dc 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -483,6 +483,13 @@ end --- result. You can use this with `client.cancel_request(request_id)` --- to cancel the request. --- +--- - request_sync(method, params, timeout_ms, bufnr) +--- Sends a request to the server and synchronously waits for the response. +--- This is a wrapper around {client.request} +--- Returns: { err=err, result=result }, a dictionary, where `err` and `result` come from +--- the |lsp-handler|. On timeout, cancel or error, returns `(nil, err)` where `err` is a +--- string describing the failure reason. If the request was unsuccessful returns `nil`. +--- --- - notify(method, params) --- Sends a notification to an LSP server. --- Returns: a boolean to indicate if the notification was successful. If -- cgit From bcf03affbd309c233bd7a2f0d8f30b6e3fb0aa87 Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Sun, 2 May 2021 17:08:57 +0200 Subject: Increase default LSP sync timeout to 1000ms --- runtime/lua/vim/lsp.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'runtime/lua/vim/lsp.lua') diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 9091d310dc..93ec9ed624 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -904,7 +904,7 @@ function lsp.start_client(config) --- --@param method (string) LSP method name. --@param params (table) LSP request params. - --@param timeout_ms (number, optional, default=100) Maximum time in + --@param timeout_ms (number, optional, default=1000) Maximum time in ---milliseconds to wait for a result. --@param bufnr (number) Buffer handle (0 for current). --@returns { err=err, result=result }, a dictionary, where `err` and `result` come from the |lsp-handler|. @@ -922,7 +922,7 @@ function lsp.start_client(config) bufnr) if not success then return nil end - local wait_result, reason = vim.wait(timeout_ms or 100, function() + local wait_result, reason = vim.wait(timeout_ms or 1000, function() return request_result ~= nil end, 10) @@ -1332,12 +1332,12 @@ end --- --- Calls |vim.lsp.buf_request_all()| but blocks Nvim while awaiting the result. --- Parameters are the same as |vim.lsp.buf_request()| but the return result is ---- different. Wait maximum of {timeout_ms} (default 100) ms. +--- different. Wait maximum of {timeout_ms} (default 1000) ms. --- --@param bufnr (number) Buffer handle, or 0 for current. --@param method (string) LSP method name --@param params (optional, table) Parameters to send to the server ---@param timeout_ms (optional, number, default=100) Maximum time in +--@param timeout_ms (optional, number, default=1000) Maximum time in --- milliseconds to wait for a result. --- --@returns Map of client_id:request_result. On timeout, cancel or error, @@ -1350,7 +1350,7 @@ function lsp.buf_request_sync(bufnr, method, params, timeout_ms) request_results = it end) - local wait_result, reason = vim.wait(timeout_ms or 100, function() + local wait_result, reason = vim.wait(timeout_ms or 1000, function() return request_results ~= nil end, 10) -- cgit