Fix loading for vim 8 packages, closes #613

63 files changed, 63 insertions, 63 deletions

diff --git a/after/compiler/tex.vim b/after/compiler/tex.vim
index bfe5b2a5..d6038c2b 100644
--- a/after/compiler/tex.vim
+++ b/after/compiler/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/compiler/tex.vim')
   finish
 endif
 
diff --git a/after/ftplugin/cabal.vim b/after/ftplugin/cabal.vim
index 387e655b..c81fedb6 100644
--- a/after/ftplugin/cabal.vim
+++ b/after/ftplugin/cabal.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'after/ftplugin/cabal.vim')
   finish
 endif
 
diff --git a/after/ftplugin/coffee.vim b/after/ftplugin/coffee.vim
index b01a8a08..528fbeaa 100644
--- a/after/ftplugin/coffee.vim
+++ b/after/ftplugin/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cjsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cjsx', 'after/ftplugin/coffee.vim')
   finish
 endif
 
diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim
index 75117f1b..21cf2690 100644
--- a/after/ftplugin/haskell.vim
+++ b/after/ftplugin/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'haskell')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'haskell', 'after/ftplugin/haskell.vim')
   finish
 endif
 
diff --git a/after/ftplugin/html.vim b/after/ftplugin/html.vim
index 6cbec0ad..5a6b963e 100644
--- a/after/ftplugin/html.vim
+++ b/after/ftplugin/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/ftplugin/html.vim')
   finish
 endif
 
diff --git a/after/ftplugin/idris.vim b/after/ftplugin/idris.vim
index 3fa7a746..f10e518c 100644
--- a/after/ftplugin/idris.vim
+++ b/after/ftplugin/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'after/ftplugin/idris.vim')
   finish
 endif
 
diff --git a/after/ftplugin/idris2.vim b/after/ftplugin/idris2.vim
index 2572f2af..466101e7 100644
--- a/after/ftplugin/idris2.vim
+++ b/after/ftplugin/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'after/ftplugin/idris2.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-1.vim b/after/ftplugin/javascript-1.vim
index 58e2e1f6..5d6f0d0c 100644
--- a/after/ftplugin/javascript-1.vim
+++ b/after/ftplugin/javascript-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript', 'after/ftplugin/javascript.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascript-2.vim b/after/ftplugin/javascript-2.vim
index 67a63055..9abbda2f 100644
--- a/after/ftplugin/javascript-2.vim
+++ b/after/ftplugin/javascript-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/javascript-2.vim')
   finish
 endif
 
diff --git a/after/ftplugin/javascriptreact.vim b/after/ftplugin/javascriptreact.vim
index ceacc887..494e6d6e 100644
--- a/after/ftplugin/javascriptreact.vim
+++ b/after/ftplugin/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/ftplugin/jsx.vim b/after/ftplugin/jsx.vim
index 54ebd29f..e1af589f 100644
--- a/after/ftplugin/jsx.vim
+++ b/after/ftplugin/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/jsx.vim')
   finish
 endif
 
diff --git a/after/ftplugin/llvm.vim b/after/ftplugin/llvm.vim
index 19835810..bb1ee63e 100644
--- a/after/ftplugin/llvm.vim
+++ b/after/ftplugin/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'after/ftplugin/llvm.vim')
   finish
 endif
 
diff --git a/after/ftplugin/puppet.vim b/after/ftplugin/puppet.vim
index 2e3f9c7d..e530bff4 100644
--- a/after/ftplugin/puppet.vim
+++ b/after/ftplugin/puppet.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'puppet')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'puppet', 'after/ftplugin/puppet.vim')
   finish
 endif
 
diff --git a/after/ftplugin/tex.vim b/after/ftplugin/tex.vim
index 0fcb47a8..e2898321 100644
--- a/after/ftplugin/tex.vim
+++ b/after/ftplugin/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/ftplugin/tex.vim')
   finish
 endif
 
diff --git a/after/ftplugin/tsx.vim b/after/ftplugin/tsx.vim
index 3d4226d1..d8d93c8a 100644
--- a/after/ftplugin/tsx.vim
+++ b/after/ftplugin/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/tsx.vim')
   finish
 endif
 
