Compare commits
4 Commits
main
...
4aceb7aca9
| Author | SHA1 | Date | |
|---|---|---|---|
| 4aceb7aca9 | |||
| f23db08d92 | |||
| 8bdb7b7054 | |||
| ae30cf3a09 |
@@ -37,8 +37,11 @@ function! build#dir(...) abort
|
|||||||
if exists('l:dir')
|
if exists('l:dir')
|
||||||
" Set build directory and restart YouCompleteMe.
|
" Set build directory and restart YouCompleteMe.
|
||||||
let $BUILD_DIR = getcwd().'/'.substitute(l:dir, '\/$', '', '')
|
let $BUILD_DIR = getcwd().'/'.substitute(l:dir, '\/$', '', '')
|
||||||
let g:ycm_clangd_args = ['--compile-commands-dir='.$BUILD_DIR]
|
" TODO: Check .vim/coc-settings.json exists, create it if not
|
||||||
YcmRestartServer
|
let l:coc_settings = json_decode(join(readfile('.vim/coc-settings.json'), ''))
|
||||||
|
let l:coc_settings['clangd.compilationDatabasePath'] = $BUILD_DIR
|
||||||
|
call writefile([json_encode(l:coc_settings)], '.vim/coc-settings.json')
|
||||||
|
CocRestart
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ if has('gui_running') || &t_Co == 256
|
|||||||
call s:hi('MatchParen', '', '', '')
|
call s:hi('MatchParen', '', '', '')
|
||||||
call s:hi('ModeMsg', '', '', '')
|
call s:hi('ModeMsg', '', '', '')
|
||||||
call s:hi('MoreMsg', '12', '', '')
|
call s:hi('MoreMsg', '12', '', '')
|
||||||
call s:hi('NonText', '', '', '')
|
call s:hi('NonText', '238', '', '')
|
||||||
call s:hi('Normal', '7', '232', '')
|
call s:hi('Normal', '7', '232', '')
|
||||||
call s:hi('Pmenu', '', '235', '')
|
call s:hi('Pmenu', '', '235', '')
|
||||||
call s:hi('PmenuSel', '', '', 'reverse')
|
call s:hi('PmenuSel', '', '', 'reverse')
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
" YouCompleteMe
|
" coc.nvim
|
||||||
nnoremap <leader>fi :YcmCompleter FixIt<CR>
|
nmap <leader>fi <Plug>(coc-fix-current)
|
||||||
nnoremap <leader>gd :YcmCompleter GoTo<CR>
|
nmap <leader>gd <Plug>(coc-definition)
|
||||||
nnoremap <leader>gt :YcmCompleter GetType<CR>
|
nmap <leader>gt <Plug>(coc-type-definition)
|
||||||
nnoremap <leader>sd :YcmShowDetailedDiagnostic<CR>
|
nmap <leader>sd <Plug>(coc-diagnostic-info)
|
||||||
nnoremap <leader>D <plug>(YCMHover)
|
nmap <leader>gr <Plug>(coc-references)
|
||||||
|
|
||||||
" termdebug
|
" termdebug
|
||||||
" TODO: Detecet if termdebug is loaded, if not do the default action.
|
" TODO: Detecet if termdebug is loaded, if not do the default action.
|
||||||
|
|||||||
@@ -68,8 +68,6 @@ if has('linebreak')
|
|||||||
set linebreak
|
set linebreak
|
||||||
" Downwards Arrow With Tip Rightwards (U+21B3, utf-8: E2 86 B3)
|
" Downwards Arrow With Tip Rightwards (U+21B3, utf-8: E2 86 B3)
|
||||||
let &showbreak='↳ '
|
let &showbreak='↳ '
|
||||||
" Use same highlight group as listchars for showbreak
|
|
||||||
set highlight+=@:SpecialKey
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" TODO: spellcapcheck
|
" TODO: spellcapcheck
|
||||||
|
|||||||
23
vimrc
23
vimrc
@@ -34,22 +34,8 @@ endfor
|
|||||||
" tabline.vim - sanely numbered tabs
|
" tabline.vim - sanely numbered tabs
|
||||||
Pack 'mkitt/tabline.vim'
|
Pack 'mkitt/tabline.vim'
|
||||||
|
|
||||||
" YouCompleteMe
|
" coc.nvim Conqueror of Completion
|
||||||
Pack 'ycm-core/YouCompleteMe', {'type': 'opt'}
|
Pack 'neoclide/coc.nvim', {'branch': 'release'}
|
||||||
let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
|
|
||||||
let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
|
|
||||||
let g:ycm_min_num_of_chars_for_completion = 1
|
|
||||||
let g:ycm_complete_in_comments = 1
|
|
||||||
let g:ycm_complete_in_strings = 1
|
|
||||||
let g:ycm_collect_identifiers_from_comments_and_strings = 1
|
|
||||||
let g:ycm_seed_identifiers_with_syntax = 1
|
|
||||||
let g:ycm_autoclose_preview_window_after_insertion = 1
|
|
||||||
let g:ycm_always_populate_location_list = 1
|
|
||||||
let g:ycm_error_symbol = '▸'
|
|
||||||
let g:ycm_warning_symbol = '▸'
|
|
||||||
let g:ycm_goto_buffer_command = 'horizontal-split'
|
|
||||||
let g:ycm_use_clangd = 0
|
|
||||||
let g:ycm_auto_hover = 0
|
|
||||||
|
|
||||||
" ultisnips - snippet engine
|
" ultisnips - snippet engine
|
||||||
Pack 'SirVer/ultisnips'
|
Pack 'SirVer/ultisnips'
|
||||||
@@ -200,8 +186,3 @@ Pack 'greymd/oscyank.vim', {'type': 'opt'}
|
|||||||
if tmux#isOption('set-clipboard', 'on')
|
if tmux#isOption('set-clipboard', 'on')
|
||||||
packadd oscyank.vim
|
packadd oscyank.vim
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" Load YouComplteMe if termdebug plugin is not loaded.
|
|
||||||
if isdirectory(expand('~/.vim/pack/minpac/opt/YouCompleteMe'))
|
|
||||||
packadd YouCompleteMe
|
|
||||||
endif
|
|
||||||
|
|||||||
Reference in New Issue
Block a user