X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/1eea25c716ba1beafa9454b6b7fa8536407c6a08..e8ae4a469b8b5db19a27a2bf71bb04142a68a6f0:/vim/ftplugin/cpp.vim

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index a3846a8..12c6443 100644
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -18,7 +18,7 @@ let b:load_doxygen_syntax = 1
 
 augroup fswitch_cpp
     au!
-    au BufEnter *.h   let b:fswitchdst  = 'c,cpp'
+    au BufEnter *.h   let b:fswitchdst  = 'cpp,cc,c'
     au BufEnter *.h   let b:fswitchlocs = '.,reg:|include.*|src|'
     au BufEnter *.hpp let b:fswitchdst  = 'cpp,c'
     au BufEnter *.hpp let b:fswitchlocs = '.,reg:|include.*|src|'
@@ -45,10 +45,16 @@ let g:switch_const_definitions =
 
 nnoremap <buffer> <leader>c :call switch#Switch({'definitions': g:switch_const_definitions})<cr>
 
+" Disable ale as we use ycm
+let b:ale_enabled = 0
+
 nnoremap <buffer> gd :YcmCompleter GoTo<CR>
 nnoremap <buffer> <C-W>d :vs<CR>:YcmCompleter GoTo<CR>
 nnoremap <buffer> gD :YcmCompleter GoToReferences<CR>
 
+nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
+nnoremap <buffer> <leader>fr :YcmCompleter RefactorRename<space>
+
 " format with =
 call operator#user#define_ex_command('ycmcompleter-format', 'YcmCompleter Format')
 map <buffer> = <Plug>(operator-ycmcompleter-format)
@@ -57,7 +63,18 @@ vnoremap <buffer> = :YcmCompleter Format<CR>
 nnoremap <buffer>g= =
 vnoremap <buffer>g= =
 
+" hover popup
+let g:ycm_auto_hover = ''
+let b:ycm_hover = { 'command': 'GetDoc', 'syntax': &filetype }
+nmap <buffer> gh <plug>(YCMHover)
+nmap <buffer> gH :YcmCompleter GetDoc<CR>
+
 setlocal errorformat=
+" TODO I don't remember these errorformat or what they match, maybe CMake? {{{
+setlocal errorformat+=\ %##%n\ %m\ %f:%l:%c
+setlocal errorformat+=\ %##%n\ %m\ %f
+setlocal errorformat+=%n
+"}}}
 setlocal errorformat+=%f:%l:%c:\ %trror:\ %m
 setlocal errorformat+=%f:%l:%c:\ %tarning:\ %m
 setlocal errorformat+=%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f'