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

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index 542503a..19850a7 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,17 +16,41 @@ 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 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:|src|include/**|'
 augroup END
 
-nnoremap <buffer> gd :YcmCompleter GoTo<CR>
-nnoremap <buffer> <C-W>d :vs<CR>:YcmCompleter GoTo<CR>
+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 ',
+    \   'const \([[:alnum:]_:<>]\{-}\) &\@!': 'const \1 &' ,
+    \   'const \([[:alnum:]_:<>]\{-}\) &': '\1 '
+    \ } ]
+
+nnoremap <buffer> <leader>c :call switch#Switch({'definitions': g:switch_const_definitions})<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'
@@ -34,6 +60,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 ';'
@@ -41,7 +84,22 @@ 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()
+
+function! MyCppFoldText()
+  let l:line = getline(v:foldstart)
+  " expand tabs in line, foldtext does not do it on its own
+  let l:line = substitute(l:line, "\t", repeat(" ", shiftwidth()), "g")
+  let l:width = min([&textwidth, winwidth(0)])
+  let l:lineinfo = printf("%d", v:foldend - v:foldstart)
+  let l:ellipsis = "…"
+  return printf("%.*s%s%*d",
+        \ l:width - strdisplaywidth(l:ellipsis..l:lineinfo), l:line,
+        \ l:ellipsis,
+        \ l:width - strdisplaywidth(l:line..l:ellipsis),     l:lineinfo)
+endfunction
+setlocal foldtext=MyCppFoldText()
+setlocal fillchars+=fold:\