Merged
This commit is contained in:
commit
36c153b464
|
@ -1338,9 +1338,10 @@ function! s:bar()
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! s:logpos(name)
|
function! s:logpos(name)
|
||||||
for i in range(4, line('$'))
|
let max = line('$')
|
||||||
|
for i in range(4, max > 4 ? max : 4)
|
||||||
if getline(i) =~# '^[-+x*] '.a:name.':'
|
if getline(i) =~# '^[-+x*] '.a:name.':'
|
||||||
for j in range(i + 1, line('$'))
|
for j in range(i + 1, max > 5 ? max : 5)
|
||||||
if getline(j) !~ '^ '
|
if getline(j) !~ '^ '
|
||||||
return [i, j - 1]
|
return [i, j - 1]
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -25,6 +25,8 @@ call plug#begin('~/.dotfiles/nvim/.config/nvim/plugged')
|
||||||
Plug 'prabirshrestha/asyncomplete-file.vim'
|
Plug 'prabirshrestha/asyncomplete-file.vim'
|
||||||
Plug 'wellle/tmux-complete.vim'
|
Plug 'wellle/tmux-complete.vim'
|
||||||
|
|
||||||
|
Plug 'OmniSharp/omnisharp-vim'
|
||||||
|
|
||||||
" @todo Figure out how to integrate this with flint
|
" @todo Figure out how to integrate this with flint
|
||||||
" Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
" Plug 'Shougo/vimproc.vim', {'do' : 'make'}
|
||||||
" Plug 'idanarye/vim-vebugger'
|
" Plug 'idanarye/vim-vebugger'
|
||||||
|
@ -161,11 +163,11 @@ if executable('pyls')
|
||||||
\ })
|
\ })
|
||||||
endif
|
endif
|
||||||
|
|
||||||
au User lsp_setup call lsp#register_server({
|
" au User lsp_setup call lsp#register_server({
|
||||||
\ 'name': 'omnisharp',
|
" \ 'name': 'omnisharp',
|
||||||
\ 'cmd': {server_info->['mono', '/home/tim/Downloads/omnisharp-mono/OmniSharp.exe', '-lsp']},
|
" \ 'cmd': {server_info->['mono', '/opt/omnisharp-roslyn-stdio/OmniSharp.exe', '-lsp']},
|
||||||
\ 'whitelist': ['cs'],
|
" \ 'whitelist': ['cs'],
|
||||||
\ })
|
" \ })
|
||||||
|
|
||||||
let g:lsp_text_edit_enabled = 0
|
let g:lsp_text_edit_enabled = 0
|
||||||
let g:lsp_diagnostics_echo_cursor = 1
|
let g:lsp_diagnostics_echo_cursor = 1
|
||||||
|
@ -187,6 +189,10 @@ highlight lspReference ctermfg=red guifg=red ctermbg=green guibg=green
|
||||||
highlight link LspErrorText GruvBoxRedSign
|
highlight link LspErrorText GruvBoxRedSign
|
||||||
highlight link LspWarningText GruvBoxYellowSign
|
highlight link LspWarningText GruvBoxYellowSign
|
||||||
|
|
||||||
|
" Omnisharp
|
||||||
|
let g:OmniSharp_server_stdio = 1
|
||||||
|
let g:OmniSharp_highlight_types = 3
|
||||||
|
|
||||||
" asyncomplete
|
" asyncomplete
|
||||||
|
|
||||||
call asyncomplete#register_source(asyncomplete#sources#buffer#get_source_options({
|
call asyncomplete#register_source(asyncomplete#sources#buffer#get_source_options({
|
||||||
|
|
Loading…
Reference in New Issue
Block a user