Change plugin guard for disabling, fixes #371

after/ftplugin/cabal.vim

@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
 
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s
-
-endif

after/ftplugin/coffee.vim

@@ -1,9 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
+  finish
+endif
 
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
     \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
-
-endif

after/ftplugin/haskell.vim

@@ -1,6 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
+  finish
+endif
 
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
-
-endif

after/ftplugin/javascript.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 " Vim filetype plugin file
 " Language:     JavaScript
@@ -12,5 +14,3 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-
-endif

after/ftplugin/jsx.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
@@ -19,5 +21,3 @@ if exists("loaded_matchit")
 endif
 
 setlocal suffixesadd+=.jsx
-
-endif

after/ftplugin/puppet.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
 
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
@@ -16,5 +18,3 @@ if g:puppet_align_hashes && exists(':Tabularize')
         call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
     endfunction
 endif
-
-endif

after/ftplugin/terraform.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
 
 if !exists('g:terraform_align')
   let g:terraform_align = 0
@@ -81,5 +83,3 @@ if exists('g:terraform_commentstring')
 else
     setlocal commentstring=#%s
 endif
-
-endif

after/ftplugin/yaml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
 
 " Vim indent file
 " Language: Yaml
@@ -7,5 +9,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " URL: https://github.com/hjpbarcelos
 setlocal autoindent sw=2 ts=2 expandtab
 " vim:set sw=2:
-
-endif

after/indent/html.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -33,5 +35,3 @@ function! GetCoffeeHtmlIndent(curlinenum)
   " Otherwise use html indenting.
   exec 'return ' s:htmlIndentExpr
 endfunction
-
-endif

after/indent/jsx.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
@@ -114,5 +116,3 @@ fu! GetJsxIndent()
 
   return ind
 endfu
-
-endif

after/indent/objc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
 
 " Vim indent file
 " Language:	Objective-C
@@ -93,5 +95,3 @@ endfunction
 " Restore 'cpo' options
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif

after/syntax/c.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
+  finish
+endif
 
 " Vim syntax file
 " Language: C Additions
@@ -304,5 +306,3 @@ hi def link cBoolean Boolean
 "hi def link cDelimiter Delimiter
 " foldmethod=syntax fix, courtesy of Ivan Freitas
 "hi def link cBraces Delimiter
-
-endif

after/syntax/coffee.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
@@ -27,5 +29,3 @@ hi def link cjsxTagName         Function
 hi def link cjsxEntity          Statement
 hi def link cjsxEntityPunct     Type
 hi def link cjsxAttribProperty  Type
-
-endif

after/syntax/cpp.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
+  finish
+endif
 
 " Vim syntax file
 " Language: C++ Additions
@@ -2092,5 +2094,3 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppRawDelimiter    Delimiter
   delcommand HiLink
 endif
-
-endif

after/syntax/haml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Sven Felix Oberquelle <Svelix.Github@gmail.com>
@@ -23,5 +25,3 @@ if exists('s:current_syntax_save')
   let b:current_syntax = s:current_syntax_save
   unlet s:current_syntax_save
 endif
-
-endif

after/syntax/help.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
 
 " Extends standard help syntax with highlighting of Scala code.
 "
@@ -14,5 +16,3 @@ if has('conceal')
 else
   syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
 endif
-
-endif

after/syntax/html.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -20,9 +22,9 @@ if exists('s:current_syntax_save')
   let b:current_syntax = s:current_syntax_save
   unlet s:current_syntax_save
 endif
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
@@ -33,9 +35,9 @@ syn region ShaderScript
       \ keepend
       \ end="</script>"me=s-1
       \ contains=@GLSL,htmlScriptTag,@htmlPreproc
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim syntax file
 " Language:     HTML (version 5.1)
@@ -49,9 +51,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " https://github.com/w3c/html/issues/694
 syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
 syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
 
 if !exists("g:less_html_style_tags")
   let g:less_html_style_tags = 1
@@ -79,5 +81,3 @@ syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end
 if exists("s:pre_less_cur_syn")
    let b:current_syntax = s:pre_less_cur_syn
 endif