diff --git a/after/ftplugin/typescriptreact.vim b/after/ftplugin/typescriptreact.vim
index 3c3b2666..ec114d96 100644
--- a/after/ftplugin/typescriptreact.vim
+++ b/after/ftplugin/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/ftplugin/typescriptreact.vim')
   finish
 endif
 
diff --git a/after/indent/html.vim b/after/indent/html.vim
index ea76ee09..67728aac 100644
--- a/after/indent/html.vim
+++ b/after/indent/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/indent/html.vim')
   finish
 endif
 
diff --git a/after/indent/javascript-1.vim b/after/indent/javascript-1.vim
index 67a63055..ca9e143f 100644
--- a/after/indent/javascript-1.vim
+++ b/after/indent/javascript-1.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/javascript.vim')
   finish
 endif
 
diff --git a/after/indent/javascript-2.vim b/after/indent/javascript-2.vim
index 3a9fe380..ad32e284 100644
--- a/after/indent/javascript-2.vim
+++ b/after/indent/javascript-2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/javascript-2.vim')
   finish
 endif
 
diff --git a/after/indent/javascriptreact.vim b/after/indent/javascriptreact.vim
index ceacc887..994c195b 100644
--- a/after/indent/javascriptreact.vim
+++ b/after/indent/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/indent/jsx.vim b/after/indent/jsx.vim
index afee5bf0..24c4a096 100644
--- a/after/indent/jsx.vim
+++ b/after/indent/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/jsx.vim')
   finish
 endif
 
diff --git a/after/indent/objc.vim b/after/indent/objc.vim
index e9cc20e8..c84f43b3 100644
--- a/after/indent/objc.vim
+++ b/after/indent/objc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'objc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'objc', 'after/indent/objc.vim')
   finish
 endif
 
diff --git a/after/indent/php.vim b/after/indent/php.vim
index f64a7c6c..65534a8c 100644
--- a/after/indent/php.vim
+++ b/after/indent/php.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/php.vim')
   finish
 endif
 
diff --git a/after/indent/tex.vim b/after/indent/tex.vim
index 4cd17b84..cbb4f01b 100644
--- a/after/indent/tex.vim
+++ b/after/indent/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/indent/tex.vim')
   finish
 endif
 
diff --git a/after/indent/tsx.vim b/after/indent/tsx.vim
index 18254bfc..4ff59991 100644
--- a/after/indent/tsx.vim
+++ b/after/indent/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/tsx.vim')
   finish
 endif
 
diff --git a/after/indent/typescript.vim b/after/indent/typescript.vim
index 6d27bc70..ba107504 100644
--- a/after/indent/typescript.vim
+++ b/after/indent/typescript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/indent/typescript.vim')
   finish
 endif
 
diff --git a/after/indent/typescriptreact.vim b/after/indent/typescriptreact.vim
index 3c3b2666..4a530b9d 100644
--- a/after/indent/typescriptreact.vim
+++ b/after/indent/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/indent/typescriptreact.vim')
   finish
 endif
 
diff --git a/after/syntax/c.vim b/after/syntax/c.vim
index a8f7f416..a5daa792 100644
--- a/after/syntax/c.vim
+++ b/after/syntax/c.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cpp-modern')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cpp-modern', 'after/syntax/c.vim')
   finish
 endif
 
diff --git a/after/syntax/coffee.vim b/after/syntax/coffee.vim
index a3e5d8fa..df65b1d9 100644
--- a/after/syntax/coffee.vim
+++ b/after/syntax/coffee.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cjsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cjsx', 'after/syntax/coffee.vim')
   finish
 endif
 
diff --git a/after/syntax/cpp.vim b/after/syntax/cpp.vim
index 1143e439..27e6abdb 100644
--- a/after/syntax/cpp.vim
+++ b/after/syntax/cpp.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'cpp-modern')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'cpp-modern', 'after/syntax/cpp.vim')
   finish
 endif
 
diff --git a/after/syntax/haskell.vim b/after/syntax/haskell.vim
index 61886369..9820e792 100644
--- a/after/syntax/haskell.vim
+++ b/after/syntax/haskell.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'dhall')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'dhall', 'after/syntax/haskell.vim')
   finish
 endif
 
diff --git a/after/syntax/help.vim b/after/syntax/help.vim
index 007c21f3..b19c8d0d 100644
--- a/after/syntax/help.vim
+++ b/after/syntax/help.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'scala')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'scala', 'after/syntax/help.vim')
   finish
 endif
 
