From e446ebb3738c15c3b2c6afd275a3615ecc1eaeff Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Wed, 17 Jun 2015 22:30:37 +0000 Subject: [PATCH] vim/syntax/objc.vim: Add more keywords --- vim/syntax/objc.vim | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/vim/syntax/objc.vim b/vim/syntax/objc.vim index 2324236..fc012a3 100644 --- a/vim/syntax/objc.vim +++ b/vim/syntax/objc.vim @@ -30,8 +30,11 @@ endif " ObjC keywords, types, type qualifiers etc. syn keyword objcStatement self super _cmd -syn keyword objcType id Class SEL IMP BOOL -syn keyword objcTypeModifier bycopy in out inout oneway +syn keyword objcType id Class SEL IMP BOOL nonnull nullable +syn keyword objcTypeModifier bycopy in out inout oneway OF_GENERIC OF_INLINE +syn keyword objcTypeModifier OF_CONST_FUNC OF_NO_RETURN OF_KINDOF +syn keyword objcTypeModifier OF_RETURNS_INNER_POINTER OF_NONNULL +syn keyword objcTypeModifier OF_NULLABLE OF_NULLABLE_PROPERTY syn keyword objcConstant nil Nil " Match the ObjC #import directive (like C's #include) @@ -45,6 +48,7 @@ syn match objcDirective "@interface\|@implementation" syn match objcDirective "@class\|@end\|@defs" syn match objcDirective "@encode\|@protocol\|@selector" syn match objcDirective "@try\|@catch\|@finally\|@throw\|@synchronized" +syn match objcDirective "OF_ASSUME_NONNULL_BEGIN\|OF_ASSUME_NONNULL_END" " Match the ObjC method types " @@ -119,9 +123,10 @@ 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 syn keyword objcType of_byte_order_t of_range_t of_point_t of_dimension_t -syn keyword objcType of_rectangle_t of_string_encoding_t of_time_interval_t -syn keyword objcType of_resolver_result_t of_udp_socket_address_t of_offset_t -syn keyword objcType of_stat_t of_socket_t +syn keyword objcType of_mutex_t of_rectangle_t of_string_encoding_t +syn keyword objcType of_time_interval_t of_resolver_result_t +syn keyword objcType of_udp_socket_address_t of_offset_t of_stat_t of_socket_t +syn keyword objcType of_spinlock_t syn keyword objcConstant YES NO TRUE FALSE syn region objcImp start='@implementation' end='@end' transparent