-
-endif

after/syntax/javascript/graphql.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
@@ -23,5 +25,3 @@ hi def link graphqlTemplateExpression jsTemplateExpression
 
 syn cluster jsExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif

after/syntax/jsx.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
@@ -65,5 +67,3 @@ syn cluster jsExpression add=jsxRegion
 
 " Allow jsxRegion to contain reserved words.
 syn cluster javascriptNoReserved add=jsxRegion
-
-endif

after/syntax/mma.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
+  finish
+endif
 
 "Vim conceal file
 " Language: Mathematica
@@ -103,5 +105,3 @@ endif
 
 hi! link Conceal Normal
 setlocal conceallevel=2
-
-endif

after/syntax/objc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
 
 " ARC type modifiers
 syn keyword objcTypeModifier __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak __unsafe_unretained
@@ -19,5 +21,3 @@ syn match objcDirective "@property\|@synthesize\|@dynamic\|@package"
 
 " Highlight property attributes as if they were type modifiers
 hi def link objcPropertyAttribute objcTypeModifier
-
-endif

after/syntax/rspec.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rspec') != -1
+  finish
+endif
 
 "
 " An rspec syntax file
@@ -32,5 +34,3 @@ syntax keyword rspecMessageExpectation advise any_args any_number_of_times anyth
 highlight link rspecMessageExpectation Function
 
 let b:current_syntax = 'rspec'
-
-endif

after/syntax/ruby.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yard') != -1
+  finish
+endif
 
 " Ruby syntax extensions for highlighting YARD documentation.
 "
@@ -126,5 +128,3 @@ hi def link yardParametricType yardComment
 hi def link yardArrow yardComment
 hi def link yardHashAngle yardComment
 hi def link yardHashCurly yardComment
-
-endif

after/syntax/rust.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 scriptencoding utf-8
 
@@ -41,5 +43,3 @@ if !get(g:, 'rust_conceal_mod_path', 0)
 endif
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

after/syntax/tex.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
 
 " adds support for cleverref package
 " \Cref, \cref, \cpageref, \labelcref, \labelcpageref
@@ -9,5 +11,3 @@ syn region texRefZone		matchgroup=texStatement start="\\\(label\|\)c\(page\|\)re
 syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>"
 syn match texInputFile  "\\lstinputlisting\s*\(\[.*\]\)\={.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texZone "\\lstinline\s*\(\[.*\]\)\={.\{-}}"
-
-endif

after/syntax/typescript/graphql.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
@@ -22,5 +24,3 @@ hi def link graphqlTemplateExpression typescriptTemplateSubstitution
 
 syn cluster typescriptExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif

after/syntax/yaml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
 
 " To make this file do stuff, add something like the following (without the
 " leading ") to your ~/.vimrc:
@@ -61,5 +63,3 @@ hi link yamlInline	Operator
 hi link yamlBlock	Operator
 hi link yamlString	String
 hi link yamlEscape	Special
-
-endif

autoload/LaTeXtoUnicode.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Support for LaTex-to-Unicode conversion as in the Julia REPL "
@@ -650,5 +652,3 @@ function! LaTeXtoUnicode#Toggle()
   endif
   return
 endfunction
-
-endif

autoload/RstFold.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
+  finish
+endif
 
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
@@ -62,5 +64,3 @@ function RstFold#GetRstFoldText()
   let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
   return indent . text
 endfunction
-
-endif

autoload/cargo.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 function! cargo#Load() 
     " Utility call to get this script loaded, for debugging
@@ -115,5 +117,3 @@ function! cargo#runtarget(args)
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/cargo/quickfix.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 function! cargo#quickfix#CmdPre() abort
     if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
@@ -26,5 +28,3 @@ function! cargo#quickfix#CmdPost() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/clojurecomplete.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
 
 " Vim completion script
 " Language:     Clojure
@@ -22,5 +24,3 @@ function! clojurecomplete#Complete(findstart, base)
 endfunction
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif

