vim: consolidate fswitch settings in c.vim

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

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index 542503a79c2d015e3dd639259d61b23ed6277640..4d54b7bb5a88ddee17bbbc6650d3613fa2a9eb55 100644 (file)
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -14,16 +14,25 @@ setlocal cinoptions+=:0  " don't indent case labels
 " Load the doxygen syntax
 let b:load_doxygen_syntax = 1
 
-augroup fswitch
-    au BufEnter *.h   let b:fswitchdst  = 'cpp,c'
-    au BufEnter *.h   let b:fswitchlocs = 'reg:|include.*|source|'
-    au BufEnter *.cpp let b:fswitchdst  = 'h'
-    au BufEnter *.cpp let b:fswitchlocs = 'reg:|source|include/**|'
-augroup END
+let g:switch_const_definitions =
+    \ [ {
+    \   '\%(const \)\@!\([[:alnum:]_:<>]\{-}\) \%(&\)\@!': 'const \1 ',
+    \   'const \([[:alnum:]_:<>]\{-}\) &\@!': 'const \1 &' ,
+    \   'const \([[:alnum:]_:<>]\{-}\) &': '\1 '
+    \ } ]
+
+nnoremap <buffer> <leader>c :call switch#Switch(g:switch_const_definitions, {})<cr>
 
 nnoremap <buffer> gd :YcmCompleter GoTo<CR>
 nnoremap <buffer> <C-W>d :vs<CR>:YcmCompleter GoTo<CR>
 
+" format with =
+map <buffer> = <Plug>(operator-clang-format)
+vnoremap <buffer> = :ClangFormat<CR>
+" restore = mapping to g=
+nnoremap <buffer>g= =
+vnoremap <buffer>g= =
+
 setlocal errorformat=
 setlocal errorformat+=%f:%l:%c:\ %trror:\ %m
 setlocal errorformat+=%f:%l:%c:\ %tarning:\ %m