Improve guard to support concatenated files

28 files changed, 56 insertions, 112 deletions

diff --git a/compiler/cake.vim b/compiler/cake.vim
index 159bd59e..c5ca4b6a 100644
--- a/compiler/cake.vim
+++ b/compiler/cake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -17,3 +14,4 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
+endif
diff --git a/compiler/cargo.vim b/compiler/cargo.vim
index f616067b..25a4dcdb 100644
--- a/compiler/cargo.vim
+++ b/compiler/cargo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim compiler file
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <damienradtke@gmail.com>
@@ -51,3 +48,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/compiler/coffee.vim b/compiler/coffee.vim
index d68bf74d..46a248e1 100644
--- a/compiler/coffee.vim
+++ b/compiler/coffee.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script
@@ -84,3 +81,4 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
+endif
diff --git a/compiler/credo.vim b/compiler/credo.vim
index 100abb4e..5fdc99ab 100644
--- a/compiler/credo.vim
+++ b/compiler/credo.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists('current_compiler')
     finish
 endif
@@ -13,3 +10,4 @@ endif
 
 CompilerSet errorformat=%f:%l:%c:\ %t:\ %m,%f:%l:\ %t:\ %m
 CompilerSet makeprg=mix\ credo\ suggest\ --format=flycheck
+endif
diff --git a/compiler/cryptol.vim b/compiler/cryptol.vim
index 2fe14ff4..9e4779c6 100644
--- a/compiler/cryptol.vim
+++ b/compiler/cryptol.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
 " Vim compiler file
 " Compiler:         Cryptol version 1.8.19-academic Compiler
 " Maintainer:       Edward O'Callaghan <victoredwardocallaghan AT gmail DOT com>
@@ -22,3 +19,4 @@ CompilerSet errorformat&     " use the default 'errorformat'
 
 " "%<" means the current file name without extension.
 CompilerSet makeprg=cryptol\ -o\ %<\ %
+endif
diff --git a/compiler/cucumber.vim b/compiler/cucumber.vim
index 54e34848..c9223cba 100644
--- a/compiler/cucumber.vim
+++ b/compiler/cucumber.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
 " Vim compiler file
 " Compiler:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -31,3 +28,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+endif
diff --git a/compiler/eruby.vim b/compiler/eruby.vim
index 04c0ffdc..5045c882 100644
--- a/compiler/eruby.vim
+++ b/compiler/eruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		eRuby
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -41,3 +38,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/eslint.vim b/compiler/eslint.vim
index 0aeb3a4c..1a10be93 100644
--- a/compiler/eslint.vim
+++ b/compiler/eslint.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
 " Vim compiler plugin
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -18,3 +15,4 @@ endif
 
 CompilerSet makeprg=eslint\ -f\ compact\ %
 CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
+endif
diff --git a/compiler/exunit.vim b/compiler/exunit.vim
index 207ab5da..e459603b 100644
--- a/compiler/exunit.vim
+++ b/compiler/exunit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists("current_compiler")
   finish
 endif
@@ -27,3 +24,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/fish.vim b/compiler/fish.vim
index 827ef3b4..9daba2e3 100644
--- a/compiler/fish.vim
+++ b/compiler/fish.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
 if exists('current_compiler')
     finish
 endif
@@ -9,3 +6,4 @@ let current_compiler = 'fish'
 
 CompilerSet makeprg=fish\ --no-execute\ %
 execute 'CompilerSet errorformat='.escape(fish#errorformat(), ' ')
+endif
diff --git a/compiler/go.vim b/compiler/go.vim
index 9564df22..e5d1e061 100644
--- a/compiler/go.vim
+++ b/compiler/go.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 " Copyright 2013 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
 " license that can be found in the LICENSE file.
@@ -51,3 +48,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
+endif
diff --git a/compiler/gradle.vim b/compiler/gradle.vim
index 4d867c8a..6b1d83d2 100644
--- a/compiler/gradle.vim
+++ b/compiler/gradle.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gradle') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 " Vim Compiler File
 " Compiler: gradle
 
@@ -26,3 +23,4 @@ CompilerSet errorformat=
     \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%-G%.%#
+endif
diff --git a/compiler/gradlew.vim b/compiler/gradlew.vim
index aeb73eaa..6715b44d 100644
--- a/compiler/gradlew.vim
+++ b/compiler/gradlew.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gradle') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gradle') == -1
 " Vim Compiler File
 " Compiler: gradlew
 
@@ -26,3 +23,4 @@ CompilerSet errorformat=
     \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
     \%-G%.%#
+endif
diff --git a/compiler/haml.vim b/compiler/haml.vim
index 084ca48a..cb0127e2 100644
--- a/compiler/haml.vim
+++ b/compiler/haml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
 " Vim compiler file
 " Compiler:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