diff --git a/after/syntax/html.vim b/after/syntax/html.vim
index 9dec611e..44d8f793 100644
--- a/after/syntax/html.vim
+++ b/after/syntax/html.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html.vim')
   finish
 endif
 
diff --git a/after/syntax/html/aria.vim b/after/syntax/html/aria.vim
index b589cc5e..6444f63f 100644
--- a/after/syntax/html/aria.vim
+++ b/after/syntax/html/aria.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/aria.vim')
   finish
 endif
 
diff --git a/after/syntax/html/electron.vim b/after/syntax/html/electron.vim
index 35aa1a1e..7ad41cfc 100644
--- a/after/syntax/html/electron.vim
+++ b/after/syntax/html/electron.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/electron.vim')
   finish
 endif
 
diff --git a/after/syntax/html/rdfa.vim b/after/syntax/html/rdfa.vim
index 5554f12b..6138f637 100644
--- a/after/syntax/html/rdfa.vim
+++ b/after/syntax/html/rdfa.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/html/rdfa.vim')
   finish
 endif
 
diff --git a/after/syntax/idris.vim b/after/syntax/idris.vim
index 51aa6422..66fc91d1 100644
--- a/after/syntax/idris.vim
+++ b/after/syntax/idris.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris', 'after/syntax/idris.vim')
   finish
 endif
 
diff --git a/after/syntax/idris2.vim b/after/syntax/idris2.vim
index 6aaecf4d..fedcd8c1 100644
--- a/after/syntax/idris2.vim
+++ b/after/syntax/idris2.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'idris2')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'idris2', 'after/syntax/idris2.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript.vim b/after/syntax/javascript.vim
index 67a63055..469a906e 100644
--- a/after/syntax/javascript.vim
+++ b/after/syntax/javascript.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/javascript.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/graphql.vim b/after/syntax/javascript/graphql.vim
index dafba802..d13ae9fb 100644
--- a/after/syntax/javascript/graphql.vim
+++ b/after/syntax/javascript/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/javascript/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/html5.vim b/after/syntax/javascript/html5.vim
index b605aed5..117b4fed 100644
--- a/after/syntax/javascript/html5.vim
+++ b/after/syntax/javascript/html5.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'html5')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'html5', 'after/syntax/javascript/html5.vim')
   finish
 endif
 
diff --git a/after/syntax/javascript/sql.vim b/after/syntax/javascript/sql.vim
index 52b94d70..6ee30026 100644
--- a/after/syntax/javascript/sql.vim
+++ b/after/syntax/javascript/sql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'javascript-sql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'javascript-sql', 'after/syntax/javascript/sql.vim')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact.vim b/after/syntax/javascriptreact.vim
index ceacc887..a5c77225 100644
--- a/after/syntax/javascriptreact.vim
+++ b/after/syntax/javascriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/javascriptreact.vim')
   finish
 endif
 
diff --git a/after/syntax/javascriptreact/graphql.vim b/after/syntax/javascriptreact/graphql.vim
index 6842f74c..2e1291a8 100644
--- a/after/syntax/javascriptreact/graphql.vim
+++ b/after/syntax/javascriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/javascriptreact/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/jsx.vim b/after/syntax/jsx.vim
index 8ca6c767..c5a1917c 100644
--- a/after/syntax/jsx.vim
+++ b/after/syntax/jsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/jsx.vim')
   finish
 endif
 
diff --git a/after/syntax/jsx_pretty.vim b/after/syntax/jsx_pretty.vim
index 714cfb5b..115924c4 100644
--- a/after/syntax/jsx_pretty.vim
+++ b/after/syntax/jsx_pretty.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/jsx_pretty.vim')
   finish
 endif
 
diff --git a/after/syntax/llvm.vim b/after/syntax/llvm.vim
index 024928b8..2154a635 100644
--- a/after/syntax/llvm.vim
+++ b/after/syntax/llvm.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'llvm')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'llvm', 'after/syntax/llvm.vim')
   finish
 endif
 
diff --git a/after/syntax/mdx.vim b/after/syntax/mdx.vim
index 8d734bb2..38722924 100644
--- a/after/syntax/mdx.vim
+++ b/after/syntax/mdx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mdx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mdx', 'after/syntax/mdx.vim')
   finish
 endif
 
