vim: errorformat for CMake

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

diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim
index faa7395e7366cc2ec9924b413aea94c1ee6e4952..06d4861b1616776af28f00c2b7ca7053bd6b42e7 100644 (file)
--- a/vim/ftplugin/cpp.vim
+++ b/vim/ftplugin/cpp.vim
@@ -14,13 +14,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  = 'c,cpp'
+    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 ',