diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2016-05-02 10:48:28 +0200 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2016-05-02 10:48:28 +0200 |
| commit | 5529a5e8e21e4577e4cd3551f2cbad59b5b406e8 (patch) | |
| tree | 6bcc43dba19fc5e68abc8831ae778ba076e5004b /syntax | |
| parent | 905031eb9536adb38d793c1ced6d61057d3ca456 (diff) | |
| download | vim-polyglot-5529a5e8e21e4577e4cd3551f2cbad59b5b406e8.tar.gz vim-polyglot-5529a5e8e21e4577e4cd3551f2cbad59b5b406e8.zip | |
Update vim-puppet source to voxpupuli/vim-puppet, closes #115
Diffstat (limited to 'syntax')
| -rw-r--r-- | syntax/puppet.vim | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/syntax/puppet.vim b/syntax/puppet.vim index d38e297e..b7ce2d9d 100644 --- a/syntax/puppet.vim +++ b/syntax/puppet.vim @@ -18,16 +18,17 @@ elseif exists("b:current_syntax") finish endif -" match class/definition/node declarations -syn region puppetDefine start="^\s*\(class\|define\|node\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments,puppetNodeRe,@NoSpell -syn keyword puppetDefType class define node inherits contained -syn region puppetDefArguments start="(" end=")" contained contains=puppetArgument,puppetString,puppetComment,puppetMultilineComment +" match class/definition/node declarations/application +syn region puppetDefine start="^\s*\(class\|define\|node\|application\)\s" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments,puppetNodeRe,@NoSpell +syn keyword puppetDefType class define node inherits application contained +syn region puppetDefArguments start="(" end=")" contained contains=puppetArgument,puppetString,puppetComment,puppetMultilineComment,puppetDataTypes syn match puppetArgument "\w\+" contained syn match puppetArgument "\$\w\+" contained syn match puppetArgument "'[^']+'" contained syn match puppetArgument '"[^"]+"' contained syn match puppetDefName "\w\+" contained syn match puppetNodeRe "/.*/" contained +syn keyword puppetDataTypes String Integer Float Numeric Boolean Array Hash Regexp Undef Default Resource Class Scalar Collection Variant Data Pattern Enum Tuple Struct Optional Catalogentry Type Any Callable " match 'foo' in 'class foo { ...' " match 'foo::bar' in 'class foo::bar { ...' @@ -42,7 +43,7 @@ syn match puppetTypeDefault "[A-Z]\w*" contained syn match puppetParam "\w\+\s*\(=\|+\)>" contains=puppetTypeRArrow,puppetParamName syn match puppetParamRArrow "\(=\|+\)>" contained syn match puppetParamName "\w\+" contained contains=@NoSpell -syn match puppetVariable "$\(\(\(::\)\?\w\+\)\+\|{\(\(::\)\?\w\+\)\+}\)" +syn match puppetVariable "$\(\(::\)\?\w\+\|{\(::\)\?\w\+}\)" syn match puppetParen "(" syn match puppetParen ")" syn match puppetBrace "{" @@ -57,7 +58,7 @@ syn match puppetBrack "|>" " don't match 'bar' in 'foo => bar' syn match puppetParam "\w\+\s*[=+]>\s*[a-z0-9]\+" contains=puppetParamString,puppetParamName syn match puppetParamString "[=+]>\s*\w\+" contains=puppetParamKeyword,puppetParamSpecial,puppetParamDigits contained -syn keyword puppetParamKeyword present absent purged latest installed running stopped mounted unmounted role configured file directory link contained +syn keyword puppetParamKeyword present absent purged latest installed running stopped mounted unmounted role configured file directory link on_failure contained syn keyword puppetParamSpecial true false undef contained syn match puppetParamDigits "[0-9]\+" @@ -78,8 +79,8 @@ syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=pupp syn match puppetNotVariable "\\$\w\+" contained syn match puppetNotVariable "\\${\w\+}" contained -syn keyword puppetKeyword import inherits include require contains -syn keyword puppetControl case default if else elsif +syn keyword puppetKeyword import inherits include require contain produces +syn keyword puppetControl case default if else elsif unless syn keyword puppetSpecial true false undef syn match puppetClass "[A-Za-z0-9_-]\+\(::[A-Za-z0-9_-]\+\)\+" contains=@NoSpell |