From 48e07bc5014fecfdff24f75124a65634c216c9e2 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Fri, 6 Sep 2019 15:54:31 +0200 Subject: Improve guard to support concatenated files --- autoload/puppet/align.vim | 6 ++---- autoload/puppet/ctags.vim | 6 ++---- autoload/puppet/format.vim | 6 ++---- 3 files changed, 6 insertions(+), 12 deletions(-) (limited to 'autoload/puppet') diff --git a/autoload/puppet/align.vim b/autoload/puppet/align.vim index 54a57599..c45bc90f 100644 --- a/autoload/puppet/align.vim +++ b/autoload/puppet/align.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1 function! puppet#align#IndentLevel(lnum) return indent(a:lnum) / &shiftwidth endfunction @@ -70,3 +67,4 @@ function! puppet#align#AlignHashrockets(...) abort endif endfor endfunction +endif diff --git a/autoload/puppet/ctags.vim b/autoload/puppet/ctags.vim index 5547f42e..469b1213 100644 --- a/autoload/puppet/ctags.vim +++ b/autoload/puppet/ctags.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1 if !exists('s:ctags_type') let s:ctags_type = 0 @@ -38,3 +35,4 @@ function! puppet#ctags#Type() return s:ctags_type endfunction +endif diff --git a/autoload/puppet/format.vim b/autoload/puppet/format.vim index f60bd782..c608f228 100644 --- a/autoload/puppet/format.vim +++ b/autoload/puppet/format.vim @@ -1,7 +1,4 @@ -if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1 - finish -endif - +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1 " " Simple format using puppet's l:indents and align hashrockets function function! puppet#format#Format() abort @@ -59,3 +56,4 @@ function! puppet#format#Fallback(start_lnum, end_lnum) abort endfunction +endif -- cgit v1.2.3