autoload/coffee.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -54,5 +56,3 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
-
-endif

autoload/crystal_lang.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -316,5 +318,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif

autoload/dart.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
 
 
 function! s:error(text) abort
@@ -170,5 +172,3 @@ function! dart#setModifiable() abort
     setlocal nomodifiable
   endif
 endfunction
-
-endif

autoload/elixir/indent.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if !exists("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
@@ -343,5 +345,3 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
-
-endif

autoload/elixir/util.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 function! elixir#util#get_filename(word) abort
   let word = a:word
@@ -24,5 +26,3 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
-
-endif

autoload/elm.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
 
 let s:errors = []
 
@@ -381,5 +383,3 @@ function! s:ExecuteInRoot(cmd) abort
 
 	return l:out
 endfunction
-
-endif

autoload/elm/util.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
 
 " IsWin returns 1 if current OS is Windows or 0 otherwise
 fun! elm#util#IsWin() abort
@@ -174,5 +176,3 @@ function! s:error(msg)
 	echohl NONE
 	let v:errmsg = a:msg
 endfunction
-
-endif

autoload/fish.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
 
 function! fish#Indent()
     let l:shiftwidth = shiftwidth()
@@ -67,5 +69,3 @@ endfunction
 function! fish#errorformat()
     return '%Afish: %m,%-G%*\\ ^,%-Z%f (line %l):%s'
 endfunction
-
-endif

autoload/go/config.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
 
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
@@ -458,5 +460,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif

autoload/htmlcomplete.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
 
 " Vim completion script
 " Language:     HTML and XHTML
@@ -841,5 +843,3 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
-
-endif

autoload/julia.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 function! julia#set_syntax_version(jvers)
   if &filetype != "julia"
@@ -184,5 +186,3 @@ function! julia#gotodefinition()
 endfunction
 
 endif
-
-endif

autoload/julia/doc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 " path to the julia binary to communicate with
 if has('win32') || has('win64')
@@ -242,5 +244,3 @@ function! s:likely(str) abort
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
-
-endif

autoload/julia_blocks.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
 " (AKA a collection of horrible hacks)
@@ -794,5 +796,3 @@ function! s:cursor_moved(...)
   let b:jlblk_did_select = b:jlblk_doing_select
   let b:jlblk_doing_select = 0
 endfunction
-
-endif

autoload/julia_latex_symbols.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
 " The symbols are based on Julia version 1.1.0-DEV.695
@@ -3329,5 +3331,3 @@ function! julia_latex_symbols#get_dict()
     \ '\:baggage_claim:': '🛄',
     \ '\:left_luggage:': '🛅'}
 endfunction
-
-endif

autoload/pony.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
 
 " Vim plugin file
 " Language:     Pony
@@ -532,5 +534,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif

autoload/python/utils.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
+  finish
+endif
 
 " Sometimes Python issues debugging messages
 " which don't belong to a call stack context
@@ -17,5 +19,3 @@ function! python#utils#fix_qflist() " {{{
     call setqflist(l:traceback)
   endif
 endfunction " }}}
-
-endif

autoload/racket.vim

@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'racket') != -1
+  finish
+endif
 
 if !exists("g:raco_command")
   let g:raco_command = system("which raco")
 endif
-
-endif

autoload/rubycomplete.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim completion script
 " Language:		Ruby
@@ -876,5 +878,3 @@ call s:DefRuby()
 "}}} ruby-side code
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
-
-endif

autoload/rust.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
@@ -546,5 +548,3 @@ endfunction
 " }}}1
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/rust/debugging.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
@@ -101,5 +103,3 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/rust/delimitmate.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
@@ -44,5 +46,3 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
-
-endif

autoload/rustfmt.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
@@ -248,5 +250,3 @@ endfunction
 
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/scss_indent.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
+  finish
+endif
 
 " usage:
 " set indentexpr=scss_indent#GetIndent(v:lnum)
@@ -37,5 +39,3 @@ fun! scss_indent#GetIndent(lnum)
     return 0
   endif
 endfun
-
-endif

