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,60 +1,55 @@
-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", {
+local on_attach = function(_, bufnr)
-  group = lspattach,
+  -- NOTE: Remember that lua is a real programming language, and as such it is possible
-  callback = function(args)
+  -- to define small helper and utility functions so you don't have to repeat yourself
-    -- NOTE: Remember that lua is a real programming language, and as such it is possible
+  -- many times.
-    -- to define small helper and utility functions so you don't have to repeat yourself
+  --
-    -- many times.
+  -- In this case, we create a function that lets us more easily define mappings specific
-    --
+  -- for LSP related items. It sets the mode, buffer and description for us each time.
-    -- In this case, we create a function that lets us more easily define mappings specific
+  local nmap = function(keys, func, desc)
-    -- for LSP related items. It sets the mode, buffer and description for us each time.
+    if desc then
-    local nmap = function(keys, func, desc)
+      desc = 'LSP: ' .. desc
-      if desc then
-        desc = 'LSP: ' .. desc
-      end
-
-      vim.keymap.set('n', keys, func, { buffer = args.buf, silent = true, desc = desc })
     end
 
-    nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
-    nmap('<leader>c', vim.lsp.buf.code_action, '[C]ode action') -- NOTE: to see if ca is needed
+  end
-    nmap('<leader>f', function()                              -- https://stackoverflow.com/a/74303272
-      vim.lsp.buf.code_action({
-        filter = function(a)
-          return a.isPreferred
-        end,
-        apply = true
-      })
-    end, 'code action: [F]ix'
-    )
 
-    nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
+  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
-    nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+  nmap('<leader>c', vim.lsp.buf.code_action, '[C]ode action') -- NOTE: to see if ca is needed
-    nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+  nmap('<leader>f', function()                                -- https://stackoverflow.com/a/74303272
-    nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
+    vim.lsp.buf.code_action({
-    nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+      filter = function(a)
-    nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+        return a.isPreferred
+      end,
+      apply = true
+    })
+  end, 'code action: [F]ix'
+  )
 
-    -- See `:help K` for why this keymap
+  nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-    nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
+  nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
-    nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+  nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+  nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
+  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 
-    -- Lesser used LSP functionality
+  -- See `:help K` for why this keymap
-    nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
-    nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
+  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
-    nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-    nmap('<leader>wl', function()
-      print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-    end, '[W]orkspace [L]ist Folders')
 
-    -- Create a command `:Format` local to the LSP buffer
+  -- Lesser used LSP functionality
-    vim.api.nvim_buf_create_user_command(args.buf, 'Format', function(_)
+  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-      vim.lsp.buf.format()
+  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-    end, { desc = 'Format current buffer with LSP' })
+  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-  end,
+  nmap('<leader>wl', function()
-})
+    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
+  end, '[W]orkspace [L]ist Folders')
+
+  -- Create a command `:Format` local to the LSP buffer
+  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
+    vim.lsp.buf.format()
+  end, { desc = 'Format current buffer with LSP' })
+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()