fix: Actually correcting the on_attach settings and moved them to an LspAttach event autocommand. Slight cleanup as well.

This commit is contained in:
Finch 2026-02-22 20:33:13 -06:00
parent 70c7a97484
commit a31d423095
3 changed files with 28 additions and 31 deletions

0
nvim/after/lsp/ts_ls.lua Normal file
View File

View File

@ -1,12 +1,30 @@
return { return {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
-- lazy = false,
config = function () config = function ()
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.completion.completionItem.snippetSupport = true capabilities.textDocument.completion.completionItem.snippetSupport = true
-- All functions and keymaps contained here are universal to LSPs vim.diagnostic.config ({
local on_attach = function(client, bufnr) virtual_text = {
source = 'always',
},
severity_sort = true,
float = {
source = 'always'
}
})
vim.lsp.config('*', {
capabilities = capabilities, -- TODO: Does this do anything?
})
-- Auto set keymaps and other settings on LSP attach
vim.api.nvim_create_autocmd('LspAttach', {
group = vim.api.nvim_create_augroup('my.lsp', {}),
callback = function(args)
local bufnr = args.buf
-- TODO: Does this do anything?
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
-- Keyboard Mappings -- Keyboard Mappings
@ -23,28 +41,10 @@ return {
vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts) vim.keymap.set('n', '<leader>D', vim.lsp.buf.type_definition, bufopts)
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts) vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
vim.keymap.set('n', '<leader><leader>f', function() vim.lsp.buf.format { async = true } end, bufopts) vim.keymap.set('n', '<leader><leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts) vim.keymap.set('n', '<leader>r', vim.lsp.buf.rename, bufopts)
end end,
-- Kick the logging to debug level
-- vim.lsp.set_log_level("debug")
vim.diagnostic.config ({
virtual_text = {
source = 'always',
},
severity_sort = true,
float = {
source = 'always'
}
}) })
vim.lsp.config('*', {
capabilities = capabilities,
on_attach = on_attach,
})
vim.lsp.config('gdscript', {})
vim.lsp.enable('gdscript') vim.lsp.enable('gdscript')
end end
} }

View File

@ -46,8 +46,5 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
set -g @plugin 'tmux-plugins/tmux-yank' set -g @plugin 'tmux-plugins/tmux-yank'
set -g @plugin 'egel/tmux-gruvbox' set -g @plugin 'egel/tmux-gruvbox'
# Plugin settings
# set -g @tmux-gruvbox 'dark-transparent'
## Required for TPM plugins ## Required for TPM plugins
run '~/.tmux/plugins/tpm/tpm' run '~/.tmux/plugins/tpm/tpm'