vim/cpp: switch to .cc files too

[dotfiles.git] / vim / ftplugin / cpp.vim

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index edc1f32118e0684aed4d4f0ea1fdbf873d076c19..807ef891e41bfad1ea772d5db80f05d92fb7de3e 100644 (file)
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -18,7 +18,7 @@ let b:load_doxygen_syntax = 1
 
 augroup fswitch_cpp
     au!
 
 augroup fswitch_cpp
     au!

-    au BufEnter *.h   let b:fswitchdst  = 'c,cpp'
+    au BufEnter *.h   let b:fswitchdst  = 'c,cpp,cc'

     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|'
     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|'


@@ -43,14 +43,21 @@ let g:switch_const_definitions =
     \   'const \([[:alnum:]_:<>]\{-}\) &': '\1 '
     \ } ]
 
     \   'const \([[:alnum:]_:<>]\{-}\) &': '\1 '
     \ } ]
 

-nnoremap <buffer> <leader>c :call switch#Switch(g:switch_const_definitions, {})<cr>
+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 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>

 
 " format with =
 
 " format with =

-map <buffer> = <Plug>(operator-clang-format)
-vnoremap <buffer> = :ClangFormat<CR>
+call operator#user#define_ex_command('ycmcompleter-format', 'YcmCompleter Format')
+map <buffer> = <Plug>(operator-ycmcompleter-format)
+vnoremap <buffer> = :YcmCompleter Format<CR>

 " restore = mapping to g=
 nnoremap <buffer>g= =
 vnoremap <buffer>g= =
 " restore = mapping to g=
 nnoremap <buffer>g= =
 vnoremap <buffer>g= =