diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 23:00:35 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-09-13 23:00:35 -0700 |
| commit | 9e72ccd8ff087d0cf4a1396401e3843311b4e6d4 (patch) | |
| tree | 19f55c6cb37bfd9bc39f0bf9060643ac61005415 /ext/vim/syntax | |
| parent | 1d93c4dd86181eb2663dd8df2e84719c2e1ffcdf (diff) | |
| parent | efa834aaec596b0d5e7b314a53e6b258ce44728c (diff) | |
| download | puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.gz puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.tar.xz puppet-9e72ccd8ff087d0cf4a1396401e3843311b4e6d4.zip | |
Merge commit '2.6.1rc4' into next
Diffstat (limited to 'ext/vim/syntax')
| -rw-r--r-- | ext/vim/syntax/puppet.vim | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index 0025e2d1c..96052104d 100644 --- a/ext/vim/syntax/puppet.vim +++ b/ext/vim/syntax/puppet.vim @@ -57,14 +57,14 @@ syn region puppetFunction start="^\s*\(alert\|crit\|debug\|emerg\|err\|fai " rvalues syn region puppetFunction start="^\s*\(defined\|file\|fqdn_rand\|generate\|inline_template\|regsubst\|sha1\|shellquote\|split\|sprintf\|tagged\|template\|versioncmp\)\s*(" end=")" contained contains=puppetString -syn match puppetVariable "$\w\+" -syn match puppetVariable "${\w\+}" +syn match puppetVariable "$[a-zA-Z0-9_:]\+" +syn match puppetVariable "${[a-zA-Z0-9_:]\+}" " match anything between simple/double quotes. " don't match variables if preceded by a backslash. syn region puppetString start=+'+ skip=+\\\\\|\\'+ end=+'+ syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable,puppetNotVariable -syn match puppetString "/.*/" +syn match puppetString "/[^/]*/" syn match puppetNotVariable "\\$\w\+" contained syn match puppetNotVariable "\\${\w\+}" contained |