From c047c8d38f5fbb8159a357f64d6c444d66407423 Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 16 Jul 2010 07:36:45 +0200 Subject: vim: added elsif --- ext/vim/syntax/puppet.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/vim/syntax/puppet.vim') diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index 80cd91c6c..81efa92ba 100644 --- a/ext/vim/syntax/puppet.vim +++ b/ext/vim/syntax/puppet.vim @@ -68,7 +68,7 @@ syn match puppetNotVariable "\\$\w\+" contained syn match puppetNotVariable "\\${\w\+}" contained syn keyword puppetKeyword import inherits include -syn keyword puppetControl case default if else +syn keyword puppetControl case default if else elsif syn keyword puppetSpecial true false undef " comments last overriding everything else -- cgit From be2141a6e37fabe78b57be699f8ae9d84acdebcf Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 16 Jul 2010 13:03:54 +0200 Subject: vim: match collected resources. --- ext/vim/syntax/puppet.vim | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/vim/syntax/puppet.vim') diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index 81efa92ba..b24cbf623 100644 --- a/ext/vim/syntax/puppet.vim +++ b/ext/vim/syntax/puppet.vim @@ -33,6 +33,7 @@ syn match puppetNodeRe "/.*/" contained "FIXME: "Foo-bar" doesn't get highlighted as expected, although "foo-bar" does. syn match puppetInstance "[A-Za-z0-9_-]\+\(::[A-Za-z0-9_-]\+\)*\s*{" contains=puppetTypeName,puppetTypeDefault syn match puppetInstance "[A-Z][a-z_-]\+\(::[A-Z][a-z_-]\+\)*\s*[[{]" contains=puppetTypeName,puppetTypeDefault +syn match puppetInstance "[A-Z][a-z_-]\+\(::[A-Z][a-z_-]\+\)*\s*<\?<|" contains=puppetTypeName,puppetTypeDefault syn match puppetTypeName "[a-z]\w*" contained syn match puppetTypeDefault "[A-Z]\w*" contained -- cgit From ac3a0d2d6c10f4a1616865d2c2e69b68a4bbcb3e Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Fri, 16 Jul 2010 08:22:30 +0200 Subject: vim: highlight default parameters in definition/classes --- ext/vim/syntax/puppet.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/vim/syntax/puppet.vim') diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim index b24cbf623..0025e2d1c 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=")" contained contains=puppetArgument +syn region puppetDefArguments start="(" end=")" contained contains=puppetArgument,puppetString syn match puppetArgument "\w\+" contained syn match puppetArgument "\$\w\+" contained syn match puppetArgument "'[^']+'" contained -- cgit From 690465ef34344acda39469f71f6fb4a9e022ff7b Mon Sep 17 00:00:00 2001 From: Marc Fournier Date: Wed, 25 Aug 2010 22:11:16 +0200 Subject: Fix #4615 - vim highlighting fails on slashes and colons. When a regexp is used in a selector, vim shouldn't choke if more than one slash is found on the same line. This patch also adds support for colons in attribute names. --- ext/vim/syntax/puppet.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'ext/vim/syntax/puppet.vim') 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 -- cgit