Move extensions to new messaging system and fix issues in clangd implementation

Author: wbthomason

lua/lsp-status/extensions/clangd.lua

@@ -1,16 +1,19 @@
+local util = require('lsp-status/util')
+
 local messages = {}
 
 local function init(_messages, _)
   messages = _messages
 end
 
+local function ensure_init(id)
+  util.ensure_init(messages, id, 'clangd')
+end
+
 local callbacks = {
-  ['textDocument/clangd.fileStatus'] = function(_, _, statusMessage, _, buffnr)
-    table.insert(messages[buffnr].clangd, {
-      uri = statusMessage.uri,
-      content = statusMessage.state,
-      show_once = true
-    })
+  ['textDocument/clangd.fileStatus'] = function(_, _, statusMessage, client_id)
+    ensure_init(client_id)
+    messages[client_id].status = { uri = statusMessage.uri, content = statusMessage.state }
     vim.api.nvim_command('doautocmd User LspMessageUpdate')
   end,
 }

lua/lsp-status/extensions/pyls_ms.lua

@@ -1,37 +1,33 @@
+local util = require('lsp-status/util')
+
 local messages = {}
 local function init(_messages, _)
   messages = _messages
 end
 
+local function ensure_init(id)
+  util.ensure_init(messages, id, 'pyls_ms')
+end
+
 local callbacks =  {
-  ['python/setStatusBarMessage'] = function(_, _, message, buffnr)
-    table.insert(messages[buffnr].pyls_ms, { content = message[1] })
+  ['python/setStatusBarMessage'] = function(_, _, message, client_id)
+    ensure_init(client_id)
+    messages[client_id].static_message = { content = message[1] }
     vim.api.nvim_command('doautocmd User LspMessageUpdate')
   end,
-  ['python/beginProgress'] = function(_, _, _, buffnr)
-    if not messages[buffnr] then
-      messages[buffnr] = {}
-    end
-
-    if not messages[buffnr].pyls_ms then
-      messages[buffnr].pyls_ms = {}
-    end
-
-    if not messages[buffnr].pyls_ms.progress then
-      messages[buffnr].pyls_ms.progress = {}
-    end
-
-    if not messages[buffnr].pyls_ms.progress[1] then
-      messages[buffnr].pyls_ms.progress[1] = { spinner = 1, title = 'MPLS' }
+  ['python/beginProgress'] = function(_, _, _, client_id)
+    ensure_init(client_id)
+    if not messages[client_id].progress[1] then
+      messages[client_id].progress[1] = { spinner = 1, title = 'MPLS' }
     end
   end,
-  ['python/reportProgress'] = function(_, _, message, buffnr)
-    messages[buffnr].pyls_ms.progress[1].spinner = messages[buffnr].pyls_ms.progress[1].spinner + 1
-    messages[buffnr].pyls_ms.progress[1].title = message[1]
+  ['python/reportProgress'] = function(_, _, message, client_id)
+    messages[client_id].progress[1].spinner = messages[client_id].progress[1].spinner + 1
+    messages[client_id].progress[1].title = message[1]
     vim.api.nvim_command('doautocmd User LspMessageUpdate')
   end,
-  ['python/endProgress'] = function(_, _, _, buffnr)
-    messages[buffnr].pyls_ms.progress[1] = nil
+  ['python/endProgress'] = function(_, _, _, client_id)
+    messages[client_id].progress[1] = nil
     vim.api.nvim_command('doautocmd User LspMessageUpdate')
   end,
 }