aboutsummaryrefslogtreecommitdiff
path: root/contrib/vim/syntax/nginx.vim
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2017-12-25 19:41:00 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2017-12-25 19:41:00 +0300
commit9bc0ced4a78b52cd8ea57ceb1a3ec9c103316284 (patch)
tree2a35ad7143434793402f1f883240c91ecd27e0db /contrib/vim/syntax/nginx.vim
parent0ad556fe59ad132dc4d34dea9e80f2ff2c3c1314 (diff)
downloadnginx-9bc0ced4a78b52cd8ea57ceb1a3ec9c103316284.tar.gz
nginx-9bc0ced4a78b52cd8ea57ceb1a3ec9c103316284.zip
Contrib: updated vim syntax rules for variables.
Non-quoted parameters are allowed to contain variables in curly brackets (see d91a8c4ac6bb), so vim syntax rules were adjusted accordingly.
Diffstat (limited to 'contrib/vim/syntax/nginx.vim')
-rw-r--r--contrib/vim/syntax/nginx.vim6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/vim/syntax/nginx.vim b/contrib/vim/syntax/nginx.vim
index dc8c0cb4d..20bac4a40 100644
--- a/contrib/vim/syntax/nginx.vim
+++ b/contrib/vim/syntax/nginx.vim
@@ -15,7 +15,7 @@ endif
syn match ngxName '\([^;{} \t\\]\|\\.\)\+'
\ contains=@ngxDirectives
\ nextgroup=@ngxParams skipwhite skipempty
-syn match ngxParam '\([^;{ \t\\]\|\\.\)\+'
+syn match ngxParam '\(\${\|[^;{ \t\\]\|\\.\)\+'
\ contained
\ contains=ngxVariable
\ nextgroup=@ngxParams skipwhite skipempty
@@ -29,7 +29,7 @@ syn region ngxBlock start=+{+ end=+}+ contained
\ contains=@ngxTopLevel
syn match ngxComment '#.*$'
-syn match ngxVariable '\$\w\+' contained
+syn match ngxVariable '\$\(\w\+\|{\w\+}\)' contained
syn match ngxVariableString '\$\(\w\+\|{\w\+}\)' contained
syn cluster ngxTopLevel
@@ -52,7 +52,7 @@ syn cluster ngxParams add=ngxBoolean
syn cluster ngxTopLevel add=ngxDirectiveListen
syn keyword ngxDirectiveListen listen
\ nextgroup=@ngxListenParams skipwhite skipempty
-syn match ngxListenParam '\([^;{ \t\\]\|\\.\)\+'
+syn match ngxListenParam '\(\${\|[^;{ \t\\]\|\\.\)\+'
\ contained
\ nextgroup=@ngxListenParams skipwhite skipempty
syn region ngxListenString start=+\z(["']\)+ end=+\z1+ skip=+\\\\\|\\\z1+