Migrate ftdetect generation to ruby

1 files changed, 394 insertions, 239 deletions

diff --git a/ftdetect/polyglot.vim b/ftdetect/polyglot.vim
index c069703f..46895352 100644
--- a/ftdetect/polyglot.vim
+++ b/ftdetect/polyglot.vim
@@ -73,35 +73,51 @@ if index(g:polyglot_disabled, 'asciidoc') == -1
   au BufNewFile,BufRead *.asciidoc set ft=asciidoc
 endif
 
+if index(g:polyglot_disabled, 'autohotkey') == -1
+  au BufNewFile,BufRead *.ahk set ft=autohotkey
+  au BufNewFile,BufRead *.ahkl set ft=autohotkey
+endif
+
 if index(g:polyglot_disabled, 'blade') == -1
   au BufNewFile,BufRead *.blade set ft=blade
   au BufNewFile,BufRead *.blade.php set ft=blade
 endif
 
+if index(g:polyglot_disabled, 'c/c++') == -1
+  au BufNewFile,BufRead *.c set ft=c
+  au BufNewFile,BufRead *.cats set ft=c
+  au BufNewFile,BufRead *.h set ft=c
+  au BufNewFile,BufRead *.idc set ft=c
+  au BufNewFile,BufRead *.c++ set ft=cpp
+  au BufNewFile,BufRead *.cc set ft=cpp
+  au BufNewFile,BufRead *.cp set ft=cpp
+  au BufNewFile,BufRead *.cpp set ft=cpp
+  au BufNewFile,BufRead *.cxx set ft=cpp
+  au BufNewFile,BufRead *.h set ft=cpp
+  au BufNewFile,BufRead *.h++ set ft=cpp
+  au BufNewFile,BufRead *.hh set ft=cpp
+  au BufNewFile,BufRead *.hpp set ft=cpp
+  au BufNewFile,BufRead *.hxx set ft=cpp
+  au BufNewFile,BufRead *.inc set ft=cpp
+  au BufNewFile,BufRead *.inl set ft=cpp
+  au BufNewFile,BufRead *.ino set ft=cpp
+  au BufNewFile,BufRead *.ipp set ft=cpp
+  au BufNewFile,BufRead *.re set ft=cpp
+  au BufNewFile,BufRead *.tcc set ft=cpp
+  au BufNewFile,BufRead *.tpp set ft=cpp
+endif
+
+if index(g:polyglot_disabled, 'c++11') == -1
+endif
+
 if index(g:polyglot_disabled, 'caddyfile') == -1
-  au BufNewFile,BufRead *Caddyfile set ft=caddyfile
+  au BufNewFile,BufRead Caddyfile set ft=caddyfile
 endif
 
 if index(g:polyglot_disabled, 'carp') == -1
   au BufNewFile,BufRead *.carp set ft=carp
 endif
 
-if index(g:polyglot_disabled, 'coffee-script') == -1
-  au BufNewFile,BufRead *._coffee set ft=coffee
-  au BufNewFile,BufRead *.cake set ft=coffee
-  au BufNewFile,BufRead *.cjsx set ft=coffee
-  au BufNewFile,BufRead *.ck set ft=coffee
-  au BufNewFile,BufRead *.coffee set ft=coffee
-  au BufNewFile,BufRead *.coffeekup set ft=coffee
-  au BufNewFile,BufRead *.iced set ft=coffee
-  au BufNewFile,BufRead Cakefile set ft=coffee
-endif
-
-if index(g:polyglot_disabled, 'coffee-script') == -1
-  au BufNewFile,BufRead *.coffee.md set ft=litcoffee
-  au BufNewFile,BufRead *.litcoffee set ft=litcoffee
-endif
-
 if index(g:polyglot_disabled, 'clojure') == -1
   au BufNewFile,BufRead *.boot set ft=clojure
   au BufNewFile,BufRead *.cl2 set ft=clojure
@@ -115,8 +131,26 @@ if index(g:polyglot_disabled, 'clojure') == -1
   au BufNewFile,BufRead riemann.config set ft=clojure
 endif
 
-if index(g:polyglot_disabled, 'cql') == -1
-  au BufNewFile,BufRead *.cql set ft=cql
+if index(g:polyglot_disabled, 'cmake') == -1
+  au BufNewFile,BufRead *.cmake set ft=cmake
+  au BufNewFile,BufRead *.cmake.in set ft=cmake
+  au BufNewFile,BufRead CMakeLists.txt set ft=cmake
+endif
+
+if index(g:polyglot_disabled, 'coffee-script') == -1
+  au BufNewFile,BufRead *._coffee set ft=coffee
+  au BufNewFile,BufRead *.cake set ft=coffee
+  au BufNewFile,BufRead *.cjsx set ft=coffee
+  au BufNewFile,BufRead *.ck set ft=coffee
+  au BufNewFile,BufRead *.coffee set ft=coffee
+  au BufNewFile,BufRead *.coffeekup set ft=coffee
+  au BufNewFile,BufRead *.iced set ft=coffee
+  au BufNewFile,BufRead Cakefile set ft=coffee
+  au BufNewFile,BufRead *.coffee.md set ft=litcoffee
+  au BufNewFile,BufRead *.litcoffee set ft=litcoffee
+endif
+
+if index(g:polyglot_disabled, 'cjsx') == -1
 endif
 
 if index(g:polyglot_disabled, 'cryptol') == -1
@@ -129,9 +163,6 @@ endif
 if index(g:polyglot_disabled, 'crystal') == -1
   au BufNewFile,BufRead *.cr set ft=crystal
   au BufNewFile,BufRead Projectfile set ft=crystal
-endif
-
-if index(g:polyglot_disabled, 'crystal') == -1
   au BufNewFile,BufRead *.ecr set ft=ecrystal
 endif
 
@@ -162,21 +193,9 @@ endif
 if index(g:polyglot_disabled, 'dlang') == -1
   au BufNewFile,BufRead *.d set ft=d
   au BufNewFile,BufRead *.di set ft=d
