From 7f03e98a038d85b989bb7589461b3416e5ed043e Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Mon, 5 Jun 2017 20:24:36 +0000 Subject: [PATCH] Update vim configs --- vim/syntax/objc.vim | 10 +++++++--- vimrc | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vim/syntax/objc.vim b/vim/syntax/objc.vim index 588b968..f44c3bb 100644 --- a/vim/syntax/objc.vim +++ b/vim/syntax/objc.vim @@ -30,10 +30,13 @@ endif " ObjC keywords, types, type qualifiers etc. syn keyword objcStatement self super _cmd -syn keyword objcType id Class SEL IMP BOOL nonnull nullable +syn keyword objcType id Class SEL IMP BOOL +syn keyword objcType nonnull nullable null_unspecified syn keyword objcTypeModifier bycopy in out inout oneway OF_GENERIC OF_INLINE -syn keyword objcTypeModifier OF_CONST_FUNC OF_NO_RETURN +syn keyword objcTypeModifier OF_KINDOF OF_CONST_FUNC OF_NO_RETURN syn keyword objcTypeModifier OF_RETURNS_INNER_POINTER OF_NULLABLE_PROPERTY +syn keyword objcTypeModifier OF_NULL_RESETTABLE_PROPERTY OF_UNAVAILABLE +syn keyword objcTypeModifier OF_DESIGNATED_INITIALIZER OF_METHOD_FAMILY syn keyword objcTypeModifier _Nonnull _Nullable _Null_unspecified __kindof syn keyword objcConstant nil Nil @@ -118,7 +121,8 @@ let b:current_syntax = "objc" " cocoa.vim plugin). " Last Updated: May 3, 2015 -syn match objcDirective '@synthesize\|@property\|@optional\|@required\|@autoreleasepool' display +syn match objcDirective '@synthesize\|@dynamic\|@property' display +syn match objcDirective '@optional\|@required\|@autoreleasepool' display syn keyword objcType IBOutlet IBAction Method __block instancetype syn keyword objcType __unsafe_unretained __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak syn keyword objcType of_unichar_t of_char16_t of_char32_t of_comparison_result_t diff --git a/vimrc b/vimrc index b4689e4..4e42cde 100644 --- a/vimrc +++ b/vimrc @@ -1,4 +1,4 @@ -source /usr/share/vim/vim73/vimrc_example.vim +source /usr/share/vim/vim74/vimrc_example.vim set t_Co=256 set background=dark @@ -21,6 +21,7 @@ au BufNewFile,BufRead */LLVM/* :se ts=2 sw=2 et au BufNewFile,BufRead *.c :se ft=c.doxygen au BufNewFile,BufRead *.h :se ft=objc.doxygen au BufNewFile,BufRead *.m :se ft=objc.doxygen +au BufNewFile,BufRead *.mm :se ft=objcpp au BufNewFile,BufRead *.v :se ts=4 sw=4 au BufNewFile,BufRead *.vhd :se ts=4 sw=4 au BufNewFile,BufRead *.py :se ts=4 sw=4 et