From 2e4620cb4f3ffea328f8b0e57daa42d8f54024e8 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 9 Aug 2022 16:11:45 +0200 Subject: fix(lsp): return the actual resolved mason-config (#2889) --- lua/lvim/lsp/manager.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lua/lvim') diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua index aa76af6c..258a4983 100644 --- a/lua/lvim/lsp/manager.lua +++ b/lua/lvim/lsp/manager.lua @@ -22,8 +22,8 @@ local function resolve_mason_config(server_name) conf.cmd[1] = exepath end end - Log:debug(fmt("resolved mason configuration for %s, got %s", server_name, vim.inspect(mason_config))) - return mason_config or {} + Log:debug(fmt("resolved mason configuration for %s, got %s", server_name, vim.inspect(conf))) + return conf or {} end ---Resolve the configuration for a server by merging with the default config @@ -107,12 +107,12 @@ function M.setup(server_name, user_config) if not registry.is_installed(pkg_name) then if should_auto_install(server_name) then Log:debug "Automatic server installation detected" - vim.notify_once(string.format("Installation in progoress for [%s] server", server_name), vim.log.levels.INFO) + vim.notify_once(string.format("Installation in progress for [%s]", server_name), vim.log.levels.INFO) local pkg = registry.get_package(pkg_name) pkg:install():once("closed", function() if pkg:is_installed() then vim.schedule(function() - vim.notify_once(string.format("Installation complete for [%s] server", server_name), vim.log.levels.INFO) + vim.notify_once(string.format("Installation complete for [%s]", server_name), vim.log.levels.INFO) -- mason config is only available once the server has been installed local config = resolve_config(server_name, resolve_mason_config(server_name), user_config) launch_server(server_name, config) -- cgit v1.2.3