-endif
-
-if index(g:polyglot_disabled, 'dlang') == -1
   au BufNewFile,BufRead *.lst set ft=dcov
-endif
-
-if index(g:polyglot_disabled, 'dlang') == -1
   au BufNewFile,BufRead *.dd set ft=dd
-endif
-
-if index(g:polyglot_disabled, 'dlang') == -1
   au BufNewFile,BufRead *.ddoc set ft=ddoc
-endif
-
-if index(g:polyglot_disabled, 'dlang') == -1
   au BufNewFile,BufRead *.sdl set ft=dsdl
 endif
 
@@ -187,9 +206,6 @@ if index(g:polyglot_disabled, 'dockerfile') == -1
   au BufNewFile,BufRead Dockerfile set ft=Dockerfile
   au BufNewFile,BufRead Dockerfile* set ft=Dockerfile
   au BufNewFile,BufRead dockerfile set ft=Dockerfile
-endif
-
-if index(g:polyglot_disabled, 'dockerfile') == -1
   au BufNewFile,BufRead docker-compose*.yaml set ft=yaml.docker-compose
   au BufNewFile,BufRead docker-compose*.yml set ft=yaml.docker-compose
 endif
@@ -198,9 +214,6 @@ if index(g:polyglot_disabled, 'elixir') == -1
   au BufNewFile,BufRead *.ex set ft=elixir
   au BufNewFile,BufRead *.exs set ft=elixir
   au BufNewFile,BufRead mix.lock set ft=elixir
-endif
-
-if index(g:polyglot_disabled, 'elixir') == -1
   au BufNewFile,BufRead *.eex set ft=elixir
   au BufNewFile,BufRead *.leex set ft=elixir
 endif
@@ -234,6 +247,10 @@ if index(g:polyglot_disabled, 'erlang') == -1
   au BufNewFile,BufRead rebar.lock set ft=erlang
 endif
 
+if index(g:polyglot_disabled, 'fennel') == -1
+  au BufNewFile,BufRead *.fnl set ft=fennel
+endif
+
 if index(g:polyglot_disabled, 'ferm') == -1
   au BufNewFile,BufRead *.ferm set ft=ferm
   au BufNewFile,BufRead ferm.conf set ft=ferm
@@ -243,34 +260,36 @@ if index(g:polyglot_disabled, 'fish') == -1
   au BufNewFile,BufRead *.fish set ft=fish
 endif
 
-if index(g:polyglot_disabled, 'yaml') == -1
-  au BufNewFile,BufRead *.mir set ft=yaml
-  au BufNewFile,BufRead *.reek set ft=yaml
-  au BufNewFile,BufRead *.rviz set ft=yaml
-  au BufNewFile,BufRead *.sublime-syntax set ft=yaml
-  au BufNewFile,BufRead *.syntax set ft=yaml
-  au BufNewFile,BufRead *.yaml set ft=yaml
-  au BufNewFile,BufRead *.yaml-tmlanguage set ft=yaml
-  au BufNewFile,BufRead *.yaml.sed set ft=yaml
-  au BufNewFile,BufRead *.yml set ft=yaml
-  au BufNewFile,BufRead *.yml.mysql set ft=yaml
-  au BufNewFile,BufRead {.,}clang-format set ft=yaml
-  au BufNewFile,BufRead {.,}clang-tidy set ft=yaml
-  au BufNewFile,BufRead {.,}gemrc set ft=yaml
-  au BufNewFile,BufRead fish_history set ft=yaml
-  au BufNewFile,BufRead fish_read_history set ft=yaml
-  au BufNewFile,BufRead glide.lock set ft=yaml
-  au BufNewFile,BufRead yarn.lock set ft=yaml
-endif
-
 if index(g:polyglot_disabled, 'flatbuffers') == -1
   au BufNewFile,BufRead *.fbs set ft=fbs
 endif
 
+if index(g:polyglot_disabled, 'fsharp') == -1
+  au BufNewFile,BufRead *.fs set ft=fsharp
+  au BufNewFile,BufRead *.fsi set ft=fsharp
+  au BufNewFile,BufRead *.fsx set ft=fsharp
+endif
+
 if index(g:polyglot_disabled, 'gdscript') == -1
   au BufNewFile,BufRead *.gd set ft=gdscript3
 endif
 
+if index(g:polyglot_disabled, 'git') == -1
+  au BufNewFile,BufRead *.gitconfig set ft=gitconfig
+  au BufNewFile,BufRead *.git/config set ft=gitconfig
+  au BufNewFile,BufRead *.git/modules/**/config set ft=gitconfig
+  au BufNewFile,BufRead */.config/git/config set ft=gitconfig
+  au BufNewFile,BufRead {.,}gitconfig set ft=gitconfig
+  au BufNewFile,BufRead {.,}gitmodules set ft=gitconfig
+  au BufNewFile,BufRead gitconfig set ft=gitconfig
+  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
+  au BufNewFile,BufRead {.,}gitsendemail.* set ft=gitsendemail
+  au BufNewFile,BufRead COMMIT_EDIT_MSG set ft=gitcommit
+  au BufNewFile,BufRead MERGE_MSG set ft=gitcommit
+  au BufNewFile,BufRead MSG set ft=gitcommit
+  au BufNewFile,BufRead TAG_EDIT_MSG set ft=gitcommit
+endif
+
 if index(g:polyglot_disabled, 'glsl') == -1
   au BufNewFile,BufRead *.comp set ft=glsl
   au BufNewFile,BufRead *.fp set ft=glsl
@@ -295,61 +314,25 @@ if index(g:polyglot_disabled, 'glsl') == -1
   au BufNewFile,BufRead *.vshader set ft=glsl
 endif
 
