Merge pull request #62 from k-86/fix-request-return-value

Fix inconsistent return value of request function
Shougo · Jun 3, 2024 · 79e270f · 79e270f
2 parents 1b5154e + e40ad73
commit 79e270f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/denops/@ddc-sources/lsp.ts b/denops/@ddc-sources/lsp.ts
@@ -260,9 +260,9 @@ export class Source extends BaseSource<Params> {
         lspItem,
         { client, timeout: 1000, sync: true, bufnr: bufnr },
       );
-      const { result } = u.ensure(
+      const result = u.ensure(
         response,
-        is.ObjectOf({ result: is.ObjectOf({ label: is.String }) }),
+        is.ObjectOf({ label: is.String }),
       );
       return result as LSP.CompletionItem;
     } catch {

diff --git a/lua/ddc_source_lsp/internal.lua b/lua/ddc_source_lsp/internal.lua
@@ -68,7 +68,10 @@ end
 function M.request_sync(clientId, method, params, opts)
   local client = vim.lsp.get_client_by_id(clientId)
   if client then
-    return client.request_sync(method, normalize(params), opts.timeout, opts.bufnr or 0)
+    local resp = client.request_sync(method, normalize(params), opts.timeout, opts.bufnr or 0)
+    if resp and resp.err == nil and resp.result then
+      return resp.result
+    end
   end
 end