diff --git a/lua/user/cmp.lua b/lua/user/cmp.lua index 0ba1fc7..6caf059 100644 --- a/lua/user/cmp.lua +++ b/lua/user/cmp.lua @@ -121,6 +121,7 @@ cmp.setup { behavior = cmp.ConfirmBehavior.Replace, select = false, }, + window = { documentation = { border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, }, @@ -128,4 +129,5 @@ cmp.setup { ghost_text = false, native_menu = false, }, +}, } diff --git a/lua/user/colorscheme.lua b/lua/user/colorscheme.lua index b1e21f6..fc76862 100644 --- a/lua/user/colorscheme.lua +++ b/lua/user/colorscheme.lua @@ -1,6 +1,6 @@ vim.cmd [[ try - colorscheme darkplus + colorscheme evening catch /^Vim\%((\a\+)\)\=:E185/ colorscheme default set background=dark diff --git a/lua/user/lsp/handlers.lua b/lua/user/lsp/handlers.lua index fb8b7f8..22e78e8 100644 --- a/lua/user/lsp/handlers.lua +++ b/lua/user/lsp/handlers.lua @@ -46,8 +46,8 @@ end local function lsp_highlight_document(client) -- Set autocommands conditional on server_capabilities - if client.resolved_capabilities.document_highlight then - vim.api.nvim_exec( + if client.server_capabilities.documentFormattingProvider then + vim.api.nvim_exec( [[ augroup lsp_document_highlight autocmd! * @@ -76,7 +76,7 @@ local function lsp_keymaps(bufnr) bufnr, "n", "gl", - 'lua vim.lsp.diagnostic.show_line_diagnostics({ border = "rounded" })', + 'lua vim.diagnostic.open_float({ border = "rounded" })', opts ) vim.api.nvim_buf_set_keymap(bufnr, "n", "]d", 'lua vim.diagnostic.goto_next({ border = "rounded" })', opts) @@ -86,7 +86,7 @@ end M.on_attach = function(client, bufnr) if client.name == "tsserver" then - client.resolved_capabilities.document_formatting = false + client.server_capabilities.documentFormattingProvider = false end lsp_keymaps(bufnr) lsp_highlight_document(client)