From bc0616ee7def99fa26b86ab7d8b0c657e358c1dd Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Wed, 19 Dec 2007 14:08:41 -0600 Subject: Updating filetype detection for vim, and changing the filestructure for vim files. (#900 and #963) --- CHANGELOG | 2 + ext/vim/README | 2 + ext/vim/filetype.vim | 9 ----- ext/vim/ftdetect/puppet.vim | 2 + ext/vim/puppet.vim | 89 --------------------------------------------- ext/vim/syntax/puppet.vim | 89 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 95 insertions(+), 98 deletions(-) create mode 100644 ext/vim/README delete mode 100644 ext/vim/filetype.vim create mode 100644 ext/vim/ftdetect/puppet.vim delete mode 100644 ext/vim/puppet.vim create mode 100644 ext/vim/syntax/puppet.vim diff --git a/CHANGELOG b/CHANGELOG index 4235430b5..b29f76896 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ + Updated vim filetype detection. (#900 and #963) + Default resources like schedules no longer conflict with managed resources. (#965) diff --git a/ext/vim/README b/ext/vim/README new file mode 100644 index 000000000..776bb1eb2 --- /dev/null +++ b/ext/vim/README @@ -0,0 +1,2 @@ +To install these files, copy them into ~/.vim, or the relevant +system-wide location. diff --git a/ext/vim/filetype.vim b/ext/vim/filetype.vim deleted file mode 100644 index 2d73b4bfa..000000000 --- a/ext/vim/filetype.vim +++ /dev/null @@ -1,9 +0,0 @@ -" detect puppet filetypes -" $Id$ - -if exists("did_load_filetypes") - finish -endif -augroup filetypedetect - au! BufRead,BufNewFile *.pp setfiletype puppet -augroup END diff --git a/ext/vim/ftdetect/puppet.vim b/ext/vim/ftdetect/puppet.vim new file mode 100644 index 000000000..c9d15ea53 --- /dev/null +++ b/ext/vim/ftdetect/puppet.vim @@ -0,0 +1,2 @@ +" detect puppet filetype +au BufRead,BufNewFile *.pp set filetype=puppet diff --git a/ext/vim/puppet.vim b/ext/vim/puppet.vim deleted file mode 100644 index a29e368e1..000000000 --- a/ext/vim/puppet.vim +++ /dev/null @@ -1,89 +0,0 @@ -" puppet syntax file -" Filename: puppet.vim -" Language: puppet configuration file -" Maintainer: Luke Kanies -" URL: -" Last Change: -" Version: -" - -" Copied from the cfengine, ruby, and perl syntax files -" For version 5.x: Clear all syntax items -" For version 6.x: Quit when a syntax file was already loaded -if version < 600 - syntax clear -elseif exists("b:current_syntax") - finish -endif - -syn region puppetDefine start="^\s*\(class\|define\|site\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments -syn keyword puppetDefType class define site node inherits contained -syn keyword puppetInherits inherits contained -syn region puppetDefArguments start="(" end=")" contains=puppetArgument -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 puppetInstance "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault -syn match puppetTypeBrace "{" contained -syn match puppetTypeName "[a-z]\w*" contained -syn match puppetTypeDefault "[A-Z]\w*" contained - -syn match puppetParam "\w\+\s*=>" contains=puppetTypeRArrow,puppetParamName -syn match puppetParamRArrow "=>" contained -syn match puppetParamName "\w\+" contained -syn match puppetVariable "$\w\+" -syn match puppetVariable "${\w\+}" -syn match puppetParen "(" -syn match puppetParen ")" -syn match puppetBrace "{" -syn match puppetBrace "}" - -syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable - -syn keyword puppetBoolean true false -syn keyword puppetKeyword import inherits include -syn keyword puppetControl case default - -" comments last overriding everything else -syn match puppetComment "\s*#.*$" contains=puppetTodo -syn keyword puppetTodo TODO NOTE FIXME XXX contained - -" Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_puppet_syn_inits") - if version < 508 - let did_puppet_syn_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink puppetVariable Identifier - HiLink puppetBoolean Boolean - HiLink puppetType Identifier - HiLink puppetDefault Identifier - HiLink puppetKeyword Define - HiLink puppetTypeDefs Define - HiLink puppetComment Comment - HiLink puppetString String - HiLink puppetTodo Todo -" HiLink puppetBrace Delimiter -" HiLink puppetTypeBrace Delimiter -" HiLink puppetParen Delimiter - HiLink puppetDelimiter Delimiter - HiLink puppetControl Statement - HiLink puppetDefType Define - HiLink puppetDefName Type - HiLink puppetTypeName Statement - HiLink puppetTypeDefault Type - HiLink puppetParamName Identifier - HiLink puppetArgument Identifier - - delcommand HiLink -endif - -let b:current_syntax = "puppet" diff --git a/ext/vim/syntax/puppet.vim b/ext/vim/syntax/puppet.vim new file mode 100644 index 000000000..a29e368e1 --- /dev/null +++ b/ext/vim/syntax/puppet.vim @@ -0,0 +1,89 @@ +" puppet syntax file +" Filename: puppet.vim +" Language: puppet configuration file +" Maintainer: Luke Kanies +" URL: +" Last Change: +" Version: +" + +" Copied from the cfengine, ruby, and perl syntax files +" For version 5.x: Clear all syntax items +" For version 6.x: Quit when a syntax file was already loaded +if version < 600 + syntax clear +elseif exists("b:current_syntax") + finish +endif + +syn region puppetDefine start="^\s*\(class\|define\|site\|node\)" end="{" contains=puppetDefType,puppetDefName,puppetDefArguments +syn keyword puppetDefType class define site node inherits contained +syn keyword puppetInherits inherits contained +syn region puppetDefArguments start="(" end=")" contains=puppetArgument +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 puppetInstance "\w\+\s*{" contains=puppetTypeBrace,puppetTypeName,puppetTypeDefault +syn match puppetTypeBrace "{" contained +syn match puppetTypeName "[a-z]\w*" contained +syn match puppetTypeDefault "[A-Z]\w*" contained + +syn match puppetParam "\w\+\s*=>" contains=puppetTypeRArrow,puppetParamName +syn match puppetParamRArrow "=>" contained +syn match puppetParamName "\w\+" contained +syn match puppetVariable "$\w\+" +syn match puppetVariable "${\w\+}" +syn match puppetParen "(" +syn match puppetParen ")" +syn match puppetBrace "{" +syn match puppetBrace "}" + +syn region puppetString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=puppetVariable + +syn keyword puppetBoolean true false +syn keyword puppetKeyword import inherits include +syn keyword puppetControl case default + +" comments last overriding everything else +syn match puppetComment "\s*#.*$" contains=puppetTodo +syn keyword puppetTodo TODO NOTE FIXME XXX contained + +" Define the default highlighting. +" For version 5.7 and earlier: only when not done already +" For version 5.8 and later: only when an item doesn't have highlighting yet +if version >= 508 || !exists("did_puppet_syn_inits") + if version < 508 + let did_puppet_syn_inits = 1 + command -nargs=+ HiLink hi link + else + command -nargs=+ HiLink hi def link + endif + + HiLink puppetVariable Identifier + HiLink puppetBoolean Boolean + HiLink puppetType Identifier + HiLink puppetDefault Identifier + HiLink puppetKeyword Define + HiLink puppetTypeDefs Define + HiLink puppetComment Comment + HiLink puppetString String + HiLink puppetTodo Todo +" HiLink puppetBrace Delimiter +" HiLink puppetTypeBrace Delimiter +" HiLink puppetParen Delimiter + HiLink puppetDelimiter Delimiter + HiLink puppetControl Statement + HiLink puppetDefType Define + HiLink puppetDefName Type + HiLink puppetTypeName Statement + HiLink puppetTypeDefault Type + HiLink puppetParamName Identifier + HiLink puppetArgument Identifier + + delcommand HiLink +endif + +let b:current_syntax = "puppet" -- cgit