Merge LunarVim/release-candidate

1 files changed, 7 insertions, 7 deletions

diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index d00f75c6..68a64d6c 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -137,10 +137,10 @@ function M.get_common_opts()
 end
 
 local LSP_DEPRECATED_SIGN_MAP = {
-  ["LspDiagnosticsSignError"] = "DiagnosticSignError",
-  ["LspDiagnosticsSignWarning"] = "DiagnosticSignWarn",
-  ["LspDiagnosticsSignHint"] = "DiagnosticSignHint",
-  ["LspDiagnosticsSignInformation"] = "DiagnosticSignInfo",
+  ["DiagnosticSignError"] = "LspDiagnosticsSignError",
+  ["DiagnosticSignWarn"] = "LspDiagnosticsSignWarning",
+  ["DiagnosticSignHint"] = "LspDiagnosticsSignHint",
+  ["DiagnosticSignInfo"] = "LspDiagnosticsSignInformation",
 }
 
 function M.setup()
@@ -151,11 +151,11 @@ function M.setup()
     return
   end
 
-  local is_neovim_nightly = vim.fn.has "nvim-0.5.1" > 0
+  local is_neovim_5 = vim.fn.has "nvim-0.6" ~= 1
 
   for _, sign in ipairs(lvim.lsp.diagnostics.signs.values) do
     local lsp_sign_name = LSP_DEPRECATED_SIGN_MAP[sign.name]
-    if is_neovim_nightly and lsp_sign_name then
+    if is_neovim_5 and lsp_sign_name then
       vim.fn.sign_define(lsp_sign_name, { texthl = lsp_sign_name, text = sign.text, numhl = lsp_sign_name })
     end
     vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = sign.name })
@@ -171,7 +171,7 @@ function M.setup()
 
   require("lvim.lsp.null-ls").setup()
 
-  require("lvim.utils").toggle_autoformat()
+  require("lvim.core.autocmds").configure_format_on_save()
 end
 
 return M