-if index(g:polyglot_disabled, 'fsharp') == -1
-  au BufNewFile,BufRead *.fs set ft=fsharp
-  au BufNewFile,BufRead *.fsi set ft=fsharp
-  au BufNewFile,BufRead *.fsx set ft=fsharp
-endif
-
-if index(g:polyglot_disabled, 'git') == -1
-  au BufNewFile,BufRead *.gitconfig set ft=gitconfig
-  au BufNewFile,BufRead *.git/config set ft=gitconfig
-  au BufNewFile,BufRead *.git/modules/**/config set ft=gitconfig
-  au BufNewFile,BufRead */.config/git/config set ft=gitconfig
-  au BufNewFile,BufRead {.,}gitconfig set ft=gitconfig
-  au BufNewFile,BufRead {.,}gitmodules set ft=gitconfig
-  au BufNewFile,BufRead gitconfig set ft=gitconfig
-endif
-
-if index(g:polyglot_disabled, 'git') == -1
-  au BufNewFile,BufRead git-rebase-todo set ft=gitrebase
-endif
-
-if index(g:polyglot_disabled, 'git') == -1
-  au BufNewFile,BufRead {.,}gitsendemail.* set ft=gitsendemail
-endif
-
-if index(g:polyglot_disabled, 'git') == -1
-  au BufNewFile,BufRead COMMIT_EDIT_MSG set ft=gitcommit
-  au BufNewFile,BufRead MERGE_MSG set ft=gitcommit
-  au BufNewFile,BufRead MSG set ft=gitcommit
-  au BufNewFile,BufRead TAG_EDIT_MSG set ft=gitcommit
-endif
-
 if index(g:polyglot_disabled, 'gmpl') == -1
   au BufNewFile,BufRead *.mod set ft=gmpl
 endif
 
-if index(g:polyglot_disabled, 'go') == -1
-  au BufNewFile,BufRead *.go set ft=go
+if index(g:polyglot_disabled, 'gnuplot') == -1
+  au BufNewFile,BufRead *.gnu set ft=gnuplot
+  au BufNewFile,BufRead *.gnuplot set ft=gnuplot
+  au BufNewFile,BufRead *.gp set ft=gnuplot
+  au BufNewFile,BufRead *.p set ft=gnuplot
+  au BufNewFile,BufRead *.plot set ft=gnuplot
+  au BufNewFile,BufRead *.plt set ft=gnuplot
 endif
 
 if index(g:polyglot_disabled, 'go') == -1
+  au BufNewFile,BufRead *.go set ft=go
   au BufNewFile,BufRead go.mod set ft=gomod
-endif
-
-if index(g:polyglot_disabled, 'go') == -1
   au BufNewFile,BufRead *.tmpl set ft=gohtmltmpl
 endif
 
-if index(g:polyglot_disabled, 'assembly') == -1
-  au BufNewFile,BufRead *.a51 set ft=asm
-  au BufNewFile,BufRead *.asm set ft=asm
-  au BufNewFile,BufRead *.i set ft=asm
-  au BufNewFile,BufRead *.inc set ft=asm
-  au BufNewFile,BufRead *.nasm set ft=asm
-endif
-
 if index(g:polyglot_disabled, 'graphql') == -1
   au BufNewFile,BufRead *.gql set ft=graphql
   au BufNewFile,BufRead *.graphql set ft=graphql
@@ -376,12 +359,6 @@ if index(g:polyglot_disabled, 'handlebars') == -1
   au BufNewFile,BufRead *.njk set ft=mustache
 endif
 
-if index(g:polyglot_disabled, 'jinja') == -1
-  au BufNewFile,BufRead *.j2 set ft=jinja.html
-  au BufNewFile,BufRead *.jinja set ft=jinja.html
-  au BufNewFile,BufRead *.jinja2 set ft=jinja.html
-endif
-
 if index(g:polyglot_disabled, 'haproxy') == -1
   au BufNewFile,BufRead *.cfg set ft=haproxy
   au BufNewFile,BufRead haproxy.cfg set ft=haproxy
@@ -409,24 +386,28 @@ if index(g:polyglot_disabled, 'hcl') == -1
   au BufNewFile,BufRead Appfile set ft=hcl
 endif
 
