Merge remote-tracking branch 'origin/rolling'

3 files changed, 5 insertions, 23 deletions

diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index 13fafae0..2f3258c9 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -50,10 +50,10 @@ end
 
 function M.common_on_exit(_, _)
   if lvim.lsp.document_highlight then
-    pcall(vim.api.nvim_del_augroup_by_name, "lsp_document_highlight")
+    autocmds.clear_augroup "lsp_document_highlight"
   end
   if lvim.lsp.code_lens_refresh then
-    pcall(vim.api.nvim_del_augroup_by_name, "lsp_code_lens_refresh")
+    autocmds.clear_augroup "lsp_code_lens_refresh"
   end
 end
 
@@ -74,7 +74,7 @@ function M.common_on_attach(client, bufnr)
   if lvim.lsp.document_highlight then
     lu.setup_document_highlight(client, bufnr)
   end
-  if lvim.lsp.code_lens_refresh == false then
+  if lvim.lsp.code_lens_refresh then
     lu.setup_codelens_refresh(client, bufnr)
   end
   add_lsp_buffer_keybindings(bufnr)
diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua
index 2f24298d..9e898841 100644
--- a/lua/lvim/lsp/manager.lua
+++ b/lua/lvim/lsp/manager.lua
@@ -3,19 +3,6 @@ local M = {}
 local Log = require "lvim.core.log"
 local lvim_lsp_utils = require "lvim.lsp.utils"
 
-function M.init_defaults(languages)
-  languages = languages or lvim_lsp_utils.get_all_supported_filetypes()
-  for _, entry in ipairs(languages) do
-    if not lvim.lang[entry] then
-      lvim.lang[entry] = {
-        formatters = {},
-        linters = {},
-        lsp = {},
-      }
-    end
-  end
-end
-
 ---Resolve the configuration for a server by merging with the default config
 ---@param server_name string
 ---@vararg any config table [optional]
diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua
index c976ff72..252e611c 100644
--- a/lua/lvim/lsp/utils.lua
+++ b/lua/lvim/lsp/utils.lua
@@ -122,16 +122,11 @@ function M.setup_codelens_refresh(client, bufnr)
   if not augroup_exist then
     vim.api.nvim_create_augroup("lsp_code_lens_refresh", {})
   end
-  vim.api.nvim_create_autocmd("InsertLeave", {
+  vim.api.nvim_create_autocmd({ "BufEnter", "InsertLeave" }, {
     group = "lsp_code_lens_refresh",
     buffer = bufnr,
     callback = vim.lsp.codelens.refresh,
   })
-  vim.api.nvim_create_autocmd("InsertLeave", {
-    group = "lsp_code_lens_refresh",
-    buffer = bufnr,
-    callback = vim.lsp.codelens.display,
-  })
 end
 
 ---filter passed to vim.lsp.buf.format
@@ -158,7 +153,7 @@ function M.format(opts)
   opts = opts or { filter = M.format_filter }
 
   if vim.lsp.buf.format then
-    vim.lsp.buf.format(opts)
+    return vim.lsp.buf.format(opts)
   end
 
   local bufnr = opts.bufnr or vim.api.nvim_get_current_buf()