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

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index faa7395..12c6443 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
@@ -14,13 +16,26 @@ 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|'
+augroup fswitch_cpp
+    au!
+    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|'
     au BufEnter *.cpp let b:fswitchdst  = 'hpp,h'
-    au BufEnter *.cpp let b:fswitchlocs = 'reg:|source|include/**|'
+    au BufEnter *.cpp let b:fswitchlocs = '.,reg:|src|include/**|'
 augroup END
 
+let g:switch_custom_definitions =
+    \ [
+    \   ['EXPECT_FALSE', 'EXPECT_TRUE'],
+    \   ['EXPECT_EQ', 'EXPECT_NE'],
+    \   ['EXPECT_LT', 'EXPECT_GT'],
+    \   ['ASSERT_FALSE', 'ASSERT_TRUE'],
+    \   ['ASSERT_EQ', 'ASSERT_NE'],
+    \   ['ASSERT_LT', 'ASSERT_GT']
+    \ ]
+
 let g:switch_const_definitions =
     \ [ {
     \   '\%(const \)\@!\([[:alnum:]_:<>]\{-}\) \%(&\)\@!': 'const \1 ',
@@ -28,19 +43,38 @@ 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>
+nnoremap <buffer> <leader>fr :YcmCompleter RefactorRename<space>
 
 " 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= =
 
+" 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'
@@ -50,6 +84,23 @@ setlocal errorformat+=%X%*\\a:\ Leaving\ directory\ [`']%f'
 setlocal errorformat+=%*[^[]\[%tRROR\]%m\ \[%f:%l\]
 setlocal errorformat+=%*[^[]\[%tARNING\]%m\ \[%f:%l\]
 
+packadd termdebug
+let g:termdebug_wide = 1
+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>
+
 setlocal foldmethod=syntax
 " set foldlevel according to number of matches of 'namespace' and 'class' not
 " containing ';'
@@ -57,7 +108,7 @@ function! InitialFoldLevel()
     let v:errmsg = ""
     keepjumps keeppatterns silent! 1,/}/s/^\(namespace\|class\) \+[^;]*$//n
     if v:errmsg == ""
-        let &foldlevel=str2nr(split(v:statusmsg)[0])
+        let &l:foldlevel=str2nr(split(v:statusmsg)[0])
     endif
 endf
 call InitialFoldLevel()