neovim: changed lsp config and statusbar due to v0.12 of nvim
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
This commit is contained in:
@@ -56,7 +56,6 @@ let g:indentLine_char_list = ['│', '│', '│', '│']
|
|||||||
runtime! macros/matchit.vim
|
runtime! macros/matchit.vim
|
||||||
|
|
||||||
" visual feedback
|
" visual feedback
|
||||||
set laststatus=2
|
|
||||||
set showmode
|
set showmode
|
||||||
set showcmd
|
set showcmd
|
||||||
|
|
||||||
@@ -222,12 +221,24 @@ local border = 'rounded'
|
|||||||
|
|
||||||
vim.lsp.config('*', {
|
vim.lsp.config('*', {
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
handlers = {
|
|
||||||
["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }),
|
|
||||||
["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }),
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
vim.diagnostic.config({
|
||||||
|
float = { border = border },
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config)
|
||||||
|
config = config or {}
|
||||||
|
config.border = border
|
||||||
|
return vim.lsp.handlers.hover(err, result, ctx, config)
|
||||||
|
end
|
||||||
|
|
||||||
|
vim.lsp.handlers["textDocument/signatureHelp"] = function(err, result, ctx, config)
|
||||||
|
config = config or {}
|
||||||
|
config.border = border
|
||||||
|
return vim.lsp.handlers.signature_help(err, result, ctx, config)
|
||||||
|
end
|
||||||
|
|
||||||
-- Server-specific overrides
|
-- Server-specific overrides
|
||||||
vim.lsp.config('yamlls', {
|
vim.lsp.config('yamlls', {
|
||||||
settings = {
|
settings = {
|
||||||
@@ -397,18 +408,23 @@ function! StatuslineGit()
|
|||||||
return strlen(l:branchname) > 0?' '.l:branchname.' ':''
|
return strlen(l:branchname) > 0?' '.l:branchname.' ':''
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
set statusline=
|
set laststatus=3
|
||||||
set statusline+=%#IncSearch#
|
|
||||||
set statusline+=%{&filetype!=#''?'\ \ ['.&filetype.']\ ':'\ '}
|
lua <<EOF
|
||||||
set statusline+=%{&modified?'[+]\ ':''}
|
vim.o.statusline = table.concat({
|
||||||
set statusline+=%#CursorLineNr#
|
"%#IncSearch#",
|
||||||
set statusline+=\ %F
|
"%{&filetype!=#''?' ['.&filetype..'] ':'\\ '}",
|
||||||
set statusline+=%= "Right side settings
|
"%{&modified?'[+] ':''}",
|
||||||
set statusline+=%#CursorLineNr#
|
"%#CursorLineNr#",
|
||||||
set statusline+=%{StatuslineGit()}
|
" %F",
|
||||||
set statusline+=%#Search#
|
"%=",
|
||||||
set statusline+=\ %l/%L
|
"%#CursorLineNr#",
|
||||||
set statusline+=\ [%c]
|
"%{StatuslineGit()}",
|
||||||
|
"%#Search#",
|
||||||
|
" %l/%L",
|
||||||
|
" [%c]",
|
||||||
|
})
|
||||||
|
EOF
|
||||||
|
|
||||||
" Disable godoc keys
|
" Disable godoc keys
|
||||||
let g:go_doc_keywordprg_enabled = 0
|
let g:go_doc_keywordprg_enabled = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user