X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/4123a957a1a2cd85767bf0a059501543b321c4fe..0716bcc1f67f9f8caebc6788454cd4171a08414b:/vim/ftplugin/cpp.vim

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index 7984c68..807ef89 100644
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -6,6 +6,8 @@ setlocal tabstop=4
 setlocal softtabstop=4
 setlocal expandtab
 
+"TODO these are ignored because we set indentexpr in `indent/cpp.vim`
+" Ideally, indentexpr should read the settings from .clang-format if it exists
 setlocal nosmartindent
 setlocal autoindent
 setlocal cinkeys-=0#     " don't reindent PP directives
@@ -16,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  = '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|'
@@ -41,14 +43,21 @@ let g:switch_const_definitions =
     \   '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 GoToReferences<CR>
+
+nnoremap <buffer> <leader>fi :YcmCompleter FixIt<CR>
 
 " 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= =
@@ -69,6 +78,13 @@ function! s:Debug(...)
     tabedit %
     let t:debug_tab=1
     au BufDelete !gdb ++once if exists('t:debug_tab') | tabclose | endif
+
+    "TODO restore mappings
+    "TODO make mappings local to source buffer
+    nnoremap <buffer> <C-T> :call TermDebugSendCommand('advance -source '.expand('%').' -line '.line("."))<CR>
+    nnoremap <buffer> <C-S> :Step<CR>
+    nnoremap <buffer> <C-N> :Over<CR>
+    nnoremap <buffer> <C-F> :Finish<CR>
 endfunction
 command! -nargs=* -complete=file -bang Debug call <SID>Debug() | Termdebug<bang> <args>
 command! -nargs=+ -complete=file -bang DebugCommand call <SID>Debug() | TermdebugCommand<bang> <args>