configs  Check-in [a75ea048b6]

Overview
Comment:syntax/objc.vim: Add more keywords / types
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a75ea048b64d986b420ce44daaf1f6501150449358512ab41257c8a4ee557303
User & Date: js 2015-12-01 22:53:08
Context
2015-12-01
22:53
vimrc: Disable mouse check-in: 1b4d0dba59 user: js tags: trunk
22:53
syntax/objc.vim: Add more keywords / types check-in: a75ea048b6 user: js tags: trunk
22:52
tmux.conf: Add a space as tmux now does it right check-in: 02a93e9c3f user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to vim/syntax/objc.vim.

28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
" and uses *.h, *.m as file extensions!


" ObjC keywords, types, type qualifiers etc.
syn keyword objcStatement	self super _cmd
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)
syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
syn match  objcImported display contained "<[-_0-9a-zA-Z.\/]*>"
syn match  objcImport display "^\s*\(%:\|#\)\s*import\>\s*["<]" contains=objcImported








|
|
|







28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
" and uses *.h, *.m as file extensions!


" ObjC keywords, types, type qualifiers etc.
syn keyword objcStatement	self super _cmd
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
syn keyword objcTypeModifier	OF_RETURNS_INNER_POINTER
syn keyword objcTypeModifier	_Nonnull _Nullable _Null_unspecified __kindof
syn keyword objcConstant	nil Nil

" Match the ObjC #import directive (like C's #include)
syn region objcImported display contained start=+"+  skip=+\\\\\|\\"+  end=+"+
syn match  objcImported display contained "<[-_0-9a-zA-Z.\/]*>"
syn match  objcImport display "^\s*\(%:\|#\)\s*import\>\s*["<]" contains=objcImported

122
123
124
125
126
127
128
129

130
131
132
133
134
135
136
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_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
syn region objcHeader start='@interface' end='@end' transparent

syn match objcSubclass '\(@implementation\|@interface\)\@<=\s*\k\+' display contained containedin=objcImp,objcHeader
syn match objcSuperclass '\(@\(implementation\|interface\)\s*\k\+\s*:\)\@<=\s*\k*' display contained containedin=objcImp,objcHeader







|
>







122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
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_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 of_options_parser_option_t
syn keyword objcType of_http_request_method_t of_http_request_protocol_version_t
syn keyword objcConstant YES NO TRUE FALSE

syn region objcImp start='@implementation' end='@end' transparent
syn region objcHeader start='@interface' end='@end' transparent

syn match objcSubclass '\(@implementation\|@interface\)\@<=\s*\k\+' display contained containedin=objcImp,objcHeader
syn match objcSuperclass '\(@\(implementation\|interface\)\s*\k\+\s*:\)\@<=\s*\k*' display contained containedin=objcImp,objcHeader