1 files changed, 8 insertions, 4 deletions
diff --git a/runtime/lua/vim/lsp/handlers.lua b/runtime/lua/vim/lsp/handlers.lua
index a561630c2b..c974d1a6b4 100644
--- a/runtime/lua/vim/lsp/handlers.lua
+++ b/runtime/lua/vim/lsp/handlers.lua
@@ -28,7 +28,7 @@ local function progress_handler(_, result, ctx, _)
   local client_name = client and client.name or string.format("id=%d", client_id)
   if not client then
     err_message("LSP[", client_name, "] client has shut down after sending the message")
-    return
+    return vim.NIL
   end
   local val = result.value    -- unspecified yet
   local token = result.token  -- string or number
@@ -70,6 +70,7 @@ M['window/workDoneProgress/create'] =  function(_, result, ctx)
   local client_name = client and client.name or string.format("id=%d", client_id)
   if not client then
     err_message("LSP[", client_name, "] client has shut down after sending the message")
+    return vim.NIL
   end
   client.messages.progress[token] = {}
   return vim.NIL
@@ -284,7 +285,7 @@ local function location_handler(_, result, ctx, _)
     util.jump_to_location(result[1])
 
     if #result > 1 then
-      util.set_qflist(util.locations_to_items(result))
+      vim.fn.setqflist({}, ' ', {title = 'LSP locations', items = util.locations_to_items(result)})
       api.nvim_command("copen")
     end
   else
@@ -350,7 +351,10 @@ M['textDocument/signatureHelp'] = M.signature_help
 --see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#textDocument_documentHighlight
 M['textDocument/documentHighlight'] = function(_, result, ctx, _)
   if not result then return end
-  util.buf_highlight_references(ctx.bufnr, result, ctx.client_id)
+  local client_id = ctx.client_id
+  local client = vim.lsp.get_client_by_id(client_id)
+  if not client then return end
+  util.buf_highlight_references(ctx.bufnr, result, client.offset_encoding)
 end
 
 ---@private
@@ -375,7 +379,7 @@ local make_call_hierarchy_handler = function(direction)
         })
       end
     end
-    util.set_qflist(items)
+    vim.fn.setqflist({}, ' ', {title = 'LSP call hierarchy', items = items})
     api.nvim_command("copen")
   end
 end