update to neovim 0.6

This commit is contained in:
Barak Michener 2022-01-14 16:08:50 -08:00
parent c9ff0abbc2
commit 1967463cf7
3 changed files with 22 additions and 5 deletions

View file

@ -150,7 +150,7 @@ font:
style: Oblique style: Oblique
# Point size # Point size
size: 16.0 size: 19.0
# Offset is the extra space around each character. `offset.y` can be thought # Offset is the extra space around each character. `offset.y` can be thought
# of as modifying the line spacing, and `offset.x` as modifying the letter # of as modifying the line spacing, and `offset.x` as modifying the letter

View file

@ -7,8 +7,21 @@ local nvim_lsp = require'lspconfig'
local on_attach = function(client) local on_attach = function(client)
end end
local rust_capabilities = vim.lsp.protocol.make_client_capabilities()
rust_capabilities.textDocument.completion.completionItem.snippetSupport = true
rust_capabilities.textDocument.completion.completionItem.resolveSupport = {
properties = {
'documentation',
'detail',
'additionalTextEdits',
}
}
-- Enable rust_analyzer -- Enable rust_analyzer
nvim_lsp.rust_analyzer.setup({ on_attach=on_attach }) nvim_lsp.rust_analyzer.setup({
on_attach=on_attach,
capabilities=rust_capabilities,
})
nvim_lsp.gopls.setup({ on_attach=on_attach }) nvim_lsp.gopls.setup({ on_attach=on_attach })
nvim_lsp.pyright.setup({ on_attach=on_attach }) nvim_lsp.pyright.setup({ on_attach=on_attach })
nvim_lsp.clangd.setup({ on_attach=on_attach }) nvim_lsp.clangd.setup({ on_attach=on_attach })
@ -41,6 +54,9 @@ nvim_lsp.efm.setup {
}, },
python = { python = {
{ formatCommand = 'black --quiet -', formatStdin = true } { formatCommand = 'black --quiet -', formatStdin = true }
},
rust = {
{ formatCommand = 'rustfmt', formatStdin = true }
} }
} }
} }
@ -169,7 +185,7 @@ require('lspkind').init({
}) })
require('trouble').setup { require('trouble').setup {
mode = "lsp_document_diagnostics", mode = "document_diagnostics",
auto_close = true, auto_close = true,
action_keys = { -- key mappings for actions in the trouble list action_keys = { -- key mappings for actions in the trouble list
-- map to {} to remove a mapping, for example: -- map to {} to remove a mapping, for example:

5
.vimrc
View file

@ -268,7 +268,8 @@ nnoremap <silent> gW <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
"nnoremap <silent> ga <cmd>lua vim.lsp.buf.code_action()<CR> "nnoremap <silent> ga <cmd>lua vim.lsp.buf.code_action()<CR>
nnoremap <silent> ga <cmd>lua require('telescope.builtin').lsp_code_actions({initial_mode = "normal"})<cr> nnoremap <silent> ga <cmd>lua require('telescope.builtin').lsp_code_actions({initial_mode = "normal"})<cr>
vnoremap <silent> ga :<C-U>lua require('telescope.builtin').lsp_range_code_actions({initial_mode = "normal"})<cr> vnoremap <silent> ga :<C-U>lua require('telescope.builtin').lsp_range_code_actions({initial_mode = "normal"})<cr>
nnoremap <silent> ge <cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header = false, focusable = false})<CR> "nnoremap <silent> ge <cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header = false, focusable = false})<CR>
nnoremap <silent> ge <cmd>lua vim.diagnostic.open_float({focusable = false})<CR>
nnoremap <leader>xx <cmd>TroubleToggle<cr> nnoremap <leader>xx <cmd>TroubleToggle<cr>
@ -276,7 +277,7 @@ nnoremap <leader>xx <cmd>TroubleToggle<cr>
" 300ms of no cursor movement to trigger CursorHold " 300ms of no cursor movement to trigger CursorHold
set updatetime=500 set updatetime=500
" Show diagnostic popup on cursor hold " Show diagnostic popup on cursor hold
autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({show_header = false, focusable = false}) autocmd CursorHold * lua vim.diagnostic.open_float({focusable = false})
" Autoformat on save " Autoformat on save
autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 1000) autocmd BufWritePre *.lua lua vim.lsp.buf.formatting_sync(nil, 1000)