adam/cshenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:adamlsd/cshenv

Browse Source 
Conflicts:
	vim/after/syntax/cpp.vim
This commit is contained in:
ADAM David Alan Martin
2021-03-08 16:23:57 -05:00
parent 91ac30b164 974530dfd9
commit 54d2d9ba62
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
vim/after/syntax/cpp.vim
View File

@ -12,6 +12,8 @@ syn keyword cppStatement try throw catch
syn keyword cxxConstants nullptr syn keyword cxxConstants nullptr
syn keyword cxxExportNamespace exports
syn match cxxConstants "\<\(C::[A-Za-z_]\|k[A-Z]\)[A-Z_a-z0-9]*\>" syn match cxxConstants "\<\(C::[A-Za-z_]\|k[A-Z]\)[A-Z_a-z0-9]*\>"
syn keyword cxxExceptionNames Exception Exceptions syn keyword cxxExceptionNames Exception Exceptions
@ -42,9 +44,13 @@ syn region cxxBoostLibrary matchgroup=cxxLibPrefix start="\<\(boost\)\z(::\)\@="
syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary string_view mutex thread contained " Threading
syn keyword cxxStlKeywords contained containedin=cxxStlLibrary,cxxBoostLibrary mutex condition_variable thread lock_guard scoped_lock unique_lock
" Strings
syn keyword cxxStlKeywords containedin=cxxStlLibrary string contained syn keyword cxxStlKeywords containedin=cxxStlLibrary string contained
syn keyword cxxStlKeywords contained containedin=cxxStlLibrary byte syn keyword cxxStlKeywords contained containedin=cxxStlLibrary byte
syn keyword cxxStlKeywords contained containedin=cxxStlLibrary,cxxBoostLibrary string_view
syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary function contained syn keyword cxxStlKeywords containedin=cxxStlLibrary,cxxBoostLibrary function contained
@ -88,8 +94,13 @@ syn keyword cxxStlFunctions containedin=cxxStlLibrary getline contained
" Metafunctions/Traits " Metafunctions/Traits
syn keyword cxxStlTraits containedin=cxxStlLibrary is_convertible contained syn keyword cxxLibStatement contained containedin=cxxStlLibrary decay_t
syn keyword cxxStlTraits containedin=cxxStlLibrary is_constructible is_default_constructible contained syn keyword cxxStlTypes contained containedin=cxxStlLibrary type_identity type_identity_t
syn keyword cxxStlTraits contained containedin=cxxStlLibrary is_convertible is_base_of
syn keyword cxxStlTraits contained containedin=cxxStlLibrary is_constructible is_default_constructible is_same
syn keyword cxxStlTraits contained containedin=cxxStlLibrary,cxxBoostLibrary enable_if enable_if_t
syn keyword cxxStlConstant contained containedin=cxxStlLibrary bool_constant is_same_v is_convertible_v is_constructible_v
syn keyword cxxStlConstant contained containedin=cxxStlLibrary,cxxBoostLibrary bool_constant true_type false_type is_base_of_v
" Free floating STL functions " Free floating STL functions
syn keyword cxxStlFreeFunctions back_inserter front_inserter inserter begin end syn keyword cxxStlFreeFunctions back_inserter front_inserter inserter begin end
@ -112,7 +123,8 @@ syn keyword cxxStlExceptionNames containedin=cxxStlLibrary overflow_error contai
syn keyword cxxStlExceptionNames containedin=cxxStlLibrary underflow_error contained syn keyword cxxStlExceptionNames containedin=cxxStlLibrary underflow_error contained
" Some common boost-only bits I use " Some common boost-only bits I use
syn keyword cxxStlKeywords contained containedin=cxxBoostLibrary lexical_cast syn keyword cxxStlKeywords contained containedin=cxxBoostLibrary
syn keyword cxxLibStatement contained containedin=cxxBoostLibrary lexical_cast noncopyable
" Highlight dangerous things " Highlight dangerous things
syn match cxxStlDangerousFunction "\(\.\)\@<=release()" syn match cxxStlDangerousFunction "\(\.\)\@<=release()"
@ -150,11 +162,15 @@ if version >= 508 || !exists("did_cxx_syntax_inits")
HiLink cxxStlKeywords cppType HiLink cxxStlKeywords cppType
HiLink cxxStlFunctions cppStatement HiLink cxxStlFunctions cppStatement
HiLink cxxStlFreeFunctions cppStatement HiLink cxxStlFreeFunctions cppStatement
HiLink cxxLibStatement cppStatement
HiLink cxxLibPrefix Caller HiLink cxxLibPrefix Caller
HiLink cxxExportNamespace cppModule
HiLink cxxStlTraits MetaFunction HiLink cxxStlTraits MetaFunction
HiLink cxxMetaFunction MetaFunction HiLink cxxMetaFunction MetaFunction
HiLink cxxLibMetaFunction cxxMetaFunction
HiLink cxxStlDangerousFunction Dangerous HiLink cxxStlDangerousFunction Dangerous

6
vim/vimrc.fileprefs
View File

@ -18,6 +18,7 @@ au BufNewFile,BufRead */cshenv/tcshrc.* set filetype=tcsh
au BufNewFile,BufRead */src/bp/*.cpp,*/src/bp/*.hpp syn region cxxBoostLibrary matchgroup=cxxLibPrefix start="\<\(bp_boost\)\z(::\)\@=" matchgroup=NONE skip="\z1" end="\>" transparent au BufNewFile,BufRead */src/bp/*.cpp,*/src/bp/*.hpp syn region cxxBoostLibrary matchgroup=cxxLibPrefix start="\<\(bp_boost\)\z(::\)\@=" matchgroup=NONE skip="\z1" end="\>" transparent
au BufNewFile,BufRead */src/bp/*.cpp,*/src/bp/*.hpp syn region cxxBoostVerbotenLibrary matchgroup=cxxStlDangerousFunction start="\<\(boost\)\z(::\)\@=" matchgroup=NONE skip="\z1" end="\>" transparent au BufNewFile,BufRead */src/bp/*.cpp,*/src/bp/*.hpp syn region cxxBoostVerbotenLibrary matchgroup=cxxStlDangerousFunction start="\<\(boost\)\z(::\)\@=" matchgroup=NONE skip="\z1" end="\>" transparent
au BufNewFile,BufRead */src/bp/*.cpp,*/src/bp/*.hpp set et
" falcish " falcish
"au BufNewFile,BufRead *.cpp,*.hpp,*.cc,*.h set ts=3 "au BufNewFile,BufRead *.cpp,*.hpp,*.cc,*.h set ts=3
@ -41,3 +42,8 @@ au FileType * setlocal formatoptions=tcq
" Statusline workaround: " Statusline workaround:
au BufWinEnter quickfix source ~/.vim/vimrc.statusline au BufWinEnter quickfix source ~/.vim/vimrc.statusline
" Sometimes some distros make us load up on the last line edited, when reading for the first time...
" This should fix this.
au BufReadPost * :1
au BufNewFile * :1