start fixing lsp; todo: fix on_attach

This commit is contained in:
Adam Jeniski 2023-02-17 10:05:41 -05:00
parent f0a20b0a8b
commit d5fef3e10a
2 changed files with 27 additions and 28 deletions

View File

@ -132,9 +132,9 @@ alias vi="nvim"
alias v="nvim" alias v="nvim"
#upgraded commands #upgraded commands
alias cat="bat" #alias cat="bat"
alias htop="btop" alias htop="btop"
alias ls="exa" #alias ls="exa"
#devleopment variables #devleopment variables
TMUX_CONFIG="~/.config/tmux/.tmux.conf" TMUX_CONFIG="~/.config/tmux/.tmux.conf"

View File

@ -3,36 +3,35 @@ local lsp = require('lsp-zero').preset({
set_lsp_keymaps = true, set_lsp_keymaps = true,
manage_nvim_cmp = true, manage_nvim_cmp = true,
suggest_lsp_servers = false, suggest_lsp_servers = false,
on_attach = function(client, bufnr)
local opts = { buffer = bufnr, remap = false }
if client.name == "eslint" then
vim.cmd.LspStop('eslint')
return
end
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
vim.keymap.set("n", "<leader>fs", vim.lsp.buf.workspace_symbol, opts)
vim.keymap.set("n", "<leader>vd", vim.diagnostic.open_float, opts)
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts)
vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
end
}) })
lsp.on_attach(function(client, bufnr)
local opts = { buffer = bufnr, remap = false }
if client.name == "eslint" then
vim.cmd.LspStop('eslint')
return
end
vim.keymap.set("n", "gd", vim.lsp.buf.definition, opts)
vim.keymap.set("n", "K", vim.lsp.buf.hover, opts)
vim.keymap.set("n", "<leader>fs", vim.lsp.buf.workspace_symbol, opts)
vim.keymap.set("n", "<leader>vd", vim.diagnostic.open_float, opts)
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, opts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, opts)
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts)
vim.keymap.set("i", "<C-h>", vim.lsp.buf.signature_help, opts)
end)
lsp.configure('sumneko_lua', { lsp.configure('sumneko_lua', {
settings = { settings = {
Lua = { Lua = {
diagnostics = { diagnostics = {
globals = { 'vim' } globals = { 'vim' }
} }
}
} }
}
}) })
local cmp = require('cmp') local cmp = require('cmp')