autoload/vifm/edit.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
 
 " common functions for vifm command-line editing buffer filetype plugins
 " Maintainer:  xaizek <xaizek@posteo.net>
@@ -14,5 +16,3 @@ function! vifm#edit#Init()
     " Start buffer editing in insert mode
     startinsert
 endfunction
-
-endif

autoload/vifm/globals.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
 
 " common functions for vifm plugin related to globals
 " Maintainer:  xaizek <xaizek@posteo.net>
@@ -31,5 +33,3 @@ function! vifm#globals#Init()
         let g:vifm_embed_term = has('gui_running')
     endif
 endfunction
-
-endif

autoload/vital/_crystal.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 let s:_plugin_name = expand('<sfile>:t:r')
 
@@ -9,5 +11,3 @@ endfunction
 function! vital#{s:_plugin_name}#function(funcname) abort
   silent! return function(a:funcname)
 endfunction
-
-endif

autoload/vital/_crystal/ColorEcho.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -187,5 +189,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif

autoload/vital/_crystal/Data/List.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -464,5 +466,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/_crystal/Data/String.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -627,5 +629,3 @@ endfunction
 let &cpo = s:save_cpo
 unlet s:save_cpo
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/_crystal/Process.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -173,5 +175,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/_crystal/Web/JSON.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -178,5 +180,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/crystal.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 let s:plugin_name = expand('<sfile>:t:r')
 let s:vital_base_dir = expand('<sfile>:h')
@@ -328,5 +330,3 @@ else
     return a:list
   endfunction
 endif
-
-endif

autoload/vital/crystal.vital

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 crystal
 bee84ae23effb0510137ad177e98c94d8b3657a6
@@ -6,5 +8,3 @@ bee84ae23effb0510137ad177e98c94d8b3657a6
 Process
 Web.JSON
 ColorEcho
-
-endif

autoload/xml/aria.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
 
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
@@ -457,5 +459,3 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
-
-endif

autoload/xml/html5.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
 
 " Vim completion for HTML5 data file
 " Language:	    HTML (version 5.1 Draft 2016 Jan 13)
@@ -870,5 +872,3 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
-
-endif

compiler/cake.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -15,5 +17,3 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
-
-endif

compiler/cargo.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:         Cargo Compiler
@@ -49,5 +51,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

compiler/coffee.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -82,5 +84,3 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif

compiler/credo.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=%f:%l:\ %t:\ %m
 CompilerSet makeprg=mix\ credo\ suggest\ --format=flycheck
-
-endif

compiler/cryptol.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:         Cryptol version 1.8.19-academic Compiler
@@ -20,5 +22,3 @@ CompilerSet errorformat&     " use the default 'errorformat'
 
 " "%<" means the current file name without extension.
 CompilerSet makeprg=cryptol\ -o\ %<\ %
-
-endif

compiler/cucumber.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:	Cucumber
@@ -29,5 +31,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif

compiler/eruby.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		eRuby
@@ -39,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/eslint.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 " Vim compiler plugin
 " Language:     JavaScript
@@ -16,5 +18,3 @@ endif
 
 CompilerSet makeprg=eslint\ -f\ compact\ %
 CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
-
-endif

compiler/exunit.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if exists("current_compiler")
   finish
