server: add attach_buffers() method (#220)

2 files changed, 21 insertions, 9 deletions

diff --git a/lua/nvim-lsp-installer.lua b/lua/nvim-lsp-installer.lua
index d1ab5f20..52f8289a 100644
--- a/lua/nvim-lsp-installer.lua
+++ b/lua/nvim-lsp-installer.lua
@@ -188,13 +188,6 @@ function M.on_server_ready(cb)
     end)
 end
 
--- "Proxy" function for triggering attachment of LSP servers to all buffers (useful when just installed a new server
--- that wasn't installed at launch)
-M.lsp_attach_proxy = process.debounced(function()
-    -- As of writing, if the lspconfig server provides a filetypes setting, it uses FileType as trigger, otherwise it uses BufReadPost
-    vim.cmd [[ doautoall FileType | doautoall BufReadPost ]]
-end)
-
 -- old API
 M.get_server = servers.get_server
 M.get_available_servers = servers.get_available_servers
diff --git a/lua/nvim-lsp-installer/server.lua b/lua/nvim-lsp-installer/server.lua
index 922be0db..3cdcf192 100644
--- a/lua/nvim-lsp-installer/server.lua
+++ b/lua/nvim-lsp-installer/server.lua
@@ -45,8 +45,9 @@ function M.Server:new(opts)
     }, M.Server)
 end
 
----@param opts table @User-defined options. This is directly passed to the lspconfig's setup() method.
-function M.Server:setup(opts)
+---Sets up the language server via lspconfig. This function has the same signature as the setup function in nvim-lspconfig.
+---@param opts table @The lspconfig server configuration.
+function M.Server:setup_lsp(opts)
     if self._pre_setup then
         log.fmt_debug("Calling pre_setup for server=%s", self.name)
         self._pre_setup()
@@ -70,6 +71,24 @@ function M.Server:setup(opts)
     end
 end
 
+---Sets up the language server and attaches all open buffers.
+---@param opts table @The lspconfig server configuration.
+function M.Server:setup(opts)
+    self:setup_lsp(opts)
+    self:attach_buffers()
+end
+
+---Attaches this server to all current open buffers with a 'filetype' that matches the server's configured filetypes.
+function M.Server:attach_buffers()
+    log.debug("Attaching server to buffers", self.name)
+    local lsp_server = require("lspconfig")[self.name]
+    for _, bufnr in ipairs(vim.api.nvim_list_bufs()) do
+        log.fmt_trace("Attaching server=%s to bufnr=%s", self.name, bufnr)
+        lsp_server.manager.try_add_wrapper(bufnr)
+    end
+    log.debug("Successfully attached server to buffers", self.name)
+end
+
 ---Registers a handler (callback) to be executed when the server is ready to be setup.
 ---@param handler fun(server: Server)
 function M.Server:on_ready(handler)