Vim syntax: Fix angleBrackets and vars regex.

Fixes #6386

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>
This commit is contained in:
Carlos Cesario 2014-06-02 13:23:51 -03:00 committed by Michael Friedrich
parent c1af4e827d
commit ec75e7dcbb
1 changed files with 74 additions and 72 deletions

View File

@ -34,7 +34,7 @@ syn region icinga2Comment start="/\*" end="\*/" contains=icinga2C
syn region StringD start=+"+ end=+"\|$+
syn region StringS start=+'+ end=+'\|$+
syn match angleBrackets '\<.*\>'
syn match angleBrackets "<\w\+>"
" Braces and Parens definition
@ -76,7 +76,8 @@ syn keyword icinga2ObjAttr contained pager parent parent_host
syn keyword icinga2ObjAttr contained port ranges retry_interval rotation_interval rotation_method
syn keyword icinga2ObjAttr contained service_format_template service_name service_perfdata_path service_temp_path
syn keyword icinga2ObjAttr contained severity socket_path socket_type spool_dir states status_path table_prefix
syn keyword icinga2ObjAttr contained timeout times types update_interval user user_groups users vars volatile
syn keyword icinga2ObjAttr contained timeout times types update_interval user user_groups users volatile
syn match icinga2ObjAttr contained "\(vars.\w\+\)"
" keywords
@ -95,9 +96,10 @@ syn keyword icinga2Function contained regex match len union intersection str
" global constats
syn keyword icinga2Gconst contained PrefixDir SysconfDir ZonesDir LocalStateDir PkgDataDir StatePath PidPath
syn keyword icinga2Gconst contained Vars NodeName ApplicationType EnableNotifications EnableEventHandlers
syn keyword icinga2Gconst contained EnableFlapping EnableHostChecks EnableServiceChecks EnablePerfdata UseVfork
syn keyword icinga2Gconst PrefixDir SysconfDir ZonesDir LocalStateDir PkgDataDir StatePath PidPath
syn keyword icinga2Gconst NodeName ApplicationType EnableNotifications EnableEventHandlers
syn keyword icinga2Gconst EnableFlapping EnableHostChecks EnableServiceChecks EnablePerfdata UseVfork
syn match icinga2Gconst "\(Vars[ \t]\+\)"
" values type
@ -106,7 +108,7 @@ syn keyword valueNull contained null
syn region icinga2DefBody start='{' end='}'
syn region nagiosDefBody start='{' end='}'
\ contains=icinga2Comment,icinga2LineComment,StringD,Braces,Parens,icinga2ObjDef,
\ icinga2ApplyDef,icinga2ObjAttr,icinga2Keyword,icinga2Keyword,icinga2ACond,
\ icinga2Function,icinga2Gconst,valueBoolean,valueNull