This commit is contained in:
Adam Stankiewicz
2021-07-28 17:54:35 +02:00
parent 554a6ac757
commit ce31cd1d2f
16 changed files with 209 additions and 87 deletions

View File

@@ -8,7 +8,7 @@ endif
" Last Change: 2009 Aug 19
" vim: set sw=4 sts=4:
if exists("b:did_indent")
if exists('b:did_indent')
finish
endif
let b:did_indent = 1
@@ -17,11 +17,11 @@ setlocal autoindent smartindent
setlocal indentexpr=GetPuppetIndent()
setlocal indentkeys+=0],0)
let b:undo_indent = "
let b:undo_indent = '
\ setlocal autoindent< smartindent< indentexpr< indentkeys<
\"
\'
if exists("*GetPuppetIndent")
if exists('*GetPuppetIndent')
finish
endif
@@ -37,7 +37,7 @@ function! s:PartOfInclude(lnum)
if line !~ ',$'
break
endif
if line =~ '^\s*include\s\+[^,]\+,$' && line !~ '[=>]>'
if line =~# '^\s*include\s\+[^,]\+,$' && line !~ '[=>]>'
return 1
endif
endwhile
@@ -84,7 +84,7 @@ function! GetPuppetIndent(...)
" the same indent here would be premature since for that particular case
" we want to instead get the indent level of the matching opening brace or
" parenthenses.
if pline =~ '^\s*#' && line !~ '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
if pline =~# '^\s*#' && line !~# '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
return ind
endif
@@ -123,12 +123,12 @@ function! GetPuppetIndent(...)
endif
" Match } }, }; ] ]: ], ]; )
if line =~ '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
if line =~# '^\s*\(}\(,\|;\)\?$\|]:\|],\|}]\|];\?$\|)\)'
let ind = indent(s:OpenBrace(v:lnum))
endif
" Don't actually shift over for } else {
if line =~ '^\s*}\s*els\(e\|if\).*{\s*$'
if line =~# '^\s*}\s*els\(e\|if\).*{\s*$'
let ind -= &sw
endif
" Don't indent resources that are one after another with a ->(ordering arrow)