From 7a74d56d472b46432bbb1a93f089b03ee4e51bba Mon Sep 17 00:00:00 2001 From: Aaron Gorodetzky Date: Sun, 21 Sep 2025 18:24:27 -0400 Subject: [PATCH] Fix on-attach --- lua/plugins/lsp.lua | 68 +++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index d2636e6..7af3d9a 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,45 +1,35 @@ -- Code to run whenever a language server attaches to a buffer local on_attach = function(lsp_client, buffer_number) - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('UserLspConfig', {}), - callback = function(ev) - -- Setup Inlay Hints - -- Currently Requires Neovim >0.10 (Nightly) - --vim.lsp.inlay_hint.enable(ev.buf, true) - vim.lsp.inlay_hint.enable(true) - - -- Setup Signs - vim.diagnostic.config({ - signs = { - text = { - [vim.diagnostic.severity.ERROR] = "🛑", - [vim.diagnostic.severity.WARN] = "âš ī¸", - [vim.diagnostic.severity.HINT] = "💡", - [vim.diagnostic.severity.INFO] = "â„šī¸" - } - } - }) - - -- Setup Keybinds - local keymap_opts = { buffer = ev.buf } - vim.keymap.set('n', 'g[', vim.diagnostic.goto_prev, keymap_opts) - vim.keymap.set('n', 'g]', vim.diagnostic.goto_next, keymap_opts) - vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, keymap_opts) - vim.keymap.set('n', 'gh', vim.lsp.buf.hover, keymap_opts) - vim.keymap.set('i', '', vim.lsp.buf.hover, keymap_opts) - vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, keymap_opts) - vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help, keymap_opts) - vim.keymap.set('n', 'gD', vim.lsp.buf.type_definition, keymap_opts) - vim.keymap.set('n', 'gr', vim.lsp.buf.references, keymap_opts) - vim.keymap.set('n', 'g0', vim.lsp.buf.document_symbol, keymap_opts) - vim.keymap.set('n', 'gW', vim.lsp.buf.workspace_symbol, keymap_opts) - vim.keymap.set('n', 'gd', vim.lsp.buf.definition, keymap_opts) - --vim.keymap.set('n', 'a', rt.code_action_group.code_action_group, { buffer = bufnr }) - vim.keymap.set('n', 'gf', function() - vim.lsp.buf.format { async = true } - end, keymap_opts) - end, + -- Setup Signs + vim.diagnostic.config({ + signs = { + text = { + [vim.diagnostic.severity.ERROR] = "🛑", + [vim.diagnostic.severity.WARN] = "âš ī¸", + [vim.diagnostic.severity.HINT] = "💡", + [vim.diagnostic.severity.INFO] = "â„šī¸" + } + } }) + + -- Setup Keybinds + local keymap_opts = { buffer = buffer_number } + vim.keymap.set('n', 'g[', vim.diagnostic.goto_prev, keymap_opts) + vim.keymap.set('n', 'g]', vim.diagnostic.goto_next, keymap_opts) + vim.keymap.set('n', 'ga', vim.lsp.buf.code_action, keymap_opts) + vim.keymap.set('n', 'gh', vim.lsp.buf.hover, keymap_opts) + vim.keymap.set('i', '', vim.lsp.buf.hover, keymap_opts) + vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, keymap_opts) + vim.keymap.set('n', 'gs', vim.lsp.buf.signature_help, keymap_opts) + vim.keymap.set('n', 'gD', vim.lsp.buf.type_definition, keymap_opts) + vim.keymap.set('n', 'gr', vim.lsp.buf.references, keymap_opts) + vim.keymap.set('n', 'g0', vim.lsp.buf.document_symbol, keymap_opts) + vim.keymap.set('n', 'gW', vim.lsp.buf.workspace_symbol, keymap_opts) + vim.keymap.set('n', 'gd', vim.lsp.buf.definition, keymap_opts) + --vim.keymap.set('n', 'a', rt.code_action_group.code_action_group, { buffer = bufnr }) + vim.keymap.set('n', 'gf', function() + vim.lsp.buf.format { async = true } + end, keymap_opts) end local servers = {