lsp/ltex_plus.lua

@@ -22,7 +22,6 @@ return {
     'norg',
     'gitcommit',
     'jj',
-    'jjdescription',
     'rst',
     'typst'
   },

lua/complete.lua

@@ -8,7 +8,7 @@ luasnip.config.setup {
   updateevents = "TextChanged,TextChangedI",
   enable_autosnippets = true,
 }
-luasnip.filetype_extend("jjdescription", { "gitcommit" })
+luasnip.filetype_extend("jj", { "gitcommit" })
 
 local has_words_before = function()
   unpack = unpack or table.unpack

lua/lsp.lua

@@ -1,9 +1,5 @@
-local lspattach = vim.api.nvim_create_augroup("LspMapping", { clear = true })
-
 --  This function gets run when an LSP connects to a particular buffer.
-vim.api.nvim_create_autocmd("LspAttach", {
-  group = lspattach,
-  callback = function(args)
+local on_attach = function(_, bufnr)
   -- NOTE: Remember that lua is a real programming language, and as such it is possible
   -- to define small helper and utility functions so you don't have to repeat yourself
   -- many times.
@@ -15,7 +11,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
       desc = 'LSP: ' .. desc
     end
 
-      vim.keymap.set('n', keys, func, { buffer = args.buf, silent = true, desc = desc })
+    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
   end
 
   nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
@@ -50,11 +46,10 @@ vim.api.nvim_create_autocmd("LspAttach", {
   end, '[W]orkspace [L]ist Folders')
 
   -- Create a command `:Format` local to the LSP buffer
-    vim.api.nvim_buf_create_user_command(args.buf, 'Format', function(_)
+  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
     vim.lsp.buf.format()
   end, { desc = 'Format current buffer with LSP' })
-  end,
-})
+end
 
 -- document existing key chains
 require('which-key').add {
@@ -130,6 +125,7 @@ mason_lspconfig.setup_handlers {
   function(server_name)
     require('lspconfig')[server_name].setup {
       capabilities = capabilities,
+      on_attach = on_attach,
       settings = servers[server_name],
       filetypes = (servers[server_name] or {}).filetypes,
     }
@@ -163,6 +159,7 @@ servers = {
 for server_name, server_settings in pairs(servers) do
   lspconfig[server_name].setup {
     capabilities = capabilities,
+    on_attach = on_attach,
     settings = server_settings,
     filetypes = (servers[server_name] or {}).filetypes,
   }
@@ -189,7 +186,7 @@ local setup_godot_dap = function()
   }
 end
 
-vim.diagnostic.config({ virtual_text = true })
+vim.diagnostic.config({ virtual_lines = true })
 vim.lsp.enable({ "ltex_plus" })
 
 setup_godot_dap()