Preserve loading order of plugins, fixes #608

57 files changed, 57 insertions, 57 deletions

diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 461f6a24..80757d8e 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index a039dd95..f6a750f6 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 96ea4d04..03446e8b 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('haskell', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'haskell')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 6b0b48a2..ab2a8f2b 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 4b38f4ce..1b973639 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index b7f25573..55a57ff2 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 8480c6e7..4ffa2117 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index f56dd82a..5a311439 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index be2ea1fc..a757cdd7 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index f6f07131..02451a80 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 192bf2f5..84402199 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 8cbc9972..64b1699b 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('puppet', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'puppet')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 2b35ec46..8c687fa6 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 07de9bb7..75f2e3bb 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/html.vim b/after/indent/html.vim
index 065106ca..f33b27a1 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index f56dd82a..5a311439 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 24d29703..3177c0cb 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index be2ea1fc..a757cdd7 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index 394f20b7..1ba02c46 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index ee644861..13d4d32d 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index 544568a7..f29ccbaf 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 8f0172c1..1294bc59 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 07de9bb7..75f2e3bb 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index d0478e01..10497670 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cpp-modern', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cpp-modern')
   finish
 endif
 
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index 9b9f38a3..debd9aa9 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cjsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cjsx')
   finish
 endif
 
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index b59b9859..517404f0 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('cpp-modern', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'cpp-modern')
   finish
 endif
 
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index e109b2d7..61d828d2 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('dhall', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'dhall')
   finish
 endif
 
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index a43546cf..0ee4a9ca 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('scala', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'scala')
   finish
 endif
 
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 8bdc0b0f..56ba064c 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/aria.vim b/after/syntax/html/aria.vim
index 9e457bff..ed5a8383 100644
--- a/after/syntax/html/aria.vim
+++ b/after/syntax/html/aria.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/electron.vim b/after/syntax/html/electron.vim
index 636e810d..d7bfa90f 100644
--- a/after/syntax/html/electron.vim
+++ b/after/syntax/html/electron.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
index ec7d714b..529c2fcd 100644
--- a/after/syntax/html/rdfa.vim
+++ b/after/syntax/html/rdfa.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index 01f5000e..18a31e8a 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris')
   finish
 endif
 
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
index 279e5875..6371b937 100644
--- a/after/syntax/idris2.vim
+++ b/after/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('idris2', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'idris2')
   finish
 endif
 
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index f56dd82a..5a311439 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index c0c73742..6044d6ae 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index eaeaccb5..683202d1 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('html5', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'html5')
   finish
 endif
 
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 58e23b56..f4feb758 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('javascript-sql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'javascript-sql')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index be2ea1fc..a757cdd7 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact/graphql.vim b/after/syntax/javascriptreact/graphql.vim
index 52628a1a..308c17d7 100644
--- a/after/syntax/javascriptreact/graphql.vim
+++ b/after/syntax/javascriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index 0a7a7e1e..c8b8aa5d 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index f05969c5..a6cb8a90 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index 6f3daebf..e38d5041 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('llvm', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'llvm')
   finish
 endif
 
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 6fd7b963..26ebf198 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mdx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mdx')
   finish
 endif
 
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index 24d99755..2509d210 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('mathematica', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'mathematica')
   finish
 endif
 
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index 0541758d..78e41fd1 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('objc', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'objc')
   finish
 endif
 
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index f608bde1..0df633cb 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('reason', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'reason')
   finish
 endif
 
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 00fe9b5d..2a54c402 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 99905ddd..355fe524 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rspec', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rspec')
   finish
 endif
 
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index e57c1d70..dea6003a 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('yard', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'yard')
   finish
 endif
 
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index bf17e031..638c6dd8 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'rust')
   finish
 endif
 
diff --git a/after/syntax/tsx.vim b/after/syntax/tsx.vim
index d400f410..f3b43635 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/tsx.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index 40425b89..cccdbc3e 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim
index 07de9bb7..75f2e3bb 100644
--- a/after/syntax/typescriptreact.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('jsx', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'jsx')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact/graphql.vim b/after/syntax/typescriptreact/graphql.vim
index f9e7151f..aa60a3aa 100644
--- a/after/syntax/typescriptreact/graphql.vim
+++ b/after/syntax/typescriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/vue/graphql.vim b/after/syntax/vue/graphql.vim
index 52628a1a..308c17d7 100644
--- a/after/syntax/vue/graphql.vim
+++ b/after/syntax/vue/graphql.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('graphql', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'graphql')
   finish
 endif
 
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index 5e9ff75c..fc63d3c5 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if !polyglot#util#IsEnabled('zinit', expand('<sfile>:p'))
+if !has_key(g:polyglot_is_disabled, 'zinit')
   finish
 endif