Migrate ftdetect generation to ruby

README.md

@@ -10,7 +10,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->157<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->156<!--/Package Count--> packages it consists of.
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
 - No support for esoteric languages, only most popular ones (modern too, like `slim`).
@@ -181,7 +181,6 @@ If you need full functionality of any plugin, please use it directly with your p
 - [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin)
 - [thrift](https://github.com/solarnz/thrift.vim) (syntax)
 - [tmux](https://github.com/ericpruitt/tmux.vim) (syntax, ftplugin)
-- [tomdoc](https://github.com/wellbredgrapefruit/tomdoc.vim) (syntax)
 - [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin)
 - [tptp](https://github.com/c-cube/vim-tptp) (syntax)
 - [twig](https://github.com/lumiliet/vim-twig) (syntax, indent, ftplugin)
@@ -195,8 +194,8 @@ If you need full functionality of any plugin, please use it directly with your p
 - [vifm](https://github.com/vifm/vifm.vim) (syntax, autoload, ftplugin)
 - [vue](https://github.com/posva/vim-vue) (syntax, indent, ftplugin)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (syntax)
-- [xls](https://github.com/vim-scripts/XSLT-syntax) (syntax)
 - [xml](https://github.com/amadeus/vim-xml) (syntax)
+- [xsl](https://github.com/vim-scripts/XSLT-syntax) (syntax)
 - [yaml](https://github.com/stephpy/vim-yaml) (syntax, ftplugin)
 - [yard](https://github.com/sheerun/vim-yardoc) (syntax)
 - [zephir](https://github.com/xwsoul/vim-zephir) (syntax)

build

@@ -95,8 +95,6 @@ def load_languages
   data = URI.open(url) { |io| YAML.load(io.read) }
 end
 
-# heuristics, languages = parallel(:load_heuristics, :load_languages)
-
 def parse_remote(remote)
   match = remote.match(/(?<repo>[^@:]+)(?:@(?<branch>[^:]+))?(?::(?<path>.*))?/)
   [match[:repo], match[:branch] || "master", match[:path]]
@@ -123,16 +121,18 @@ end
 def download
   FileUtils.rm_rf('tmp')
 
-  PACKAGES.map do |package|
+  PACKAGES.each_slice(20) do |batch|
-    Thread.new do
+    batch.map do |package|
-      repo, branch, path = parse_remote(package.fetch("remote"))
+      Thread.new do
-      dir = "tmp/" + repo.split('/')[1]
+        repo, branch, path = parse_remote(package.fetch("remote"))
-      FileUtils.mkdir_p(dir)
+        dir = "tmp/" + repo.split('/')[1]
-      url = "https://codeload.github.com/#{repo}/tar.gz/#{branch}"
+        FileUtils.mkdir_p(dir)
-      `curl --silent -fL #{url} | tar -zx -C "#{dir}" --strip 1`
+        url = "https://codeload.github.com/#{repo}/tar.gz/#{branch}"
-      progress
+        `curl --silent -fL #{url} | tar -zx -C "#{dir}" --strip 1`
-    end
+        progress
-  end.map(&:join)
+      end
+    end.map(&:join)
+  end
 end
 
 $i = 0
@@ -191,7 +191,114 @@ def extract
   File.write('README.md', readme)
 end
 
+def generate_ftdetect
+  heuristics, languages = parallel(:load_heuristics, :load_languages)
+
+  output = <<~EOS
+    " don't spam the user when Vim is started in Vi compatibility mode
+    let s:cpo_save = &cpo
+    set cpo&vim
+
+    if !exists('g:polyglot_disabled')
+      let g:polyglot_disabled = []
+    endif
+
+    function! s:SetDefault(name, value)
+      if !exists(a:name)
+        let {a:name} = a:value
+      endif
+    endfunction
+
+    call s:SetDefault('g:markdown_enable_spell_checking', 0)
+    call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
+    call s:SetDefault('g:markdown_enable_mappings', 0)
+
+    " Enable jsx syntax by default
+    call s:SetDefault('g:jsx_ext_required', 0)
+
+    " Make csv loading faster
+    call s:SetDefault('g:csv_start', 1)
+    call s:SetDefault('g:csv_end', 2)
+
+    " Disable json concealing by default
+    call s:SetDefault('g:vim_json_syntax_conceal', 0)
+
+    call s:SetDefault('g:filetype_euphoria', 'elixir')
+
+    if !exists('g:python_highlight_all')
+      call s:SetDefault('g:python_highlight_builtins', 1)
+      call s:SetDefault('g:python_highlight_builtin_objs', 1)
+      call s:SetDefault('g:python_highlight_builtin_types', 1)
+      call s:SetDefault('g:python_highlight_builtin_funcs', 1)
+      call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
+      call s:SetDefault('g:python_highlight_exceptions', 1)
+      call s:SetDefault('g:python_highlight_string_formatting', 1)
+      call s:SetDefault('g:python_highlight_string_format', 1)
+      call s:SetDefault('g:python_highlight_string_templates', 1)
+      call s:SetDefault('g:python_highlight_indent_errors', 1)
+      call s:SetDefault('g:python_highlight_space_errors', 1)
+      call s:SetDefault('g:python_highlight_doctests', 1)
+      call s:SetDefault('g:python_highlight_func_calls', 1)
+      call s:SetDefault('g:python_highlight_class_vars', 1)
+      call s:SetDefault('g:python_highlight_operators', 1)
+      call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
+      call s:SetDefault('g:python_slow_sync', 1)
+    endif
+
+  EOS
+
+  for package in PACKAGES
+    name = package.fetch("name")
+    output << if name == "jsx"
+      "if !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)\n"
+    else
+      "if index(g:polyglot_disabled, '#{name}') == -1\n"
+    end
+
+    filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
+
+    for filetype in filetypes
+      syntax = filetype["syntax"] ? " syntax=#{filetype["syntax"]}" : ""
+      set_command = package.fetch("custom_set", "set ft=#{filetype.fetch("name")}#{syntax}")
+
+      linguist = filetype["linguist"] ? languages.fetch(filetype["linguist"]) : {}
+      extensions = filetype["extensions"] || linguist.fetch("extensions", []).map { |e| e[1..] }
+      extensions = (extensions | filetype.fetch("extra_extensions", [])) - filetype.fetch("ignored_extensions", [])
+      filenames = filetype["filenames"] || linguist.fetch("filenames", [])
+      filenames = (filenames | filetype.fetch("extra_filenames", [])) - filetype.fetch("ignored_filenames", [])
+
+
+      for extension in extensions.sort
+        outer_filetype = filetype["outer_filetype"]
+        if outer_filetype
+          output << "  au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}"
+          output << "  au BufReadPre *.*#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}"
+        end
+        output << "  au BufNewFile,BufRead *.#{extension} #{set_command}\n"
+      end
+
+      for filename in filenames.sort
+        if filename[0] == "."
+          filename = "{.,}" + filename[1..]
+        end
+        output << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+      end
+    end
+
+    output << "endif\n\n"
+  end
+
+  output << <<~EOS
+    " restore Vi compatibility settings
+    let &cpo = s:cpo_save
+    unlet s:cpo_save
+  EOS
+
+  File.write('ftdetect/polyglot.vim', output)
+end
+
 download
 extract
+generate_ftdetect
 puts(" Bye! Have a wonderful time!")
 FileUtils.rm_rf("tmp")

build.py

@@ -1,269 +0,0 @@
-#!/usr/bin/env python3
-
-import yaml
-import urllib.request as request
-
-url = 'https://raw.githubusercontent.com/github/linguist/master/lib/linguist/languages.yml'
-data = yaml.safe_load(request.urlopen(url))
-
-lines = []
-
-def language(name,
-             filetype=None,
-             polyglot=None,
-             extensions=None,
-             filenames=None,
-             syntax=None,
-             outer_filetype=None,
-             custom_set=None,
-             compound=False,
-             extra_extensions=[],
-             extra_filenames=[],
-             ignored_extensions=[]
-):
-    language = data.get(name, {})
-    filetype_name = filetype or name.lower().replace(" ", "")
-    polyglot_name = polyglot or filetype_name
-    lines.append(f"if index(g:polyglot_disabled, '{polyglot_name}') == -1")
-    if syntax != None:
-        syntax = " syntax=" + syntax
-    else:
-        syntax = ""
-    if extensions == None:
-        extensions = language.get("extensions", [])
-    if filenames == None:
-        filenames = language.get("filenames", [])
-    if custom_set == None:
-        custom_set = f"set ft={filetype_name}{syntax}"
-    for ext in sorted(list(set(extensions + extra_extensions) - set(ignored_extensions))):
-        if outer_filetype != None:
-          lines.append(f"  au BufNewFile *.*{ext} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | {outer_filetype}")
-          lines.append(f"  au BufReadPre *.*{ext} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | {outer_filetype}")
-        lines.append(f"  au BufNewFile,BufRead *{ext} {custom_set}")
-    for fn in sorted(filenames + extra_filenames):
-        if fn[0] == ".":
-            fn = "{.,}" + fn[1:]
-        lines.append(f"  au BufNewFile,BufRead {fn} {custom_set}")
-    lines.append("endif")
-    lines.append("")
-
-
-lines.append("""" don't spam the user when Vim is started in Vi compatibility mode
-let s:cpo_save = &cpo
-set cpo&vim
-
-if !exists('g:polyglot_disabled')
-  let g:polyglot_disabled = []
-endif
-
-function! s:SetDefault(name, value)
-  if !exists(a:name)
-    let {a:name} = a:value
-  endif
-endfunction
-
-call s:SetDefault('g:markdown_enable_spell_checking', 0)
-call s:SetDefault('g:markdown_enable_input_abbreviations', 0)
-call s:SetDefault('g:markdown_enable_mappings', 0)
-
-" Enable jsx syntax by default
-call s:SetDefault('g:jsx_ext_required', 0)
-
-" Make csv loading faster
-call s:SetDefault('g:csv_start', 1)
-call s:SetDefault('g:csv_end', 2)
-
-" Disable json concealing by default
-call s:SetDefault('g:vim_json_syntax_conceal', 0)
-
-call s:SetDefault('g:filetype_euphoria', 'elixir')
-
-if !exists('g:python_highlight_all')
-  call s:SetDefault('g:python_highlight_builtins', 1)
-  call s:SetDefault('g:python_highlight_builtin_objs', 1)
-  call s:SetDefault('g:python_highlight_builtin_types', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs', 1)
-  call s:SetDefault('g:python_highlight_builtin_funcs_kwarg', 1)
-  call s:SetDefault('g:python_highlight_exceptions', 1)
-  call s:SetDefault('g:python_highlight_string_formatting', 1)
-  call s:SetDefault('g:python_highlight_string_format', 1)
-  call s:SetDefault('g:python_highlight_string_templates', 1)
-  call s:SetDefault('g:python_highlight_indent_errors', 1)
-  call s:SetDefault('g:python_highlight_space_errors', 1)
-  call s:SetDefault('g:python_highlight_doctests', 1)
-  call s:SetDefault('g:python_highlight_func_calls', 1)
-  call s:SetDefault('g:python_highlight_class_vars', 1)
-  call s:SetDefault('g:python_highlight_operators', 1)
-  call s:SetDefault('g:python_highlight_file_headers_as_comments', 1)
-  call s:SetDefault('g:python_slow_sync', 1)
-endif
-""")
-
-language("ASL", polyglot="acpiasl", extensions=[".asl", ".dsl"])
-language("API Blueprint")
-language("AppleScript")
-language("Processing", filetype="arduino", extra_extensions=[".ino"])
-language("AsciiDoc")
-language("Blade")
-language("Caddyfile", extensions=["Caddyfile"])
-language("Carp", extensions=[".carp"])
-language("CoffeeScript", polyglot="coffee-script", filetype="coffee", extra_extensions=[".coffeekup", '.ck'])
-language("Literate CoffeeScript", polyglot="coffee-script", filetype="litcoffee", extra_extensions=[".coffee.md"])
-language("Clojure")
-language("CQL", extensions=[".cql"])
-language("Cryptol", extensions=[".cry", ".cyl", ".lcry", ".lcyl"])
-language("Crystal", extra_filenames=["Projectfile"])
-language("HTML+ECR", polyglot="crystal", filetype="ecrystal")
-language("CSV", extra_extensions=[".tsv", ".dat", ".tab"])
-language("Gherkin", filetype="cucumber", extra_extensions=[".story"])
-language("Cue", filetype="cuesheet", extensions=[".cue"], polyglot="cue")
-language("Dart")
-language("Dhall")
-language("D", polyglot="dlang")
-language("D", polyglot="dlang", filetype="dcov", extensions=[".lst"])
-language("D", polyglot="dlang", filetype="dd", extensions=[".dd"])
-language("D", polyglot="dlang", filetype="ddoc", extensions=[".ddoc"])
-language("D", polyglot="dlang", filetype="dsdl", extensions=[".sdl"])
-language("Dockerfile", extra_extensions=[".dock", ".Dockerfile"], extra_filenames=["dockerfile", "Dockerfile*"], filetype="Dockerfile", polyglot="dockerfile")
-language("Dockerfile", extensions=[], filenames=["docker-compose*.yaml", "docker-compose*.yml"], filetype="yaml.docker-compose", polyglot="dockerfile")
-language("Elixir")
-language("HTML+EEX", polyglot="elixir", filetype="elixir", extra_extensions=[".leex"])
-language("Elm")
-language("EmberScript", filetype="ember-script", polyglot="emberscript")
-language("Emblem", extensions=[".emblem"], filetype="emblem")
-language("Erlang", extra_extensions=[".app", ".yaws"])
-language("Ferm", extensions=[".ferm"], filenames=["ferm.conf"], filetype="ferm")
-language("fish")
-language("YAML", extra_filenames=["fish_history", "fish_read_history"])
-language("Flatbuffers", extensions=[".fbs"], filetype="fbs", polyglot="flatbuffers")
-language("GDScript", filetype="gdscript3", polyglot="gdscript")
-language("GLSL", extra_extensions=[".comp"])
-language("F#", polyglot="fsharp", filetype="fsharp")
-language("Git Config", polyglot="git", filetype="gitconfig", extra_filenames=["*.git/config", "*/.config/git/config", "*.git/modules/**/config", "gitconfig"])
-language("Git Rebase", polyglot="git", filetype="gitrebase", filenames=["git-rebase-todo"])
-language("Git Send Email", polyglot="git", filetype="gitsendemail", filenames=[".gitsendemail.*"])
-language("Git Commit", polyglot="git", filetype="gitcommit", filenames=["COMMIT_EDIT_MSG", "TAG_EDIT_MSG", "MERGE_MSG", "MSG"])
-language("Gnu MathProg", polyglot="gmpl", filetype="gmpl", extensions=[".mod"])
-language("Go")
-language("Go Mod", filetype="gomod", filenames=["go.mod"], polyglot="go")
-language("Go Template", filetype="gohtmltmpl", extensions=[".tmpl"], polyglot="go")
-language("Assembly", filetype="asm", polyglot="assembly")
-language("GraphQL")
-language("Gradle", filetype="groovy", polyglot="gradle")
-language("Haml", extra_extensions=[".hamlc", ".hamlbars"])
-language("Handlebars", filetype="mustache", polyglot="handlebars", extra_extensions=[".hulk", ".hjs", ".mustache", ".njk"])
-language("HTML+Django", polyglot="jinja", filetype="jinja.html", ignored_extensions=[".mustache", ".njk"], extra_extensions=[".j2"])
-language("HAProxy")
-language("Haskell", extra_extensions=[".bpk", ".hsig"])
-language("Haxe")
-language("HCL", extra_extensions=[".nomad"], extra_filenames=["Appfile"])
-language("Helm", extra_filenames=["*/templates/*.yaml", "*/templates/*.tpl"])
-language("HiveQL", polyglot="hive", filetype="hive")
-language("I3", extensions=[".i3.config"], filenames=["i3.config"], filetype="i3config", polyglot="i3")
-language("HiveQL", polyglot="hive", filetype="hive")
-language("iCalendar", polyglot="icalendar", filetype="icalendar", extensions=[".ics"])
-language("Idris", extra_filenames=["idris-response"])
-language("Ion", extensions=[".ion"], filenames=["~/.config/ion/initrc"])
-language("JavaScript")
-language("Flow", polyglot="javascript", filetype="flow", extensions=[".flow"])
-language("Jenkinsfile", polyglot="jenkins", extensions=[".jenkinsfile", ".Jenkinsfile"], filenames=["Jenkinsfile*"], filetype="Jenkinsfile")
-language("JSON5")
-language("JSON", extra_extensions=[".jsonp", ".template"])
-language("EJS", filetype="jst", extra_extensions=[".jst", ".djs", ".hamljs", ".ect"])
-language("JSX", filetype="javascriptreact", polyglot="jsx")
-language("Julia")
-language("Kotlin")
-language("Ledger", extensions=[".ldg", ".ledger", ".journal"])
-language("Less")
-language("LilyPond")
-language("LiveScript")
-language("LLVM")
-language("Tablegen", polyglot="llvm", extensions=[".td"], filetype="tablegen")
-language("Mako", outer_filetype="let b:mako_outer_lang = &filetype")
-language("Log", extensions=[".log"], filenames=["*_log"])
-language("Markdown", ignored_extensions=[".mdx"])
-language("Mdx", extensions=[".mdx"], polyglot="mdx", filetype="markdown.mdx")
-language("Mathematica", filetype="mma")
-language("Meson")
-language("Dosini", extensions=[".wrap"], filetype="dosini", polyglot="meson")
-language("MoonScript", filetype="moon", polyglot="moon")
-language("Nginx", extra_extensions=[".nginx"], extra_filenames=["*/etc/nginx/*", "*/usr/local/nginx/conf/*", "*/nginx/*.conf", "nginx*.conf",  "*nginx.conf"])
-language("Nim")
-language("Nix")
-language("OCaml", extra_extensions=[".mlt", ".mlp", ".mlip", ".mli.cppo", ".ml.cppo"])
-language("OMake", extensions=[".om"], filenames=["OMakefile", "OMakeroot", "Omakeroot.in"], polyglot="ocaml", filetype="omake")
-language("OPam", extensions=[".opam", ".opam.template"], filenames=["opam"], filetype="opam", polyglot="ocaml")
-language("Oasis", filenames=["_oasis"], polyglot="ocaml", filetype="oasis")
-language("OpenCL")
-language("Perl")
-language("PLpgSQL", filetype="sql", ignored_extensions=[".sql"], custom_set="let b:sql_type_override='pgsql' | set ft=sql", polyglot="pgsql")
-language("PlantUML", extra_extensions=[".uml", ".pu"])
-language("Pony")
-language("PowerShell", extra_extensions=[".pssc"])
-language("Ps1XML", extensions=[".ps1xml"], polyglot="powershell", filetype="ps1xml")
-language("Protocol Buffer", polyglot="protobuf", filetype="proto")
-language("Pug")
-language("Puppet")
-language("Embedded Puppet", polyglot="puppet", filetype="embeddedpuppet", extensions=[".epp"])
-language("PureScript")
-language("QMake")
-language("QML")
-language("Racket")
-language("Raku", extra_extensions=[".rakudoc", ".rakutest", ".raku", ".rakumod", ".pod6", ".t6"])
-language("RAML")
-language("HTML+Razor", filetype="razor", polyglot="razor")
-language("Reason")
-language("Merlin", filetype="merlin", polyglot="razor", filenames=[".merlin"])
-language("Ruby", extra_extensions=[".rxml", ".rjs", ".rant", ".axlsx", ".cap", ".opal"], extra_filenames=["Rantfile", ".autotest", "Cheffile", "KitchenSink", "Routefile"])
-language("HTML+ERB", polyglot="ruby", filetype="eruby", extra_extensions=[".rhtml"])
-# Needs to be after ruby
-language("RSpec", filenames=["*_spec.rb"], polyglot="rspec", filetype="ruby", syntax="rspec")
-language("Rust")
-language("Scala", ignored_extensions=[".sbt"])
-language("Scala SBT", filetype="sbt.scala", extensions=[".sbt"], polyglot="scala")
-language("SCSS")
-language("Slim")
-language("Slime", extensions=[".slime"])
-language("SMT", filetype="smt2")
-language("Solidity", extra_extensions=[".sol"])
-language("Stylus", extra_extensions=[".stylus"])
-language("Svelte")
-language("Swift")
-language("Sxhkd", extensions=[".sxhkdrc"], filetype="sxhkdrc", polyglot="sxhkd")
-language("Systemd", extensions=[".automount", ".mount", ".path", ".service", ".socket", ".swap", ".target", ".timer"])
-language("HCL", filetype="terraform", polyglot="terraform")
-language("Textile")
-language("Thrift")
-language("Tmux", filenames=[".tmux.conf"])
-language("TOML", extra_filenames=["Pipfile", "*/.cargo/config", "*/.cargo/credentials"])
-language("TPTP", extensions=[".p", ".tptp", ".ax"])
-language("Twig", ignored_extensions=[".xml.twig"], filetype="html.twig", polyglot="twig")
-language("Twig XML", extensions=[".xml.twig"], filetype="xml.twig", polyglot="twig")
-language("TypeScript")
-language("TSX", filetype="typescriptreact", polyglot="typescript")
-language("XML", extra_extensions=[".cdxml"], ignored_extensions=[".ts", ".tsx"])
-language("V")
-language("Vala", extra_extensions=[".valadoc"])
-language("Visual Basic .NET", filetype="vbnet", polyglot="vbnet")
-language("VCL")
-language("Vifm", extensions=[".vifm"], filenames=["vifmrc", "*vifm/colors/*"])
-language("Vifm Rename", filetype="vifm-rename", filenames=["vifm.rename*"], polyglot="vifm")
-language("Velocity", extensions=[".vm"], filetype="velocity")
-language("Vue", extra_extensions=[".wpy"])
-language("XDC", extensions=[".xdc"])
-language("Zig", extra_extensions=[".zir"])
-language("Zir", extensions=[".zir"], polyglot="zig", filetype="zir")
-language("Jsonnet")
-language("Fennel", extensions=[".fnl"])
-language("mcfunction")
-language("JSONiq", extra_filenames=[".jqrc"], filetype="jq", polyglot="jq")
-language("Requirements", extensions=[".pip"], filenames=["*requirements.{txt,in}", "*require.{txt,in}", "constraints.{txt,in}"])
-
-lines.append('" restore Vi compatibility settings')
-lines.append('let &cpo = s:cpo_save')
-lines.append('unlet s:cpo_save')
-
-f = open("ftdetect/polyglot.vim", "w")
-f.write("\n".join(lines))
-f.close()
-

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
+if index(g:polyglot_disabled, 'cmake') == -1
-  au BufNewFile,BufRead *.cql set ft=cql
+  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, '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
-endif
-
-if index(g:polyglot_disabled, 'go') == -1
   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
+  au BufNewFile,BufRead i3config set ft=i3config
-
-if index(g:polyglot_disabled, 'hive') == -1
-  au BufNewFile,BufRead *.hql set ft=hive
-  au BufNewFile,BufRead *.q set ft=hive
 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,26 +550,43 @@ endif
 
 if index(g:polyglot_disabled, 'llvm') == -1
   au BufNewFile,BufRead *.ll set ft=llvm
-endif
-
-if index(g:polyglot_disabled, 'llvm') == -1
   au BufNewFile,BufRead *.td set ft=tablegen
 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
-endif
-
 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
+endif
+
+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
   au BufNewFile,BufRead *.markdown set ft=markdown
   au BufNewFile,BufRead *.md set ft=markdown
@@ -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
+if index(g:polyglot_disabled, 'octave') == -1
-  au BufNewFile,BufRead _oasis set ft=oasis
+  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
+if index(g:polyglot_disabled, 'rst') == -1
-  au BufNewFile,BufRead {.,}merlin set ft=merlin
+  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
+if index(g:polyglot_disabled, 'unison') == -1
-  au BufNewFile,BufRead *.tsx set ft=typescriptreact
+  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
+if index(g:polyglot_disabled, 'xsl') == -1
-  au BufNewFile,BufRead *.v set ft=v
+  au BufNewFile,BufRead *.xsl set ft=xsl
+  au BufNewFile,BufRead *.xslt set ft=xsl
 endif
 
-if index(g:polyglot_disabled, 'vala') == -1
+if index(g:polyglot_disabled, 'yaml') == -1
-  au BufNewFile,BufRead *.vala set ft=vala
+  au BufNewFile,BufRead *.mir set ft=yaml
-  au BufNewFile,BufRead *.valadoc set ft=vala
+  au BufNewFile,BufRead *.reek set ft=yaml
-  au BufNewFile,BufRead *.vapi set ft=vala
+  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, 'vbnet') == -1
+if index(g:polyglot_disabled, 'ansible') == -1
-  au BufNewFile,BufRead *.vb set ft=vbnet
+  au BufNewFile,BufRead *.asl set ft=yaml.ansible
-  au BufNewFile,BufRead *.vbhtml set ft=vbnet
+  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, 'vcl') == -1
+if index(g:polyglot_disabled, 'helm') == -1
-  au BufNewFile,BufRead *.vcl set ft=vcl
+  au BufNewFile,BufRead */templates/*.tpl set ft=helm
+  au BufNewFile,BufRead */templates/*.yaml set ft=helm
 endif
 
-if index(g:polyglot_disabled, 'vifm') == -1
+if index(g:polyglot_disabled, 'zephir') == -1
-  au BufNewFile,BufRead *.vifm set ft=vifm
+  au BufNewFile,BufRead *.zep set ft=zephir
-  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
-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, '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
+unlet s:cpo_save

packages.yaml

@@ -3,10 +3,9 @@ name: acpiasl
 remote: martinlroth/vim-acpi-asl
 filetypes:
 - name: asl
-  linguist: ASL
+  extensions:
----
+  - asl
-name: ansible
+  - dsl
-remote: pearofducks/ansible-vim
 ---
 name: apiblueprint
 remote: sheerun/apiblueprint.vim
@@ -37,6 +36,9 @@ filetypes:
 ---
 name: autohotkey
 remote: hnamikaw/vim-autohotkey
+filetypes:
+- name: autohotkey
+  linguist: AutoHotkey
 ---
 name: blade
 remote: jwalton512/vim-blade
@@ -44,29 +46,32 @@ filetypes:
 - name: blade
   linguist: Blade
 ---
-name: brewfile
+name: c/c++
-remote: bfontaine/Brewfile.vim
+remote: vim-jp/vim-cpp
+filetypes:
+- name: c
+  linguist: C
+- name: cpp
+  linguist: C++
 ---
 name: c++11
 remote: octol/vim-cpp-enhanced-highlight
----
+# It just adds after files for c / c++
-name: c/c++
+filetypes: []
-remote: vim-jp/vim-cpp
 ---
 name: caddyfile
 remote: isobit/vim-caddyfile
 filetypes:
 - name: caddyfile
-  linguist: Caddyfile
+  filenames:
+  - Caddyfile
 ---
 name: carp
 remote: hellerve/carp-vim
 filetypes:
 - name: carp
-  linguist: Carp
+  extensions:
----
+  - carp
-name: cjsx
-remote: mtscout6/vim-cjsx
 ---
 name: clojure
 remote: guns/vim-clojure-static
@@ -76,6 +81,9 @@ filetypes:
 ---
 name: cmake
 remote: pboettch/vim-cmake-syntax
+filetypes:
+- name: cmake
+  linguist: CMake
 ---
 name: coffee-script
 remote: kchmck/vim-coffee-script
@@ -91,17 +99,20 @@ filetypes:
   extra_extensions:
   - coffee.md
 ---
-name: cql
+name: cjsx
-remote: elubow/cql-vim
+remote: mtscout6/vim-cjsx
-filetypes:
+# it just adds after file for .coffee
-- name: cql
+filetypes: []
-  linguist: CQL
 ---
 name: cryptol
 remote: victoredwardocallaghan/cryptol.vim
 filetypes:
 - name: cryptol
-  linguist: Cryptol
+  extensions:
+  - cry
+  - cyl
+  - lcry
+  - lcyl
 ---
 name: crystal
 remote: rhysd/vim-crystal
@@ -135,7 +146,8 @@ name: cue
 remote: mgrabovsky/vim-cuesheet
 filetypes:
 - name: cuesheet
-  linguist: Cue
+  extensions:
+  - cue
 ---
 name: dart
 remote: dart-lang/dart-vim-plugin
@@ -156,12 +168,20 @@ filetypes:
   linguist: D
 - name: dcov
   linguist: D
+  extensions:
+  - lst
 - name: dd
   linguist: D
+  extensions:
+  - dd
 - name: ddoc
   linguist: D
+  extensions:
+  - ddoc
 - name: dsdl
   linguist: D
+  extensions:
+  - sdl
 ---
 name: dockerfile
 remote: ekalinin/Dockerfile.vim
@@ -175,7 +195,9 @@ filetypes:
   - dockerfile
   - Dockerfile*
 - name: yaml.docker-compose
-  linguist: Dockerfile
+  filenames:
+  - 'docker-compose*.yaml'
+  - 'docker-compose*.yml'
 ---
 name: elixir
 remote: elixir-lang/vim-elixir
@@ -203,7 +225,8 @@ name: emblem
 remote: yalesov/vim-emblem
 filetypes:
 - name: emblem
-  linguist: Emblem
+  extensions:
+  - emblem
 ---
 name: erlang
 remote: vim-erlang/vim-erlang-runtime
@@ -218,13 +241,17 @@ name: fennel
 remote: bakpakin/fennel.vim
 filetypes:
 - name: fennel
-  linguist: Fennel
+  extensions:
+  - fnl
 ---
 name: ferm
 remote: vim-scripts/ferm.vim
 filetypes:
 - name: ferm
-  linguist: Ferm
+  extensions:
+  - ferm
+  filenames:
+  - ferm.conf
 ---
 name: fish
 remote: georgewitteman/vim-fish
@@ -236,7 +263,8 @@ name: flatbuffers
 remote: dcharbon/vim-flatbuffers
 filetypes:
 - name: fbs
-  linguist: Flatbuffers
+  extensions:
+  - fbs
 ---
 name: fsharp
 remote: ionide/Ionide-vim
@@ -263,11 +291,17 @@ filetypes:
   - "*.git/modules/**/config"
   - gitconfig
 - name: gitrebase
-  linguist: Git Rebase
+  filenames:
+  - git-rebase-todo
 - name: gitsendemail
-  linguist: Git Send Email
+  filenames:
+  - ".gitsendemail.*"
 - name: gitcommit
-  linguist: Git Commit
+  filenames:
+  - COMMIT_EDIT_MSG
+  - TAG_EDIT_MSG
+  - MERGE_MSG
+  - MSG
 ---
 name: glsl
 remote: tikhomirov/vim-glsl
@@ -282,10 +316,14 @@ name: gmpl
 remote: maelvalais/gmpl.vim
 filetypes:
 - name: gmpl
-  linguist: Gnu MathProg
+  extensions:
+  - mod
 ---
 name: gnuplot
 remote: vim-scripts/gnuplot-syntax-highlighting
+filetypes:
+- name: gnuplot
+  linguist: Gnuplot
 ---
 name: go
 remote: fatih/vim-go
@@ -294,9 +332,11 @@ filetypes:
 - name: go
   linguist: Go
 - name: gomod
-  linguist: Go Mod
+  filenames:
+  - go.mod
 - name: gohtmltmpl
-  linguist: Go Template
+  extensions:
+  - tmpl
 ---
 name: graphql
 remote: jparise/vim-graphql
@@ -362,15 +402,6 @@ filetypes:
   extra_filenames:
   - Appfile
 ---
-name: helm
-remote: towolf/vim-helm
-filetypes:
-- name: helm
-  linguist: Helm
-  extra_filenames:
-  - "*/templates/*.yaml"
-  - "*/templates/*.tpl"
----
 name: hive
 remote: zebradil/hive.vim
 filetypes:
@@ -381,18 +412,27 @@ filetypes:
 ---
 name: html5
 remote: othree/html5.vim
+filetypes:
+- name: html
+  linguist: HTML
 ---
 name: i3
 remote: mboughaba/i3config.vim
 filetypes:
 - name: i3config
-  linguist: I3
+  filenames:
+  - i3.config
+  - i3config
+  extensions:
+  - i3.config
+  - i3config
 ---
 name: icalendar
 remote: chutzpah/icalendar.vim
 filetypes:
 - name: icalendar
-  linguist: iCalendar
+  extensions:
+  - ics
 ---
 name: idris
 remote: idris-hackers/idris-vim
@@ -406,7 +446,10 @@ name: ion
 remote: vmchale/ion-vim
 filetypes:
 - name: ion
-  linguist: Ion
+  extensions:
+  - ion
+  filenames:
+  - '~/.config/ion/initrc'
 ---
 name: javascript
 remote: pangloss/vim-javascript
@@ -415,13 +458,18 @@ filetypes:
 - name: javascript
   linguist: JavaScript
 - name: flow
-  linguist: Flow
+  extensions:
+  - flow
 ---
 name: jenkins
 remote: martinda/Jenkinsfile-vim-syntax
 filetypes:
 - name: Jenkinsfile
-  linguist: Jenkinsfile
+  extensions:
+  - jenkinsfile
+  - Jenkinsfile
+  filenames:
+  - Jenkinsfile*
 ---
 name: jinja
 remote: lepture/vim-jinja
@@ -498,7 +546,10 @@ remote: ledger/vim-ledger
 dirs: :basic
 filetypes:
 - name: ledger
-  linguist: Ledger
+  extensions:
+  - ldg
+  - ledger
+  - journal
 ---
 name: less
 remote: groenewege/vim-less
@@ -525,16 +576,23 @@ filetypes:
 - name: llvm
   linguist: LLVM
 - name: tablegen
-  linguist: Tablegen
+  extensions:
+  - td
 ---
 name: log
 remote: MTDL9/vim-log-highlighting
 filetypes:
 - name: log
-  linguist: Log
+  extensions:
+  - log
+  filenames:
+  - '*_log'
 ---
 name: lua
 remote: tbastos/vim-lua
+filetypes:
+- name: lua
+  linguist: Lua
 ---
 name: mako
 remote: sophacles/vim-bundle-mako
@@ -543,6 +601,12 @@ filetypes:
   linguist: Mako
   outer_filetype: let b:mako_outer_lang = &filetype
 ---
+name: mathematica
+remote: voldikss/vim-mma
+filetypes:
+- name: mma
+  linguist: Mathematica
+---
 name: markdown
 remote: plasticboy/vim-markdown
 dirs: :noafter
@@ -550,19 +614,15 @@ filetypes:
 - name: markdown
   linguist: Markdown
   ignored_extensions:
+  # Handled by mdx extension
   - mdx
 ---
-name: mathematica
-remote: voldikss/vim-mma
-filetypes:
-- name: mma
-  linguist: Mathematica
----
 name: mdx
 remote: jxnblk/vim-mdx-js
 filetypes:
 - name: markdown.mdx
-  linguist: Mdx
+  extensions:
+  - mdx
 ---
 name: meson
 remote: mesonbuild/meson:data/syntax-highlighting/vim
@@ -571,7 +631,8 @@ filetypes:
 - name: meson
   linguist: Meson
 - name: dosini
-  linguist: Dosini
+  extensions:
+  - wrap
 ---
 name: moonscript
 remote: leafo/moonscript-vim
@@ -590,7 +651,7 @@ filetypes:
   - "*/etc/nginx/*"
   - "*/usr/local/nginx/conf/*"
   - "*/nginx/*.conf"
-  - "nginx*.conf"
+  - nginx*.conf
   - "*nginx.conf"
 ---
 name: nim
@@ -608,6 +669,9 @@ filetypes:
 ---
 name: objc
 remote: b4winckler/vim-objc
+filetypes:
+- name: objc
+  linguist: Objective-C
 ---
 name: ocaml
 remote: rgrinberg/vim-ocaml
@@ -621,14 +685,28 @@ filetypes:
   - mli.cppo
   - ml.cppo
 - name: omake
-  linguist: OMake
+  extensions:
+  - om
+  filenames:
+  - OMakefile
+  - OMakeroot
+  - Omakeroot.in
 - name: opam
-  linguist: OPam
+  extensions:
+  - opam
+  - opam.template
+  filenames:
+  - opam
 - name: oasis
-  linguist: Oasis
+  filenames:
+  - _oasis
 ---
 name: octave
 remote: McSinyx/vim-octave
+filetypes:
+- name: octave
+  extensions:
+  - oct
 ---
 name: opencl
 remote: petRUShka/vim-opencl
@@ -642,6 +720,15 @@ filetypes:
 - name: perl
   linguist: Perl
 ---
+name: sql
+remote: shmup/vim-sql-syntax
+filetypes:
+- name: sql
+  linguist: PLSQL
+  ignored_extensions:
+  # Handled by cql plugin
+  - cql
+---
 name: pgsql
 remote: lifepillar/pgsql.vim
 filetypes:
@@ -651,8 +738,18 @@ filetypes:
   - sql
   custom_set: let b:sql_type_override='pgsql' | set ft=sql
 ---
+name: cql
+remote: elubow/cql-vim
+filetypes:
+- name: cql
+  extensions:
+  - cql
+---
 name: php
 remote: StanAngeloff/php.vim
+filetypes:
+- name: php
+  linguist: PHP
 ---
 name: plantuml
 remote: aklt/plantuml-syntax
@@ -677,7 +774,8 @@ filetypes:
   extra_extensions:
   - pssc
 - name: ps1xml
-  linguist: Ps1XML
+  extensions:
+  - ps1xml
 ---
 name: protobuf
 remote: uarun/vim-protobuf
@@ -697,7 +795,8 @@ filetypes:
 - name: puppet
   linguist: Puppet
 - name: embeddedpuppet
-  linguist: Embedded Puppet
+  extensions:
+  - epp
 ---
 name: purescript
 remote: purescript-contrib/purescript-vim
@@ -705,14 +804,32 @@ filetypes:
 - name: purescript
   linguist: PureScript
 ---
-name: python-compiler
+name: python
-remote: aliev/vim-compiler-python
+remote: vim-python/python-syntax
+filetypes:
+- name: python
+  linguist: Python
 ---
 name: python-indent
 remote: Vimjas/vim-python-pep8-indent
+# just adds to python
+filetypes: []
 ---
-name: python
+name: python-compiler
-remote: vim-python/python-syntax
+remote: aliev/vim-compiler-python
+# just adds to python
+filetypes: []
+---
+name: requirements
+remote: raimon49/requirements.txt.vim
+filetypes:
+- name: requirements
+  extensions:
+  - pip
+  filenames:
+  - '*requirements.{txt,in}'
+  - '*require.{txt,in}'
+  - 'constraints.{txt,in}'
 ---
 name: qmake
 remote: artoj/qmake-syntax-vim
@@ -729,6 +846,18 @@ filetypes:
 name: r-lang
 remote: vim-scripts/R.vim
 dirs: :basic
+filetypes:
+- name: r
+  linguist: R
+  extra_extensions:
+  - s
+  - S
+  ignored_extensions:
+  # handled by rhelp
+  - rd
+- name: rhelp
+  extensions:
+  - rd
 ---
 name: racket
 remote: wlangstroth/vim-racket
@@ -738,6 +867,9 @@ filetypes:
 ---
 name: ragel
 remote: jneen/ragel.vim
+filetypes:
+- name: ragel
+  linguist: Ragel
 ---
 name: raku
 remote: Raku/vim-raku
@@ -763,8 +895,6 @@ remote: adamclerk/vim-razor
 filetypes:
 - name: razor
   linguist: HTML+Razor
-- name: merlin
-  linguist: Merlin
 ---
 name: reason
 remote: reasonml-editor/vim-reason-plus
@@ -772,21 +902,11 @@ filetypes:
 - name: reason
   linguist: Reason
 ---
-name: requirements
-remote: raimon49/requirements.txt.vim
-filetypes:
-- name: requirements
-  linguist: Requirements
----
-name: rspec
-remote: keith/rspec.vim
-filetypes:
-- name: ruby
-  linguist: RSpec
-  syntax: rspec
----
 name: rst
 remote: marshallward/vim-restructuredtext
+filetypes:
+- name: rst
+  linguist: reStructuredText
 ---
 name: ruby
 remote: vim-ruby/vim-ruby
@@ -806,29 +926,55 @@ filetypes:
   - Cheffile
   - KitchenSink
   - Routefile
+  ignored_filenames:
+  # Handled by brewfile extension
+  - Brewfile
 - name: eruby
   linguist: HTML+ERB
   extra_extensions:
   - rhtml
 ---
+name: rspec
+remote: keith/rspec.vim
+filetypes:
+- name: ruby
+  syntax: rspec
+  filenames:
+  - '*_spec.rb'
+---
+name: yard
+remote: sheerun/vim-yardoc
+# just adds to ruby
+filetypes: []
+---
+name: brewfile
+remote: bfontaine/Brewfile.vim
+filetypes:
+- name: brewfile
+  filenames:
+  - Brewfile
+---
 name: rust
 remote: rust-lang/rust.vim
 filetypes:
 - name: rust
   linguist: Rust
 ---
-name: sbt
-remote: derekwyatt/vim-sbt
----
 name: scala
 remote: derekwyatt/vim-scala
 filetypes:
 - name: scala
   linguist: Scala
   ignored_extensions:
+  # handled by sbt plugin
   - sbt
+---
+name: sbt
+remote: derekwyatt/vim-sbt
+filetypes:
 - name: sbt.scala
-  linguist: Scala SBT
+  extensions:
+  - sbt
 ---
 name: scss
 remote: cakebaker/scss-syntax.vim
@@ -838,6 +984,36 @@ filetypes:
 ---
 name: sh
 remote: arzg/vim-sh
+filetypes:
+- name: sh
+  linguist: Shell
+  ignored_extensions:
+  - zsh
+  ignored_filenames:
+  - '.zshrc'
+  - '.zshenv'
+  - '.zlogin'
+  - '.zprofile'
+  - '.zlogout'
+  - 'zshrc'
+  - 'zshenv'
+  - 'zlogin'
+  - 'zprofile'
+  - 'zlogout'
+- name: zsh
+  extensions:
+  - zsh
+  filenames:
+  - '.zshrc'
+  - '.zshenv'
+  - '.zlogin'
+  - '.zprofile'
+  - '.zlogout'
+---
+name: zinit
+remote: zinit-zsh/zplugin-vim-syntax
+# just adds to zsh filetype
+filetypes: []
 ---
 name: slim
 remote: slim-template/vim-slim
@@ -849,7 +1025,8 @@ name: slime
 remote: slime-lang/vim-slime-syntax
 filetypes:
 - name: slime
-  linguist: Slime
+  extensions:
+  - slime
 ---
 name: smt2
 remote: bohlender/vim-smt2
@@ -865,9 +1042,6 @@ filetypes:
   extra_extensions:
   - sol
 ---
-name: sql
-remote: shmup/vim-sql-syntax
----
 name: stylus
 remote: wavded/vim-stylus
 filetypes:
@@ -882,11 +1056,16 @@ filetypes:
 - name: svelte
   linguist: Svelte
 ---
-name: svg-indent
-remote: jasonshell/vim-svg-indent
----
 name: svg
 remote: vim-scripts/svg.vim
+filetypes:
+- name: svg
+  linguist: SVG
+---
+name: svg-indent
+remote: jasonshell/vim-svg-indent
+# just adds to svg
+filetypes: []
 ---
 name: swift
 remote: keith/swift.vim
@@ -898,13 +1077,22 @@ name: sxhkd
 remote: baskerville/vim-sxhkdrc
 filetypes:
 - name: sxhkdrc
-  linguist: Sxhkd
+  extensions:
+  - sxhkdrc
 ---
 name: systemd
 remote: wgwoods/vim-systemd-syntax
 filetypes:
 - name: systemd
-  linguist: Systemd
+  extensions:
+  - automount
+  - mount
+  - path
+  - service
+  - socket
+  - swap
+  - target
+  - timer
 ---
 name: terraform
 remote: hashivim/vim-terraform
@@ -929,10 +1117,8 @@ remote: ericpruitt/tmux.vim:vim
 dirs: :all
 filetypes:
 - name: tmux
-  linguist: Tmux
+  filenames:
----
+  - '.tmux.conf'
-name: tomdoc
-remote: wellbredgrapefruit/tomdoc.vim
 ---
 name: toml
 remote: cespare/vim-toml
@@ -948,7 +1134,10 @@ name: tptp
 remote: c-cube/vim-tptp
 filetypes:
 - name: tptp
-  linguist: TPTP
+  extensions:
+  - p
+  - tptp
+  - ax
 ---
 name: twig
 remote: lumiliet/vim-twig
@@ -958,7 +1147,8 @@ filetypes:
   ignored_extensions:
   - xml.twig
 - name: xml.twig
-  linguist: Twig XML
+  extensions:
+  - xml.twig
 ---
 name: typescript
 remote: HerringtonDarkholme/yats.vim
@@ -971,6 +1161,11 @@ filetypes:
 name: unison
 remote: unisonweb/unison@trunk:editor-support/vim
 dirs: :all
+filetypes:
+- name: unison
+  extensions:
+  - u
+  - uu
 ---
 name: v
 remote: ollykel/v-vim
@@ -1002,15 +1197,21 @@ name: vifm
 remote: vifm/vifm.vim
 filetypes:
 - name: vifm
-  linguist: Vifm
+  extensions:
+  - vifm
+  filenames:
+  - vifmrc
+  - '*vifm/colors/*'
 - name: vifm-rename
-  linguist: Vifm Rename
+  filenames:
+  - 'vifm.rename*'
 ---
 name: velocity
 remote: lepture/vim-velocity
 filetypes:
 - name: velocity
-  linguist: Velocity
+  extensions:
+  - vm
 ---
 name: vue
 remote: posva/vim-vue
@@ -1024,7 +1225,8 @@ name: xdc
 remote: amal-khailtash/vim-xdc-syntax
 filetypes:
 - name: xdc
-  linguist: XDC
+  extensions:
+  - xdc
 ---
 name: xml
 remote: amadeus/vim-xml
@@ -1037,8 +1239,11 @@ filetypes:
   - ts
   - tsx
 ---
-name: xls
+name: xsl
 remote: vim-scripts/XSLT-syntax
+filetypes:
+- name: xsl
+  linguist: XSLT
 ---
 name: yaml
 remote: stephpy/vim-yaml
@@ -1048,12 +1253,41 @@ filetypes:
   extra_filenames:
   - fish_history
   - fish_read_history
+# Ansible needs to be after YAML
 ---
-name: yard
+name: ansible
-remote: sheerun/vim-yardoc
+remote: pearofducks/ansible-vim
+filetypes:
+- name: yaml.ansible
+  extensions:
+  - asl
+  - dsl
+  filenames:
+  - playbook.ya?ml
+  - site.ya?ml
+  - main.ya?ml
+  - local.ya?ml
+  - requirements.ya?ml
+  - 'group_vars/*'
+  - 'host_vars/*'
+  - 'tasks.*.ya?ml'
+  - 'roles.*.ya?ml'
+  - 'handlers.*.ya?ml'
+# Helm needs to be after YAML
+---
+name: helm
+remote: towolf/vim-helm
+filetypes:
+- name: helm
+  filenames:
+  - "*/templates/*.yaml"
+  - "*/templates/*.tpl"
 ---
 name: zephir
 remote: xwsoul/vim-zephir
+filetypes:
+- name: zephir
+  linguist: Zephir
 ---
 name: zig
 remote: ziglang/zig.vim
@@ -1063,7 +1297,5 @@ filetypes:
   extra_extensions:
   - zir
 - name: zir
-  linguist: Zir
+  extensions:
----
+  - zir
-name: zinit
-remote: zinit-zsh/zplugin-vim-syntax

syntax/tomdoc.vim

@@ -1,22 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tomdoc') == -1
-
-syn keyword tomdocKeywords
-      \ Returns Yields Raises Examples Signature
-      \ containedin=.*Comment
-      \ contained
-
-syn match tomdocDescriptions
-      \ +\s*\(Public\|Internal\|Deprecated\):+he=e-1
-      \ containedin=.*Comment
-      \ contained
-
-syn match tomdocArguments
-      \ +\s*[A-Za-z0-9_\-&\*:]*\(\s*- \)+he=e-3
-      \ containedin=.*Comment
-      \ contained
-
-hi default link tomdocDescriptions String
-hi default link tomdocKeywords String
-hi default link tomdocArguments HELP
-
-endif

syntax/xsl.vim

@@ -1,4 +1,4 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xls') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'xsl') == -1
 
 " Vim syntax file
 " Language:	XSLT 1.0