-if index(g:polyglot_disabled, 'helm') == -1
-  au BufNewFile,BufRead */templates/*.tpl set ft=helm
-  au BufNewFile,BufRead */templates/*.yaml set ft=helm
-endif
-
 if index(g:polyglot_disabled, 'hive') == -1
   au BufNewFile,BufRead *.hql set ft=hive
   au BufNewFile,BufRead *.q set ft=hive
+  au BufNewFile,BufRead *.hql set ft=hive
+  au BufNewFile,BufRead *.q set ft=hive
+endif
+
+if index(g:polyglot_disabled, 'html5') == -1
+  au BufNewFile,BufRead *.htm set ft=html
+  au BufNewFile,BufRead *.html set ft=html
+  au BufNewFile,BufRead *.html.hl set ft=html
+  au BufNewFile,BufRead *.inc set ft=html
+  au BufNewFile,BufRead *.st set ft=html
+  au BufNewFile,BufRead *.xht set ft=html
+  au BufNewFile,BufRead *.xhtml set ft=html
 endif
 
 if index(g:polyglot_disabled, 'i3') == -1
   au BufNewFile,BufRead *.i3.config set ft=i3config
+  au BufNewFile,BufRead *.i3config set ft=i3config
   au BufNewFile,BufRead i3.config set ft=i3config
-endif
-
-if index(g:polyglot_disabled, 'hive') == -1
-  au BufNewFile,BufRead *.hql set ft=hive
-  au BufNewFile,BufRead *.q set ft=hive
+  au BufNewFile,BufRead i3config set ft=i3config
 endif
 
 if index(g:polyglot_disabled, 'icalendar') == -1
@@ -467,9 +448,6 @@ if index(g:polyglot_disabled, 'javascript') == -1
   au BufNewFile,BufRead *.xsjs set ft=javascript
   au BufNewFile,BufRead *.xsjslib set ft=javascript
   au BufNewFile,BufRead Jakefile set ft=javascript
-endif
-
-if index(g:polyglot_disabled, 'javascript') == -1
   au BufNewFile,BufRead *.flow set ft=flow
 endif
 
@@ -479,6 +457,17 @@ if index(g:polyglot_disabled, 'jenkins') == -1
   au BufNewFile,BufRead Jenkinsfile* set ft=Jenkinsfile
 endif
 
+if index(g:polyglot_disabled, 'jinja') == -1
+  au BufNewFile,BufRead *.j2 set ft=jinja.html
+  au BufNewFile,BufRead *.jinja set ft=jinja.html
+  au BufNewFile,BufRead *.jinja2 set ft=jinja.html
+endif
+
+if index(g:polyglot_disabled, 'jq') == -1
+  au BufNewFile,BufRead *.jq set ft=jq
+  au BufNewFile,BufRead {.,}jqrc set ft=jq
+endif
+
 if index(g:polyglot_disabled, 'json5') == -1
   au BufNewFile,BufRead *.json5 set ft=json5
 endif
@@ -511,6 +500,11 @@ if index(g:polyglot_disabled, 'json') == -1
   au BufNewFile,BufRead mcmod.info set ft=json
 endif
 
+if index(g:polyglot_disabled, 'jsonnet') == -1
+  au BufNewFile,BufRead *.jsonnet set ft=jsonnet
+  au BufNewFile,BufRead *.libsonnet set ft=jsonnet
+endif
+
 if index(g:polyglot_disabled, 'jst') == -1
   au BufNewFile,BufRead *.djs set ft=jst
   au BufNewFile,BufRead *.ect set ft=jst
@@ -519,7 +513,7 @@ if index(g:polyglot_disabled, 'jst') == -1
   au BufNewFile,BufRead *.jst set ft=jst
 endif
 
-if index(g:polyglot_disabled, 'jsx') == -1
+if !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
   au BufNewFile,BufRead *.jsx set ft=javascriptreact
 endif
 
@@ -556,24 +550,41 @@ endif
 
 if index(g:polyglot_disabled, 'llvm') == -1
   au BufNewFile,BufRead *.ll set ft=llvm
+  au BufNewFile,BufRead *.td set ft=tablegen
 endif
 
-if index(g:polyglot_disabled, 'llvm') == -1
-  au BufNewFile,BufRead *.td set ft=tablegen
+if index(g:polyglot_disabled, 'log') == -1
+  au BufNewFile,BufRead *.log set ft=log
+  au BufNewFile,BufRead *_log set ft=log
+endif
+
+if index(g:polyglot_disabled, 'lua') == -1
+  au BufNewFile,BufRead *.fcgi set ft=lua
+  au BufNewFile,BufRead *.lua set ft=lua
+  au BufNewFile,BufRead *.nse set ft=lua
+  au BufNewFile,BufRead *.p8 set ft=lua
+  au BufNewFile,BufRead *.pd_lua set ft=lua
+  au BufNewFile,BufRead *.rbxs set ft=lua
+  au BufNewFile,BufRead *.rockspec set ft=lua
+  au BufNewFile,BufRead *.wlua set ft=lua
+  au BufNewFile,BufRead {.,}luacheckrc set ft=lua
 endif
 
 if index(g:polyglot_disabled, 'mako') == -1
-  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mako set ft=mako
-  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufReadPre *.*.mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype
-  au BufNewFile,BufRead *.mao set ft=mako
+  au BufNewFile *.*.mako execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype  au BufReadPre *.*mako execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype  au BufNewFile,BufRead *.mako set ft=mako
+  au BufNewFile *.*.mao execute "do BufNewFile filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype  au BufReadPre *.*mao execute "do BufRead filetypedetect " . expand("<afile>:r") | let b:mako_outer_lang = &filetype  au BufNewFile,BufRead *.mao set ft=mako
 endif
 
-if index(g:polyglot_disabled, 'log') == -1
-  au BufNewFile,BufRead *.log set ft=log
-  au BufNewFile,BufRead *_log set ft=log
+if index(g:polyglot_disabled, 'mathematica') == -1
+  au BufNewFile,BufRead *.cdf set ft=mma
+  au BufNewFile,BufRead *.m set ft=mma
+  au BufNewFile,BufRead *.ma set ft=mma
+  au BufNewFile,BufRead *.mathematica set ft=mma
+  au BufNewFile,BufRead *.mt set ft=mma
+  au BufNewFile,BufRead *.nb set ft=mma
+  au BufNewFile,BufRead *.nbp set ft=mma
+  au BufNewFile,BufRead *.wl set ft=mma
+  au BufNewFile,BufRead *.wlt set ft=mma
 endif
 
 if index(g:polyglot_disabled, 'markdown') == -1
@@ -593,28 +604,13 @@ if index(g:polyglot_disabled, 'mdx') == -1
   au BufNewFile,BufRead *.mdx set ft=markdown.mdx
 endif
 
-if index(g:polyglot_disabled, 'mma') == -1
-  au BufNewFile,BufRead *.cdf set ft=mma
-  au BufNewFile,BufRead *.m set ft=mma
-  au BufNewFile,BufRead *.ma set ft=mma
-  au BufNewFile,BufRead *.mathematica set ft=mma
-  au BufNewFile,BufRead *.mt set ft=mma
-  au BufNewFile,BufRead *.nb set ft=mma
-  au BufNewFile,BufRead *.nbp set ft=mma
-  au BufNewFile,BufRead *.wl set ft=mma
-  au BufNewFile,BufRead *.wlt set ft=mma
-endif
-
 if index(g:polyglot_disabled, 'meson') == -1
   au BufNewFile,BufRead meson.build set ft=meson
   au BufNewFile,BufRead meson_options.txt set ft=meson
-endif
-
-if index(g:polyglot_disabled, 'meson') == -1
   au BufNewFile,BufRead *.wrap set ft=dosini
 endif
 
-if index(g:polyglot_disabled, 'moon') == -1
+if index(g:polyglot_disabled, 'moonscript') == -1
   au BufNewFile,BufRead *.moon set ft=moon
 endif
 
@@ -643,6 +639,11 @@ if index(g:polyglot_disabled, 'nix') == -1
   au BufNewFile,BufRead *.nix set ft=nix
 endif
 
+if index(g:polyglot_disabled, 'objc') == -1
+  au BufNewFile,BufRead *.h set ft=objc
+  au BufNewFile,BufRead *.m set ft=objc
+endif
+
 if index(g:polyglot_disabled, 'ocaml') == -1
   au BufNewFile,BufRead *.eliom set ft=ocaml
   au BufNewFile,BufRead *.eliomi set ft=ocaml
@@ -656,23 +657,18 @@ if index(g:polyglot_disabled, 'ocaml') == -1
   au BufNewFile,BufRead *.mlp set ft=ocaml
   au BufNewFile,BufRead *.mlt set ft=ocaml
   au BufNewFile,BufRead *.mly set ft=ocaml
-endif
-
-if index(g:polyglot_disabled, 'ocaml') == -1
   au BufNewFile,BufRead *.om set ft=omake
   au BufNewFile,BufRead OMakefile set ft=omake
   au BufNewFile,BufRead OMakeroot set ft=omake
   au BufNewFile,BufRead Omakeroot.in set ft=omake
-endif
-
-if index(g:polyglot_disabled, 'ocaml') == -1
   au BufNewFile,BufRead *.opam set ft=opam
   au BufNewFile,BufRead *.opam.template set ft=opam
   au BufNewFile,BufRead opam set ft=opam
+  au BufNewFile,BufRead _oasis set ft=oasis
 endif
 
-if index(g:polyglot_disabled, 'ocaml') == -1
-  au BufNewFile,BufRead _oasis set ft=oasis
+if index(g:polyglot_disabled, 'octave') == -1
+  au BufNewFile,BufRead *.oct set ft=octave
 endif
 
 if index(g:polyglot_disabled, 'opencl') == -1
@@ -697,8 +693,48 @@ if index(g:polyglot_disabled, 'perl') == -1
   au BufNewFile,BufRead cpanfile set ft=perl
 endif
 
+if index(g:polyglot_disabled, 'sql') == -1
+  au BufNewFile,BufRead *.bdy set ft=sql
+  au BufNewFile,BufRead *.ddl set ft=sql
+  au BufNewFile,BufRead *.fnc set ft=sql
+  au BufNewFile,BufRead *.pck set ft=sql
+  au BufNewFile,BufRead *.pkb set ft=sql
+  au BufNewFile,BufRead *.pks set ft=sql
+  au BufNewFile,BufRead *.plb set ft=sql
+  au BufNewFile,BufRead *.pls set ft=sql
+  au BufNewFile,BufRead *.plsql set ft=sql
+  au BufNewFile,BufRead *.prc set ft=sql
+  au BufNewFile,BufRead *.spc set ft=sql
+  au BufNewFile,BufRead *.sql set ft=sql
+  au BufNewFile,BufRead *.tpb set ft=sql
+  au BufNewFile,BufRead *.tps set ft=sql
+  au BufNewFile,BufRead *.trg set ft=sql
+  au BufNewFile,BufRead *.vw set ft=sql
+endif
+
 if index(g:polyglot_disabled, 'pgsql') == -1
-  au BufNewFile,BufRead *.pgsql let b:sql_type_override='pgsql' | set ft=sql
+  au BufNewFile,BufRead *.pgsql set ft=sql
+endif
+
+if index(g:polyglot_disabled, 'cql') == -1
+  au BufNewFile,BufRead *.cql set ft=cql
+endif
+
+if index(g:polyglot_disabled, 'php') == -1
+  au BufNewFile,BufRead *.aw set ft=php
+  au BufNewFile,BufRead *.ctp set ft=php
+  au BufNewFile,BufRead *.fcgi set ft=php
+  au BufNewFile,BufRead *.inc set ft=php
+  au BufNewFile,BufRead *.php set ft=php
+  au BufNewFile,BufRead *.php3 set ft=php
+  au BufNewFile,BufRead *.php4 set ft=php
+  au BufNewFile,BufRead *.php5 set ft=php
+  au BufNewFile,BufRead *.phps set ft=php
+  au BufNewFile,BufRead *.phpt set ft=php
+  au BufNewFile,BufRead {.,}php set ft=php
+  au BufNewFile,BufRead {.,}php_cs set ft=php
+  au BufNewFile,BufRead {.,}php_cs.dist set ft=php
+  au BufNewFile,BufRead Phakefile set ft=php
 endif
 
 if index(g:polyglot_disabled, 'plantuml') == -1
@@ -718,9 +754,6 @@ if index(g:polyglot_disabled, 'powershell') == -1
   au BufNewFile,BufRead *.psd1 set ft=powershell
   au BufNewFile,BufRead *.psm1 set ft=powershell
   au BufNewFile,BufRead *.pssc set ft=powershell
-endif
-
-if index(g:polyglot_disabled, 'powershell') == -1
   au BufNewFile,BufRead *.ps1xml set ft=ps1xml
 endif
 
@@ -736,9 +769,6 @@ endif
 if index(g:polyglot_disabled, 'puppet') == -1
   au BufNewFile,BufRead *.pp set ft=puppet
   au BufNewFile,BufRead Modulefile set ft=puppet
-endif
-
-if index(g:polyglot_disabled, 'puppet') == -1
   au BufNewFile,BufRead *.epp set ft=embeddedpuppet
 endif
 
@@ -746,6 +776,46 @@ if index(g:polyglot_disabled, 'purescript') == -1
   au BufNewFile,BufRead *.purs set ft=purescript
 endif
 
+if index(g:polyglot_disabled, 'python') == -1
+  au BufNewFile,BufRead *.cgi set ft=python
+  au BufNewFile,BufRead *.fcgi set ft=python
+  au BufNewFile,BufRead *.gyp set ft=python
+  au BufNewFile,BufRead *.gypi set ft=python
+  au BufNewFile,BufRead *.lmi set ft=python
+  au BufNewFile,BufRead *.py set ft=python
+  au BufNewFile,BufRead *.py3 set ft=python
+  au BufNewFile,BufRead *.pyde set ft=python
+  au BufNewFile,BufRead *.pyi set ft=python
+  au BufNewFile,BufRead *.pyp set ft=python
+  au BufNewFile,BufRead *.pyt set ft=python
+  au BufNewFile,BufRead *.pyw set ft=python
+  au BufNewFile,BufRead *.rpy set ft=python
+  au BufNewFile,BufRead *.smk set ft=python
+  au BufNewFile,BufRead *.spec set ft=python
+  au BufNewFile,BufRead *.tac set ft=python
+  au BufNewFile,BufRead *.wsgi set ft=python
+  au BufNewFile,BufRead *.xpy set ft=python
+  au BufNewFile,BufRead {.,}gclient set ft=python
+  au BufNewFile,BufRead DEPS set ft=python
+  au BufNewFile,BufRead SConscript set ft=python
+  au BufNewFile,BufRead SConstruct set ft=python
+  au BufNewFile,BufRead Snakefile set ft=python
+  au BufNewFile,BufRead wscript set ft=python
+endif
+
+if index(g:polyglot_disabled, 'python-indent') == -1
+endif
+
+if index(g:polyglot_disabled, 'python-compiler') == -1
+endif
+
+if index(g:polyglot_disabled, 'requirements') == -1
+  au BufNewFile,BufRead *.pip set ft=requirements
+  au BufNewFile,BufRead *require.{txt,in} set ft=requirements
+  au BufNewFile,BufRead *requirements.{txt,in} set ft=requirements
+  au BufNewFile,BufRead constraints.{txt,in} set ft=requirements
+endif
+
 if index(g:polyglot_disabled, 'qmake') == -1
   au BufNewFile,BufRead *.pri set ft=qmake
   au BufNewFile,BufRead *.pro set ft=qmake
@@ -756,6 +826,16 @@ if index(g:polyglot_disabled, 'qml') == -1
   au BufNewFile,BufRead *.qml set ft=qml
 endif
 
+if index(g:polyglot_disabled, 'r-lang') == -1
+  au BufNewFile,BufRead *.S set ft=r
+  au BufNewFile,BufRead *.r set ft=r
+  au BufNewFile,BufRead *.rsx set ft=r
+  au BufNewFile,BufRead *.s set ft=r
+  au BufNewFile,BufRead {.,}Rprofile set ft=r
+  au BufNewFile,BufRead expr-dist set ft=r
+  au BufNewFile,BufRead *.rd set ft=rhelp
+endif
+
 if index(g:polyglot_disabled, 'racket') == -1
   au BufNewFile,BufRead *.rkt set ft=racket
   au BufNewFile,BufRead *.rktd set ft=racket
@@ -763,6 +843,10 @@ if index(g:polyglot_disabled, 'racket') == -1
   au BufNewFile,BufRead *.scrbl set ft=racket
 endif
 
+if index(g:polyglot_disabled, 'ragel') == -1
+  au BufNewFile,BufRead *.rl set ft=ragel
+endif
+
 if index(g:polyglot_disabled, 'raku') == -1
   au BufNewFile,BufRead *.6pl set ft=raku
   au BufNewFile,BufRead *.6pm set ft=raku
@@ -797,8 +881,11 @@ if index(g:polyglot_disabled, 'reason') == -1
   au BufNewFile,BufRead *.rei set ft=reason
 endif
 
-if index(g:polyglot_disabled, 'razor') == -1
-  au BufNewFile,BufRead {.,}merlin set ft=merlin
+if index(g:polyglot_disabled, 'rst') == -1
+  au BufNewFile,BufRead *.rest set ft=rst
+  au BufNewFile,BufRead *.rest.txt set ft=rst
+  au BufNewFile,BufRead *.rst set ft=rst
+  au BufNewFile,BufRead *.rst.txt set ft=rst
 endif
 
 if index(g:polyglot_disabled, 'ruby') == -1
@@ -834,7 +921,6 @@ if index(g:polyglot_disabled, 'ruby') == -1
   au BufNewFile,BufRead {.,}pryrc set ft=ruby
   au BufNewFile,BufRead Appraisals set ft=ruby
   au BufNewFile,BufRead Berksfile set ft=ruby
-  au BufNewFile,BufRead Brewfile set ft=ruby
   au BufNewFile,BufRead Buildfile set ft=ruby
   au BufNewFile,BufRead Capfile set ft=ruby
   au BufNewFile,BufRead Cheffile set ft=ruby
@@ -856,9 +942,6 @@ if index(g:polyglot_disabled, 'ruby') == -1
   au BufNewFile,BufRead Thorfile set ft=ruby
   au BufNewFile,BufRead Vagrantfile set ft=ruby
   au BufNewFile,BufRead buildfile set ft=ruby
-endif
-
-if index(g:polyglot_disabled, 'ruby') == -1
   au BufNewFile,BufRead *.erb set ft=eruby
   au BufNewFile,BufRead *.erb.deface set ft=eruby
   au BufNewFile,BufRead *.rhtml set ft=eruby
@@ -868,6 +951,13 @@ if index(g:polyglot_disabled, 'rspec') == -1
   au BufNewFile,BufRead *_spec.rb set ft=ruby syntax=rspec
 endif
 
+if index(g:polyglot_disabled, 'yard') == -1
+endif
+
+if index(g:polyglot_disabled, 'brewfile') == -1
+  au BufNewFile,BufRead Brewfile set ft=brewfile
+endif
+
 if index(g:polyglot_disabled, 'rust') == -1
   au BufNewFile,BufRead *.rs set ft=rust
   au BufNewFile,BufRead *.rs.in set ft=rust
@@ -879,7 +969,7 @@ if index(g:polyglot_disabled, 'scala') == -1
   au BufNewFile,BufRead *.scala set ft=scala
 endif
 
-if index(g:polyglot_disabled, 'scala') == -1
+if index(g:polyglot_disabled, 'sbt') == -1
   au BufNewFile,BufRead *.sbt set ft=sbt.scala
 endif
 
@@ -887,6 +977,47 @@ if index(g:polyglot_disabled, 'scss') == -1
   au BufNewFile,BufRead *.scss set ft=scss
 endif
 
+if index(g:polyglot_disabled, 'sh') == -1
+  au BufNewFile,BufRead *.bash set ft=sh
+  au BufNewFile,BufRead *.bats set ft=sh
+  au BufNewFile,BufRead *.cgi set ft=sh
+  au BufNewFile,BufRead *.command set ft=sh
+  au BufNewFile,BufRead *.fcgi set ft=sh
+  au BufNewFile,BufRead *.ksh set ft=sh
+  au BufNewFile,BufRead *.sh set ft=sh
+  au BufNewFile,BufRead *.sh.in set ft=sh
+  au BufNewFile,BufRead *.tmux set ft=sh
+  au BufNewFile,BufRead *.tool set ft=sh
+  au BufNewFile,BufRead {.,}bash_aliases set ft=sh
+  au BufNewFile,BufRead {.,}bash_history set ft=sh
+  au BufNewFile,BufRead {.,}bash_logout set ft=sh
+  au BufNewFile,BufRead {.,}bash_profile set ft=sh
+  au BufNewFile,BufRead {.,}bashrc set ft=sh
+  au BufNewFile,BufRead {.,}cshrc set ft=sh
+  au BufNewFile,BufRead {.,}login set ft=sh
+  au BufNewFile,BufRead {.,}profile set ft=sh
+  au BufNewFile,BufRead 9fs set ft=sh
+  au BufNewFile,BufRead PKGBUILD set ft=sh
+  au BufNewFile,BufRead bash_aliases set ft=sh
+  au BufNewFile,BufRead bash_logout set ft=sh
+  au BufNewFile,BufRead bash_profile set ft=sh
+  au BufNewFile,BufRead bashrc set ft=sh
+  au BufNewFile,BufRead cshrc set ft=sh
+  au BufNewFile,BufRead gradlew set ft=sh
+  au BufNewFile,BufRead login set ft=sh
+  au BufNewFile,BufRead man set ft=sh
+  au BufNewFile,BufRead profile set ft=sh
+  au BufNewFile,BufRead *.zsh set ft=zsh
+  au BufNewFile,BufRead {.,}zlogin set ft=zsh
+  au BufNewFile,BufRead {.,}zlogout set ft=zsh
+  au BufNewFile,BufRead {.,}zprofile set ft=zsh
+  au BufNewFile,BufRead {.,}zshenv set ft=zsh
+  au BufNewFile,BufRead {.,}zshrc set ft=zsh
+endif
+
+if index(g:polyglot_disabled, 'zinit') == -1
+endif
+
 if index(g:polyglot_disabled, 'slim') == -1
   au BufNewFile,BufRead *.slim set ft=slim
 endif
@@ -913,6 +1044,13 @@ if index(g:polyglot_disabled, 'svelte') == -1
   au BufNewFile,BufRead *.svelte set ft=svelte
 endif
 
+if index(g:polyglot_disabled, 'svg') == -1
+  au BufNewFile,BufRead *.svg set ft=svg
+endif
+
+if index(g:polyglot_disabled, 'svg-indent') == -1
+endif
+
 if index(g:polyglot_disabled, 'swift') == -1
   au BufNewFile,BufRead *.swift set ft=swift
 endif
@@ -969,18 +1107,56 @@ endif
 
 if index(g:polyglot_disabled, 'twig') == -1
   au BufNewFile,BufRead *.twig set ft=html.twig
-endif
-
-if index(g:polyglot_disabled, 'twig') == -1
   au BufNewFile,BufRead *.xml.twig set ft=xml.twig
 endif
 
 if index(g:polyglot_disabled, 'typescript') == -1
   au BufNewFile,BufRead *.ts set ft=typescript
+  au BufNewFile,BufRead *.tsx set ft=typescriptreact
 endif
 
-if index(g:polyglot_disabled, 'typescript') == -1
-  au BufNewFile,BufRead *.tsx set ft=typescriptreact
+if index(g:polyglot_disabled, 'unison') == -1
+  au BufNewFile,BufRead *.u set ft=unison
+  au BufNewFile,BufRead *.uu set ft=unison
+endif
+
+if index(g:polyglot_disabled, 'v') == -1
+  au BufNewFile,BufRead *.v set ft=v
+endif
+
+if index(g:polyglot_disabled, 'vala') == -1
+  au BufNewFile,BufRead *.vala set ft=vala
+  au BufNewFile,BufRead *.valadoc set ft=vala
+  au BufNewFile,BufRead *.vapi set ft=vala
+endif
+
+if index(g:polyglot_disabled, 'vbnet') == -1
+  au BufNewFile,BufRead *.vb set ft=vbnet
+  au BufNewFile,BufRead *.vbhtml set ft=vbnet
+endif
+
+if index(g:polyglot_disabled, 'vcl') == -1
+  au BufNewFile,BufRead *.vcl set ft=vcl
+endif
+
+if index(g:polyglot_disabled, 'vifm') == -1
+  au BufNewFile,BufRead *.vifm set ft=vifm
+  au BufNewFile,BufRead *vifm/colors/* set ft=vifm
+  au BufNewFile,BufRead vifmrc set ft=vifm
+  au BufNewFile,BufRead vifm.rename* set ft=vifm-rename
+endif
+
+if index(g:polyglot_disabled, 'velocity') == -1
+  au BufNewFile,BufRead *.vm set ft=velocity
+endif
+
+if index(g:polyglot_disabled, 'vue') == -1
+  au BufNewFile,BufRead *.vue set ft=vue
+  au BufNewFile,BufRead *.wpy set ft=vue
+endif
+
+if index(g:polyglot_disabled, 'xdc') == -1
+  au BufNewFile,BufRead *.xdc set ft=xdc
 endif
 
 if index(g:polyglot_disabled, 'xml') == -1
@@ -1091,82 +1267,61 @@ if index(g:polyglot_disabled, 'xml') == -1
   au BufNewFile,BufRead packages.config set ft=xml
 endif
 
-if index(g:polyglot_disabled, 'v') == -1
-  au BufNewFile,BufRead *.v set ft=v
-endif
-
-if index(g:polyglot_disabled, 'vala') == -1
-  au BufNewFile,BufRead *.vala set ft=vala
-  au BufNewFile,BufRead *.valadoc set ft=vala
-  au BufNewFile,BufRead *.vapi set ft=vala
-endif
-
-if index(g:polyglot_disabled, 'vbnet') == -1
-  au BufNewFile,BufRead *.vb set ft=vbnet
-  au BufNewFile,BufRead *.vbhtml set ft=vbnet
-endif
-
-if index(g:polyglot_disabled, 'vcl') == -1
-  au BufNewFile,BufRead *.vcl set ft=vcl
+if index(g:polyglot_disabled, 'xsl') == -1
+  au BufNewFile,BufRead *.xsl set ft=xsl
+  au BufNewFile,BufRead *.xslt set ft=xsl
 endif
 
-if index(g:polyglot_disabled, 'vifm') == -1
-  au BufNewFile,BufRead *.vifm set ft=vifm
-  au BufNewFile,BufRead *vifm/colors/* set ft=vifm
-  au BufNewFile,BufRead vifmrc set ft=vifm
-endif
-
-if index(g:polyglot_disabled, 'vifm') == -1
-  au BufNewFile,BufRead vifm.rename* set ft=vifm-rename
+if index(g:polyglot_disabled, 'yaml') == -1
+  au BufNewFile,BufRead *.mir set ft=yaml
+  au BufNewFile,BufRead *.reek set ft=yaml
+  au BufNewFile,BufRead *.rviz set ft=yaml
+  au BufNewFile,BufRead *.sublime-syntax set ft=yaml
+  au BufNewFile,BufRead *.syntax set ft=yaml
+  au BufNewFile,BufRead *.yaml set ft=yaml
+  au BufNewFile,BufRead *.yaml-tmlanguage set ft=yaml
+  au BufNewFile,BufRead *.yaml.sed set ft=yaml
+  au BufNewFile,BufRead *.yml set ft=yaml
+  au BufNewFile,BufRead *.yml.mysql set ft=yaml
+  au BufNewFile,BufRead {.,}clang-format set ft=yaml
+  au BufNewFile,BufRead {.,}clang-tidy set ft=yaml
+  au BufNewFile,BufRead {.,}gemrc set ft=yaml
+  au BufNewFile,BufRead fish_history set ft=yaml
+  au BufNewFile,BufRead fish_read_history set ft=yaml
+  au BufNewFile,BufRead glide.lock set ft=yaml
+  au BufNewFile,BufRead yarn.lock set ft=yaml
 endif
 
-if index(g:polyglot_disabled, 'velocity') == -1
-  au BufNewFile,BufRead *.vm set ft=velocity
+if index(g:polyglot_disabled, 'ansible') == -1
+  au BufNewFile,BufRead *.asl set ft=yaml.ansible
+  au BufNewFile,BufRead *.dsl set ft=yaml.ansible
+  au BufNewFile,BufRead group_vars/* set ft=yaml.ansible
+  au BufNewFile,BufRead handlers.*.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead host_vars/* set ft=yaml.ansible
+  au BufNewFile,BufRead local.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead main.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead playbook.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead requirements.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead roles.*.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead site.ya?ml set ft=yaml.ansible
+  au BufNewFile,BufRead tasks.*.ya?ml set ft=yaml.ansible
 endif
 
-if index(g:polyglot_disabled, 'vue') == -1
-  au BufNewFile,BufRead *.vue set ft=vue
-  au BufNewFile,BufRead *.wpy set ft=vue
+if index(g:polyglot_disabled, 'helm') == -1
+  au BufNewFile,BufRead */templates/*.tpl set ft=helm
+  au BufNewFile,BufRead */templates/*.yaml set ft=helm
 endif
 
-if index(g:polyglot_disabled, 'xdc') == -1
-  au BufNewFile,BufRead *.xdc set ft=xdc
+if index(g:polyglot_disabled, 'zephir') == -1
+  au BufNewFile,BufRead *.zep set ft=zephir
 endif
 
 if index(g:polyglot_disabled, 'zig') == -1
   au BufNewFile,BufRead *.zig set ft=zig
   au BufNewFile,BufRead *.zir set ft=zig
-endif
-
-if index(g:polyglot_disabled, 'zig') == -1
   au BufNewFile,BufRead *.zir set ft=zir
 endif
 
-if index(g:polyglot_disabled, 'jsonnet') == -1
-  au BufNewFile,BufRead *.jsonnet set ft=jsonnet
-  au BufNewFile,BufRead *.libsonnet set ft=jsonnet
-endif
-
-if index(g:polyglot_disabled, 'fennel') == -1
-  au BufNewFile,BufRead *.fnl set ft=fennel
-endif
-
-if index(g:polyglot_disabled, 'mcfunction') == -1
-  au BufNewFile,BufRead *.mcfunction set ft=mcfunction
-endif
-
-if index(g:polyglot_disabled, 'jq') == -1
-  au BufNewFile,BufRead *.jq set ft=jq
-  au BufNewFile,BufRead {.,}jqrc set ft=jq
-endif
-
-if index(g:polyglot_disabled, 'requirements') == -1
-  au BufNewFile,BufRead *.pip set ft=requirements
-  au BufNewFile,BufRead *require.{txt,in} set ft=requirements
-  au BufNewFile,BufRead *requirements.{txt,in} set ft=requirements
-  au BufNewFile,BufRead constraints.{txt,in} set ft=requirements
-endif
-
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
-unlet s:cpo_save
\ No newline at end of file
+unlet s:cpo_save