diff --git a/after/syntax/mma.vim b/after/syntax/mma.vim
index 67611337..bd8a0213 100644
--- a/after/syntax/mma.vim
+++ b/after/syntax/mma.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'mathematica')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'mathematica', 'after/syntax/mma.vim')
   finish
 endif
 
diff --git a/after/syntax/objc.vim b/after/syntax/objc.vim
index a9805eed..d0b48090 100644
--- a/after/syntax/objc.vim
+++ b/after/syntax/objc.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'objc')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'objc', 'after/syntax/objc.vim')
   finish
 endif
 
diff --git a/after/syntax/php/graphql.vim b/after/syntax/php/graphql.vim
index 3c94bcb8..00c9811b 100644
--- a/after/syntax/php/graphql.vim
+++ b/after/syntax/php/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/php/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/reason.vim b/after/syntax/reason.vim
index c30114ee..b64d866d 100644
--- a/after/syntax/reason.vim
+++ b/after/syntax/reason.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'reason')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'reason', 'after/syntax/reason.vim')
   finish
 endif
 
diff --git a/after/syntax/reason/graphql.vim b/after/syntax/reason/graphql.vim
index 0ef3b1d7..74a88a5d 100644
--- a/after/syntax/reason/graphql.vim
+++ b/after/syntax/reason/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/reason/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/rspec.vim b/after/syntax/rspec.vim
index 9a0961d7..d83bbacc 100644
--- a/after/syntax/rspec.vim
+++ b/after/syntax/rspec.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rspec')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rspec', 'after/syntax/rspec.vim')
   finish
 endif
 
diff --git a/after/syntax/ruby.vim b/after/syntax/ruby.vim
index 3c9fccd2..082115e1 100644
--- a/after/syntax/ruby.vim
+++ b/after/syntax/ruby.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'yard')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'yard', 'after/syntax/ruby.vim')
   finish
 endif
 
diff --git a/after/syntax/rust.vim b/after/syntax/rust.vim
index 1cf3e3a2..319c14b9 100644
--- a/after/syntax/rust.vim
+++ b/after/syntax/rust.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'rust')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'rust', 'after/syntax/rust.vim')
   finish
 endif
 
diff --git a/after/syntax/tex.vim b/after/syntax/tex.vim
index 8a30dc30..e99af17f 100644
--- a/after/syntax/tex.vim
+++ b/after/syntax/tex.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'tex')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'tex', 'after/syntax/tex.vim')
   finish
 endif
 
diff --git a/after/syntax/tsx.vim b/after/syntax/tsx.vim
index 458419d2..933bff82 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/tsx.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/tsx.vim')
   finish
 endif
 
diff --git a/after/syntax/typescript/graphql.vim b/after/syntax/typescript/graphql.vim
index df6bf36c..6db06513 100644
--- a/after/syntax/typescript/graphql.vim
+++ b/after/syntax/typescript/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/typescript/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact.vim b/after/syntax/typescriptreact.vim
index 3c3b2666..72f82492 100644
--- a/after/syntax/typescriptreact.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'jsx')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'jsx', 'after/syntax/typescriptreact.vim')
   finish
 endif
 
diff --git a/after/syntax/typescriptreact/graphql.vim b/after/syntax/typescriptreact/graphql.vim
index 0367e0da..518c6b68 100644
--- a/after/syntax/typescriptreact/graphql.vim
+++ b/after/syntax/typescriptreact/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/typescriptreact/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/vue/graphql.vim b/after/syntax/vue/graphql.vim
index 6842f74c..935154d8 100644
--- a/after/syntax/vue/graphql.vim
+++ b/after/syntax/vue/graphql.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'graphql')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'graphql', 'after/syntax/vue/graphql.vim')
   finish
 endif
 
diff --git a/after/syntax/zsh.vim b/after/syntax/zsh.vim
index fcdcac31..cf4f9246 100644
--- a/after/syntax/zsh.vim
+++ b/after/syntax/zsh.vim
@@ -1,4 +1,4 @@
-if has_key(g:polyglot_is_disabled, 'zinit')
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'zinit', 'after/syntax/zsh.vim')
   finish
 endif