X-Git-Url: https://src.twobees.de/?a=blobdiff_plain;f=stow%2Fnvim%2F.config%2Fnvim%2Fafter%2Fplugin%2Flspsetup.lua;h=3f87ecd331f222b83075d70569e2ac45fc6ddaa8;hb=a58822d6699df9881ba70ebc67dbaafb01bf2e7f;hp=367011f7173d3bbf849aa7fdbbf61556947d0aa2;hpb=17182e572ff6977b4800f564468ee8112a595f12;p=dotfiles.git diff --git a/stow/nvim/.config/nvim/after/plugin/lspsetup.lua b/stow/nvim/.config/nvim/after/plugin/lspsetup.lua index 367011f..3f87ecd 100644 --- a/stow/nvim/.config/nvim/after/plugin/lspsetup.lua +++ b/stow/nvim/.config/nvim/after/plugin/lspsetup.lua @@ -1,7 +1,7 @@ local lsp = require('lsp-zero') lsp.preset('recommended') -lsp.configure('sumneko_lua', { +lsp.configure('lua_ls', { settings = { Lua = { diagnostics = { @@ -11,18 +11,32 @@ lsp.configure('sumneko_lua', { } }) -lsp.on_attach = function (_, bufnr) - local options = { buffer = bufnr, remap = false } - vim.keymap.set ("n", "K", vim.lsp.buf.hover, options) -- buffer=0 -> only in current buffer - vim.keymap.set ("n", "gd", vim.lsp.buf.definition, options) -- goto definition - vim.keymap.set ("n", "gT", vim.lsp.buf.type_definition, options) -- goto typedefinition - vim.keymap.set ("n", "gi", vim.lsp.buf.implementation, options) -- goto implementation - vim.keymap.set ("n", "dj", vim.diagnostic.goto_next, options) -- goto dignostic next - vim.keymap.set ("n", "dk", vim.diagnostic.goto_prev, options) -- goto diognostic prev - vim.keymap.set ("n", "dl", "Telescope diagnostic", options) -- goto list failure - vim.keymap.set ("n", "r", vim.lsp.buf.rename, options) - vim.keymap.set ("n", "f", vim.lsp.buf.code_action, options) -end + +lsp.on_attach(function(client, bufnr) + lsp.default_keymaps({buffer = bufnr}) + vim.keymap.set ("n", "r", vim.lsp.buf.rename, options) + vim.keymap.set ("n", "f", vim.lsp.buf.code_action, options) +end) + +lsp.set_sign_icons({ + error = '✘', + warn = '▲', + hint = '⚑', + info = '»' +}) +-- lsp.on_attach = function (_, bufnr) +-- print "attached" +-- local options = { buffer = bufnr, remap = false } +-- vim.keymap.set ("n", "K", vim.lsp.buf.hover, options) -- buffer=0 -> only in current buffer +-- vim.keymap.set ("n", "gd", vim.lsp.buf.definition, options) -- goto definition +-- vim.keymap.set ("n", "gT", vim.lsp.buf.type_definition, options) -- goto typedefinition +-- vim.keymap.set ("n", "gi", vim.lsp.buf.implementation, options) -- goto implementation +-- vim.keymap.set ("n", "dj", vim.diagnostic.goto_next, options) -- goto dignostic next +-- vim.keymap.set ("n", "dk", vim.diagnostic.goto_prev, options) -- goto diognostic prev +-- vim.keymap.set ("n", "dl", "Telescope diagnostic", options) -- goto list failure +-- vim.keymap.set ("n", "r", vim.lsp.buf.rename, options) +-- vim.keymap.set ("n", "f", vim.lsp.buf.code_action, options) +-- end local cmp = require('cmp') local cmp_select = {behavior = cmp.SelectBehavior.Select} @@ -41,6 +55,7 @@ cmp.setup({ experimental = { ghost_text = true }, }); +vim.diagnostic.config( { virtual_text = true } ) + lsp.setup() -vim.diagnostic.config( { virtual_text = true } )