@@ -25,5 +27,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/fish.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -7,5 +9,3 @@ let current_compiler = 'fish'
 
 CompilerSet makeprg=fish\ --no-execute\ %
 execute 'CompilerSet errorformat='.escape(fish#errorformat(), ' ')
-
-endif

compiler/go.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
 
 " Copyright 2013 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -49,5 +51,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif

compiler/haml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:	Haml
@@ -28,5 +30,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif

compiler/ls.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
 
 " Language:    LiveScript
 " Maintainer:  George Zahariev
@@ -74,5 +76,3 @@ augroup LiveScriptUpdateMakePrg
     autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif

compiler/mix.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=%A%t%*[^:]:\ %m,%C%f:%l:\ %m,%C%f:%l,%Z
 CompilerSet makeprg=mix
-
-endif

compiler/nim.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
+  finish
+endif
 
 if exists("current_compiler")
   finish
@@ -25,5 +27,3 @@ unlet s:cpo_save
 
 let g:syntastic_nim_checkers = ['nim']
 
-
-endif

compiler/nix-build.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=error:\ %m\ at\ %f:%l:%c,builder\ for\ \'%m\'\ failed\ with\ exit\ code\ %n,fixed-output\ derivation\ produced\ path\ \'%s\'\ with\ %m
 CompilerSet makeprg=nix-build
-
-endif

compiler/python.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:	Unit testing tool for Python
@@ -67,5 +69,3 @@ else
 endif
 
 " vim:foldmethod=marker:foldlevel=0
-
-endif

compiler/rake.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		Rake
@@ -39,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/rspec.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		RSpec
@@ -35,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/ruby.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		Ruby
@@ -44,5 +46,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/rubyunit.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
@@ -35,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/rustc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:         Rust Compiler
@@ -53,5 +55,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

compiler/sbt.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
@@ -30,5 +32,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif

compiler/typescript.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
+  finish
+endif
 
 if exists("current_compiler")
   finish
@@ -30,5 +32,3 @@ CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif

extras/flow.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
@@ -109,5 +111,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowObjectFuncName     jsObjectFuncName
   delcommand HiLink
 endif
-
-endif

extras/jsdoc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 "" syntax coloring for javadoc comments (HTML)
 syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
@@ -39,5 +41,3 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsDocParam             Label
   delcommand HiLink
 endif
-
-endif

extras/ngdoc.vim

@@ -1,7 +1,7 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
 syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
 syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
-
-endif

ftplugin/Dockerfile.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dockerfile') != -1
+  finish
+endif
 
 function! DockerfileReplaceInstruction(original, replacement)
     let syn = synIDtrans(synID(line("."), col(".") - 1, 0))
@@ -27,5 +29,3 @@ inoreabbr <silent> <buffer> workdir <C-R>=DockerfileReplaceInstruction("workdir"
 inoreabbr <silent> <buffer> arg <C-R>=DockerfileReplaceInstruction("arg", "ARG")<CR>
 inoreabbr <silent> <buffer> onbuild <C-R>=DockerfileReplaceInstruction("onbuild", "ONBUILD")<CR>
 inoreabbr <silent> <buffer> stopsignal <C-R>=DockerfileReplaceInstruction("stopsignal", "STOPSIGNAL")<CR>
-
-endif

ftplugin/ansible.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
 
 " Slow yaml highlighting workaround
 if exists('+regexpengine') && ('&regexpengine' == 0)
@@ -6,5 +8,3 @@ if exists('+regexpengine') && ('&regexpengine' == 0)
 endif
 set isfname+=@-@
 set path+=./../templates,./../files,templates,files
-
-endif

ftplugin/ansible_hosts.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ansible') != -1
+  finish
+endif
 
 if exists("b:did_ftplugin")
   finish
@@ -9,5 +11,3 @@ endif
 setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions-=c
 
 let b:undo_ftplugin = "setl comments< commentstring< formatoptions<"
-
-endif

ftplugin/blade.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'blade') != -1
+  finish
+endif
 
 " Vim filetype plugin
 " Language:     Blade (Laravel)
@@ -33,5 +35,3 @@ if exists('loaded_matchit') && exists('b:match_words')
     let b:match_skip = 'synIDattr(synID(line("."), col("."), 0), "name") !=# "bladeKeyword"'
     let b:match_ignorecase = 0
 endif
-
-endif

ftplugin/caddyfile.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'caddyfile') != -1
+  finish
+endif
 
 " Language:	    Caddyfile
 " Author:	    Josh Glendenning <josh@isobit.io>
@@ -24,5 +26,3 @@ else
 	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
 endif
 unlet s:delimiters
-
-endif

ftplugin/clojure.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
 
 " Vim filetype plugin file
 " Language:     Clojure
@@ -95,5 +97,3 @@ let &cpo = s:cpo_save
 unlet! s:cpo_save s:setting s:dir
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif