fixup: Handle new lsp signature

Author: tjdevries

lua/lsp-status/current_function.lua

@@ -22,7 +22,7 @@ local scope_kinds = {
 }
 
 -- Find current function context
-local function current_function_callback(_, _, result, _, _)
+local function current_function_callback(_, result)
   vim.b.lsp_current_function = ''
   if type(result) ~= 'table' then
     return
@@ -59,7 +59,7 @@ end
 
 local function update_current_function()
   local params = { textDocument = lsp_util.make_text_document_params() }
-  vim.lsp.buf_request(0, 'textDocument/documentSymbol', params, current_function_callback)
+  vim.lsp.buf_request(0, 'textDocument/documentSymbol', params, util.mk_handler(current_function_callback))
 end
 
 local M = {

lua/lsp-status/extensions/clangd.lua

@@ -10,11 +10,13 @@ local function init(_messages, _) messages = _messages end
 local function ensure_init(id) util.ensure_init(messages, id, 'clangd') end
 
 local handlers = {
-  ['textDocument/clangd.fileStatus'] = function(_, _, statusMessage, client_id)
+  ['textDocument/clangd.fileStatus'] = util.mk_handler(function(_, statusMessage, ctx)
+    local client_id = ctx.client_id
+
     ensure_init(client_id)
     messages[client_id].status = {uri = statusMessage.uri, content = statusMessage.state}
     redraw.redraw()
-  end
+  end)
 }
 
 --- Return the handler {LSP Method: handler} table for `clangd`'s `fileStatus` extension

lua/lsp-status/messaging.lua

@@ -11,7 +11,9 @@ local function unregister_client(id)
   clients[id] = nil
 end
 
-local function progress_callback(_, _, msg, client_id)
+local function progress_callback(_, msg, ctx)
+  local client_id = ctx.client_id
+
   util.ensure_init(messages, client_id, client_id)
   local val = msg.value
   if val.kind then
@@ -94,7 +96,9 @@ local function get_messages()
   return new_messages
 end
 
-local function register_progress() vim.lsp.handlers['$/progress'] = progress_callback end
+local function register_progress()
+  vim.lsp.handlers['$/progress'] = util.mk_handler(progress_callback)
+end
 
 -- Client registration for messages
 local function register_client(id, name)

lua/lsp-status/util.lua

@@ -63,11 +63,30 @@ local function ensure_init(messages, id, name)
   end
 end
 
+local function mk_handler(fn)
+  return function(...)
+    local config_or_client_id = select(4, ...)
+    local is_new = type(config_or_client_id) ~= 'number'
+    if is_new then
+      fn(...)
+    else
+      local err = select(1, ...)
+      local method = select(2, ...)
+      local result = select(3, ...)
+      local client_id = select(4, ...)
+      local bufnr = select(5, ...)
+      local config = select(6, ...)
+      fn(err, result, { method = method, client_id = client_id, bufnr = bufnr }, config)
+    end
+  end
+end
+
 local M = {
   extract_symbols = extract_symbols,
   in_range = in_range,
   filter = filter,
-  ensure_init = ensure_init
+  ensure_init = ensure_init,
+  mk_handler = mk_handler,
 }
 
 return M