9 files changed, 21 insertions, 45 deletions
diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 3c66372a..8e485bbd 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,7 +1,5 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s
+endif
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index 2060d276..2e3f7170 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,9 +1,7 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
     \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
+endif
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 2d3d6b33..0255bdd7 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,6 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haskell') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
+endif
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index ce46b796..c006b7ab 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,5 +1,3 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
 setlocal iskeyword+='
+endif
diff --git a/after/ftplugin/javascript.vim b/after/ftplugin/javascript.vim
index 463b854a..2ca2fd1c 100644
--- a/after/ftplugin/javascript.vim
+++ b/after/ftplugin/javascript.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 filetype plugin file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -14,10 +11,8 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
 "
@@ -49,10 +44,8 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.jsx
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
 " Vim filetype plugin file
 " Language:   styled-components (js/ts)
 " Maintainer: Karl Fleischmann <fleischmann.karl@gmail.com>
@@ -90,3 +83,4 @@ if exists('&ofu')
   endif
   setl omnifunc=styledcomplete#CompleteSC
 endif
+endif
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 70f196c8..ece9019f 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'llvm') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
 " Copyright (c) 2018 rhysd
 "
 " Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -475,3 +472,4 @@ endfunction
 if !exists(':LLI')
     command! -buffer -nargs=? -bar -complete=file LLI call <SID>run_lli(<f-args>)
 endif
+endif
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 934e4b03..f78ebb80 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.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('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
 endif
@@ -9,3 +6,4 @@ endif
 if g:puppet_align_hashes
     inoremap <buffer> <silent> => =><Esc>:call puppet#align#AlignHashrockets()<CR>$a
 endif
+endif
diff --git a/after/ftplugin/typescript.vim b/after/ftplugin/typescript.vim
index d307f5d4..4f158684 100644
--- a/after/ftplugin/typescript.vim
+++ b/after/ftplugin/typescript.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && (index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
 " modified from html.vim
 " For matchit plugin
 if exists("loaded_matchit")
@@ -25,7 +22,6 @@ augroup jsx_comment
 augroup end
 
 setlocal suffixesadd+=.tsx
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'styled-components') != -1
-  finish
 endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'styled-components') == -1
+endif
diff --git a/after/ftplugin/yaml.vim b/after/ftplugin/yaml.vim
index a6b6d194..1b631079 100644
--- a/after/ftplugin/yaml.vim
+++ b/after/ftplugin/yaml.vim
@@ -1,7 +1,4 @@
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
-  finish
-endif
-
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " Vim indent file
 " Language: Yaml
 " Author: Henrique Barcelos
@@ -9,3 +6,4 @@ endif
 " URL: https://github.com/hjpbarcelos
 setlocal autoindent sw=2 ts=2 expandtab
 " vim:set sw=2:
+endif