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

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index fcd8066..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,cc'
+    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|'
@@ -53,6 +53,7 @@ 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')
@@ -69,6 +70,11 @@ 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'