@@ -30,3 +27,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
+endif
diff --git a/compiler/lilypond.vim b/compiler/lilypond.vim
index 6d398030..80cdcf5e 100644
--- a/compiler/lilypond.vim
+++ b/compiler/lilypond.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'lilypond') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'lilypond') == -1
 " LilyPond compiler file
 " Language:     LilyPond
 " Maintainer:   Heikki Junes <hjunes@cc.hut.fi>
@@ -21,3 +18,4 @@ setlocal makeprg=lilypond\ $*
 " (how to see multiple-line error messages?)
 setlocal errorformat=%f:%l:%c:\ %m,%f:%l:\ %m,In\ file\ included\ from\ %f:%l:,\^I\^Ifrom\ %f:%l%m
 "
+endif
diff --git a/compiler/ls.vim b/compiler/ls.vim
index b8bc8a6b..581cf2b9 100644
--- a/compiler/ls.vim
+++ b/compiler/ls.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
 " Language:    LiveScript
 " Maintainer:  George Zahariev
 " URL:         http://github.com/gkz/vim-ls
@@ -76,3 +73,4 @@ augroup LiveScriptUpdateMakePrg
     autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
   endif
 augroup END
+endif
diff --git a/compiler/mix.vim b/compiler/mix.vim
index 17762815..a771ed15 100644
--- a/compiler/mix.vim
+++ b/compiler/mix.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
 if exists('current_compiler')
     finish
 endif
@@ -18,3 +15,4 @@ CompilerSet errorformat=
             \%E==\ Compilation\ error\ in\ file\ %f\ ==,
             \%C**\ (%\\w%\\+)\ %f:%l:\ %m,%Z
 
+endif
diff --git a/compiler/nim.vim b/compiler/nim.vim
index 51021694..637bd4a9 100644
--- a/compiler/nim.vim
+++ b/compiler/nim.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
 if exists("current_compiler")
   finish
 endif
@@ -27,3 +24,4 @@ unlet s:cpo_save
 
 let g:syntastic_nim_checkers = ['nim']
 
+endif
diff --git a/compiler/nix-build.vim b/compiler/nix-build.vim
index 7544ba1a..8298e2c9 100644
--- a/compiler/nix-build.vim
+++ b/compiler/nix-build.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
 if exists('current_compiler')
     finish
 endif
@@ -13,3 +10,4 @@ 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
diff --git a/compiler/ocaml.vim b/compiler/ocaml.vim
index 25ea01a3..b6de8420 100644
--- a/compiler/ocaml.vim
+++ b/compiler/ocaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ocaml') == -1
 " Vim Compiler File
 " Compiler:    ocaml
 " Maintainer:  Markus Mottl <markus.mottl@gmail.com>
@@ -57,3 +54,4 @@ CompilerSet errorformat =
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
+endif
diff --git a/compiler/python.vim b/compiler/python.vim
index cd68c684..63930793 100644
--- a/compiler/python.vim
+++ b/compiler/python.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
 " Vim compiler file
 " Compiler:	Unit testing tool for Python
 " Maintainer:	Ali Aliev <ali@aliev.me>
@@ -69,3 +66,4 @@ else
 endif
 
 " vim:foldmethod=marker:foldlevel=0
+endif
diff --git a/compiler/rake.vim b/compiler/rake.vim
index 2d9d703f..28a0e7d1 100644
--- a/compiler/rake.vim
+++ b/compiler/rake.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		Rake
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -41,3 +38,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/rspec.vim b/compiler/rspec.vim
index f7102fda..8c9c020f 100644
--- a/compiler/rspec.vim
+++ b/compiler/rspec.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		RSpec
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
@@ -37,3 +34,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/ruby.vim b/compiler/ruby.vim
index ab537481..ef88462d 100644
--- a/compiler/ruby.vim
+++ b/compiler/ruby.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		Ruby
 " Function:		Syntax check and/or error reporting
@@ -46,3 +43,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/rubyunit.vim b/compiler/rubyunit.vim
index b99c73bf..884d05ac 100644
--- a/compiler/rubyunit.vim
+++ b/compiler/rubyunit.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
@@ -37,3 +34,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
+endif
diff --git a/compiler/rustc.vim b/compiler/rustc.vim
index 876dab5a..cb14dccf 100644
--- a/compiler/rustc.vim
+++ b/compiler/rustc.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Vim compiler file
 " Compiler:         Rust Compiler
 " Maintainer:       Chris Morgan <me@chrismorgan.info>
@@ -59,3 +56,4 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
+endif
diff --git a/compiler/sbt.vim b/compiler/sbt.vim
index e5aa4d14..6125bf29 100644
--- a/compiler/sbt.vim
+++ b/compiler/sbt.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
 " Maintainer:           Derek Wyatt
@@ -32,3 +29,4 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
+endif
diff --git a/compiler/typescript.vim b/compiler/typescript.vim
index 48c60ab3..6e60b8c6 100644
--- a/compiler/typescript.vim
+++ b/compiler/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'typescript') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
 if exists('current_compiler')
   finish
 endif
@@ -23,3 +20,4 @@ endif
 let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $* %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
+endif