diff options
| author | Markus Roberts <Markus@reality.com> | 2010-02-09 15:17:53 -0800 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-02-09 15:17:53 -0800 |
| commit | 27322e5460130b854835aef56ab7076bab83a00b (patch) | |
| tree | b69501ce3c7fd616880f60999ad38304a40abba2 /ext/vim/syntax | |
| parent | 70c71c58c1dd038d033d5fdd3fecc8f15b11fd52 (diff) | |
| parent | 71653a74d91b1e6e9845b4a41249861319c0d6b0 (diff) | |
| download | puppet-27322e5460130b854835aef56ab7076bab83a00b.tar.gz puppet-27322e5460130b854835aef56ab7076bab83a00b.tar.xz puppet-27322e5460130b854835aef56ab7076bab83a00b.zip | |
Merge branch '0.25.x'
Conflicts:
lib/puppet/agent.rb
lib/puppet/application/puppet.rb
lib/puppet/configurer.rb
man/man5/puppet.conf.5
spec/integration/defaults.rb
spec/unit/configurer.rb
Diffstat (limited to 'ext/vim/syntax')
| -rw-r--r-- | ext/vim/syntax/puppet.vim | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index eb62b64b8..80cd91c6c 100644 --- a/ext/vim/syntax/puppet.vim +++ b/ext/vim/syntax/puppet.vim @@ -19,7 +19,7 @@ endif " match class/definition/node declarations syn region puppetDefine start="^\s*\(class\|define\|node\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments,puppetNodeRe syn keyword puppetDefType class define node inherits contained -syn region puppetDefArguments start="(" end=")" contains=puppetArgument +syn region puppetDefArguments start="(" end=")" contained contains=puppetArgument syn match puppetArgument "\w\+" contained syn match puppetArgument "\$\w\+" contained syn match puppetArgument "'[^']+'" contained @@ -51,8 +51,10 @@ syn match puppetParamDigits "[0-9]\+" " match 'template' in 'content => template("...")' syn match puppetParam "\w\+\s*[=+]>\s*\w\+\s*(" contains=puppetFunction,puppetParamName -syn keyword puppetFunction debug info notice warning err alert emerg crit -syn keyword puppetFunction sprintf template fail tagged include generate search file tag versioncmp fqdn_rand realize split defined regsubst sha1 inline_template contained +" statements +syn region puppetFunction start="^\s*\(alert\|crit\|debug\|emerg\|err\|fail\|include\|info\|notice\|realize\|require\|search\|tag\|warning\)\s*(" end=")" contained contains=puppetString +" 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\+}" |