Set indentation only locally, fixes #564

.github/ISSUE_TEMPLATE/add-language.md

@@ -2,17 +2,23 @@
 name: Add language
 about: Add support for new language
 title: ''
-labels: ''
+labels: 'enhancement'
 assignees: ''
 
 ---
 
-<!--- vim-polyglot accepts only lightweight, maintained github-hosted vim plugins -->
+**What is the name of this language in Linguist?**
+
+<!-- https://github.com/github/linguist/blob/master/lib/linguist/languages.yml -->
+
+**Link to GitHub repository of Vim plugin**
 
-**GitHub repository url**
 
 
 **Is this plugin well maintained?**
 
 
+
 **Is this plugin lightweight? (no advanced functionality, just indent and syntax support)**
+
+

.github/ISSUE_TEMPLATE/add-support-for-language.md

@@ -1,20 +0,0 @@
----
-name: Add support for language
-about: ''
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

Makefile

@@ -1,10 +1,10 @@
-.PHONY: all test dev
+.PHONY: build test dev
 
-all:
+build:
 	@ scripts/build
 
 test:
 	@ scripts/test
 
 dev:
-	@ (ls && find scripts) | DEV=1 entr bash -c 'make && make test'
+	@ echo "polyglot.vim\npackages.yaml\nheuristics.yaml\nscripts/test\nscripts/build\ntests/extensions.vim" | DEV=1 entr bash -c 'make && make test'

README.md

@@ -1,20 +1,20 @@
 ![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
 
-![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg) [![Maintenance](https://img.shields.io/maintenance/yes/2020.svg?maxAge=2592000)]()
+![build](https://github.com/sheerun/vim-polyglot/workflows/Vim%20Polyglot%20CI/badge.svg) [![Maintenance](https://img.shields.io/badge/maintained%20since-2013-yes)]()
 
 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-->195<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->201<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
 - Automatically detect indentation (includes performance-optimized version of [vim-sleuth](https://github.com/tpope/vim-sleuth))
 - Each build is tested by automated vimrunner script on CI. See `spec` directory.
 
-\*To be completely honest, optimized `ftdetect` script takes around `19ms` to load.
+\*To be completely honest, optimized `ftdetect` script takes around `20ms` to load.
 
 ## Installation
 
@@ -62,7 +62,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [ansible](https://github.com/pearofducks/ansible-vim)
 - [ant](https://github.com/vim/vim/tree/master/runtime)
 - [apache](https://github.com/vim/vim/tree/master/runtime)
-- [apiblueprint](https://github.com/sheerun/apiblueprint.vim)
+- [apiblueprint](https://github.com/kylef/apiblueprint.vim)
 - [applescript](https://github.com/mityu/vim-applescript)
 - [aptconf](https://github.com/vim/vim/tree/master/runtime)
 - [arch](https://github.com/vim/vim/tree/master/runtime)
@@ -81,6 +81,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [basic](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
+- [bzl](https://github.com/vim/vim/tree/master/runtime)
 - [c/c++](https://github.com/vim-jp/vim-cpp)
 - [caddyfile](https://github.com/isobit/vim-caddyfile)
 - [carp](https://github.com/hellerve/carp-vim)
@@ -88,6 +89,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [clojure](https://github.com/guns/vim-clojure-static)
 - [cmake](https://github.com/pboettch/vim-cmake-syntax)
 - [coffee-script](https://github.com/kchmck/vim-coffee-script)
+- [cpp-modern](https://github.com/bfrg/vim-cpp-modern)
 - [cql](https://github.com/elubow/cql-vim)
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim)
 - [crystal](https://github.com/rhysd/vim-crystal)
@@ -113,6 +115,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [fsharp](https://github.com/ionide/Ionide-vim)
 - [gdscript](https://github.com/calviken/vim-gdscript3)
 - [git](https://github.com/tpope/vim-git)
+- [gitignore](https://github.com/fszymanski/fzf-gitignore)
 - [glsl](https://github.com/tikhomirov/vim-glsl)
 - [gmpl](https://github.com/maelvalais/gmpl.vim)
 - [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting)
@@ -121,8 +124,8 @@ If you need full functionality of any plugin, please use it directly with your p
 - [graphql](https://github.com/jparise/vim-graphql)
 - [groovy](https://github.com/vim/vim/tree/master/runtime)
 - [grub](https://github.com/vim/vim/tree/master/runtime)
-- [haml](https://github.com/sheerun/vim-haml)
-- [handlebars](https://github.com/sheerun/vim-mustache-handlebars)
+- [haml](https://github.com/tpope/vim-haml)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars)
 - [haproxy](https://github.com/CH-DanReif/haproxy.vim)
 - [haskell](https://github.com/neovimhaskell/haskell-vim)
 - [haxe](https://github.com/yaymukund/vim-haxe)
@@ -131,6 +134,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [help](https://github.com/neovim/neovim/tree/master/runtime)
 - [hive](https://github.com/zebradil/hive.vim)
 - [html5](https://github.com/othree/html5.vim)
+- [htmldjango](https://github.com/vim/vim/tree/master/runtime)
 - [i3](https://github.com/mboughaba/i3config.vim)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
 - [idris2](https://github.com/edwinb/idris2-vim)
@@ -139,7 +143,6 @@ If you need full functionality of any plugin, please use it directly with your p
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
 - [javascript](https://github.com/pangloss/vim-javascript)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax)
-- [jinja](https://github.com/lepture/vim-jinja)
 - [jq](https://github.com/vito-c/jq.vim)
 - [json5](https://github.com/GutenYe/json5.vim)
 - [json](https://github.com/elzr/vim-json)
@@ -169,6 +172,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [objc](https://github.com/b4winckler/vim-objc)
 - [ocaml](https://github.com/rgrinberg/vim-ocaml)
 - [octave](https://github.com/McSinyx/vim-octave)
+- [odin](https://github.com/Tetralux/odin.vim)
 - [opencl](https://github.com/petRUShka/vim-opencl)
 - [perl](https://github.com/vim-perl/vim-perl)
 - [pgsql](https://github.com/lifepillar/pgsql.vim)
@@ -176,6 +180,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [plantuml](https://github.com/aklt/plantuml-syntax)
 - [pony](https://github.com/jakwings/vim-pony)
 - [powershell](https://github.com/PProvost/vim-ps1)
+- [prolog](https://github.com/vim/vim/tree/master/runtime)
 - [protobuf](https://github.com/uarun/vim-protobuf)
 - [pug](https://github.com/digitaltoad/vim-pug)
 - [puppet](https://github.com/rodjek/vim-puppet)
@@ -212,6 +217,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [swift](https://github.com/keith/swift.vim)
 - [sxhkd](https://github.com/baskerville/vim-sxhkdrc)
 - [systemd](https://github.com/wgwoods/vim-systemd-syntax)
+- [tads](https://github.com/vim/vim/tree/master/runtime)
 - [terraform](https://github.com/hashivim/vim-terraform)
 - [textile](https://github.com/timcharper/textile.vim)
 - [thrift](https://github.com/solarnz/thrift.vim)
@@ -234,7 +240,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [xml](https://github.com/amadeus/vim-xml)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
 - [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
-- [yard](https://github.com/sheerun/vim-yardoc)
+- [yard](https://github.com/noprompt/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir)
 - [zig](https://github.com/ziglang/zig.vim)
 - [zinit](https://github.com/zinit-zsh/zplugin-vim-syntax)
@@ -251,12 +257,20 @@ Please make sure you have `syntax on` in your `.vimrc` (or use something like [s
 Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
 
 ```vim
-let g:polyglot_disabled = ['css']
+let g:polyglot_disabled = ['markdown']
 ```
 
+The list of available languages to disable is shown above.
+
 *Please declare this variable before polyglot is loaded (at the top of .vimrc)*
 
-Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are loaded lazily, on demand.
+If you wish to use filetype detection by Vim Polyglot but you'd like to use your own syntax-highlighting plugin, you can append `.plugin` to disabled entry, like below. Disabling Vim Polyglot filetype plugin won't disable native Vim filetype plugin.
+
+```vim
+let g:polyglot_disabled = ['markdown.plugin']
+```
+
+Please note that disabling a language won't make in your vim startup any faster / slower (only for specific this specific filetype). All plugins are lazily loaded only when they are really needed. 
 
 Vim Polyglot tries to automatically detect indentation settings (just like vim-sleuth). If this feature is not working for you for some reason, please file an issue and disable it temporarily with:
 

after/syntax/c.vim

@@ -0,0 +1,74 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') == -1
+
+" ==============================================================================
+" Vim syntax file
+" Language:        C Additions
+" Original Author: Mikhail Wolfson <mywolfson@gmail.com>
+"                  http://www.vim.org/scripts/script.php?script_id=3064
+" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Website:         https://github.com/bfrg/vim-cpp-modern
+" Last Change:     Mar 14, 2020
+"
+" Extended C syntax highlighting including highlighting of user-defined
+" functions.
+"
+" This syntax file is based on:
+" https://github.com/octol/vim-cpp-enhanced-highlight
+" ==============================================================================
+
+
+" Highlight some additional keywords in the comments
+syn keyword cTodo contained BUG NOTE
+
+
+" Highlight function names
+if !get(g:, 'cpp_no_function_highlight', 0)
+    syn match cUserFunction "\<\h\w*\>\(\s\|\n\)*("me=e-1 contains=cParen,cCppParen
+    hi def link cUserFunction Function
+endif
+
+
+" Common ANSI-standard Names
+syn keyword cAnsiName
+        \ PRId8 PRIi16 PRIo32 PRIu64 PRId16 PRIi32 PRIo64 PRIuLEAST8 PRId32 PRIi64 PRIoLEAST8 PRIuLEAST16 PRId64 PRIiLEAST8 PRIoLEAST16 PRIuLEAST32 PRIdLEAST8 PRIiLEAST16 PRIoLEAST32 PRIuLEAST64 PRIdLEAST16 PRIiLEAST32 PRIoLEAST64 PRIuFAST8 PRIdLEAST32 PRIiLEAST64 PRIoFAST8 PRIuFAST16 PRIdLEAST64 PRIiFAST8 PRIoFAST16 PRIuFAST32 PRIdFAST8 PRIiFAST16 PRIoFAST32 PRIuFAST64 PRIdFAST16 PRIiFAST32 PRIoFAST64 PRIuMAX PRIdFAST32 PRIiFAST64 PRIoMAX PRIuPTR PRIdFAST64 PRIiMAX PRIoPTR PRIx8 PRIdMAX PRIiPTR PRIu8 PRIx16 PRIdPTR PRIo8 PRIu16 PRIx32 PRIi8 PRIo16 PRIu32 PRIx64 PRIxLEAST8 SCNd8 SCNiFAST32 SCNuLEAST32 PRIxLEAST16 SCNd16 SCNiFAST64 SCNuLEAST64 PRIxLEAST32 SCNd32 SCNiMAX SCNuFAST8 PRIxLEAST64 SCNd64 SCNiPTR SCNuFAST16 PRIxFAST8 SCNdLEAST8 SCNo8 SCNuFAST32 PRIxFAST16 SCNdLEAST16 SCNo16 SCNuFAST64 PRIxFAST32 SCNdLEAST32 SCNo32 SCNuMAX PRIxFAST64 SCNdLEAST64 SCNo64 SCNuPTR PRIxMAX SCNdFAST8 SCNoLEAST8 SCNx8 PRIxPTR SCNdFAST16 SCNoLEAST16 SCNx16 PRIX8 SCNdFAST32 SCNoLEAST32 SCNx32 PRIX16 SCNdFAST64 SCNoLEAST64 SCNx64 PRIX32 SCNdMAX SCNoFAST8 SCNxLEAST8 PRIX64 SCNdPTR SCNoFAST16 SCNxLEAST16 PRIXLEAST8 SCNi8 SCNoFAST32 SCNxLEAST32 PRIXLEAST16 SCNi16 SCNoFAST64 SCNxLEAST64 PRIXLEAST32 SCNi32 SCNoMAX SCNxFAST8 PRIXLEAST64 SCNi64 SCNoPTR SCNxFAST16 PRIXFAST8 SCNiLEAST8 SCNu8 SCNxFAST32 PRIXFAST16 SCNiLEAST16 SCNu16 SCNxFAST64 PRIXFAST32 SCNiLEAST32 SCNu32 SCNxMAX PRIXFAST64 SCNiLEAST64 SCNu64 SCNxPTR PRIXMAX SCNiFAST8 SCNuLEAST8 PRIXPTR SCNiFAST16 SCNuLEAST16 STDC CX_LIMITED_RANGE STDC FENV_ACCESS STDC FP_CONTRACT
+        \ errno environ and bitor not_eq xor and_eq compl or xor_eq bitand not or_eq
+
+" Booleans
+syn keyword cBoolean true false TRUE FALSE
+
+
+" Default highlighting
+hi def link cBoolean  Boolean
+hi def link cAnsiName Identifier
+
+
+" Highlight all standard C keywords as Statement
+" This is very similar to what other IDEs and editors do
+if get(g:, 'cpp_simple_highlight', 0)
+    hi link cStorageClass Statement
+    hi link cStructure    Statement
+    hi link cLabel        Statement
+endif
+
+
+" Operators
+" syn match cOperator "\(<<\|>>\|[-+*/%&^|<>!=]\)="
+" syn match cOperator "<<\|>>\|&&\|||\|++\|--\|->"
+" syn match cOperator "[.!~*&%<>^|=,+-]"
+" syn match cOperator "/[^/*=]"me=e-1
+" syn match cOperator "/$"
+" syn match cOperator "&&\|||"
+" syn match cOperator "[][]"
+
+" Preprocessor
+" syn keyword cDefined defined contained containedin=cDefine
+" hi def link cDefined cDefine
+
+" Delimiters
+" syn match cDelimiter "[();\\]"
+" hi def link cDelimiter Delimiter
+" foldmethod=syntax fix, courtesy of Ivan Freitas
+" syn match cBraces display "[{}]"
+" hi def link cBraces Delimiter
+
+endif

after/syntax/cpp.vim

@@ -0,0 +1,450 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cpp-modern') == -1
+
+" ==============================================================================
+" Vim syntax file
+" Language:        C++ (Standard library including C++11/14/17/20)
+" Original Author: Jon Haggblad <https://github.com/octol>
+" Maintainer:      bfrg <bfrg@users.noreply.github.com>
+" Website:         https://github.com/bfrg/vim-cpp-modern
+" Last Change:     Jun 23, 2020
+"
+" This syntax file is based on:
+" https://github.com/octol/vim-cpp-enhanced-highlight
+" http://www.vim.org/scripts/script.php?script_id=4293
+" ==============================================================================
+
+" Standard library {{{1
+syntax keyword cppSTLconstant
+        \ MB_CUR_MAX MB_LEN_MAX WCHAR_MAX WCHAR_MIN WEOF __STDC_UTF_16__ __STDC_UTF_32__
+
+syntax keyword cppSTLconstant
+        \ badbit digits digits10 eofbit failbit goodbit has_denorm has_denorm_loss has_infinity has_quiet_NaN has_signaling_NaN is_bounded is_exact is_iec559 is_integer is_modulo is_signed is_specialized max_exponent max_exponent10 min_exponent min_exponent10 nothrow npos radix round_style tinyness_before traps
+
+syntax keyword cppSTLVariable
+        \ cerr cin clog cout wcerr wcin wclog wcout
+
+syntax keyword cppSTLexception
+        \ bad_alloc bad_exception bad_typeid bad_cast domain_error exception failure invalid_argument length_error logic_error out_of_range overflow_error range_error runtime_error underflow_error
+
+syntax keyword cppSTLfunctional
+        \ binary_function binary_negate bit_and bit_not bit_or divides equal_to greater greater_equal less less_equal logical_and logical_not logical_or minus modulus multiplies negate not_equal_to plus unary_function unary_negate
+
+syntax keyword cppSTLios
+        \ endl ends flush resetiosflags setbase setfill setiosflags setprecision setw ws
+
+syntax keyword cppSTLios
+        \ boolalpha dec defaultfloat fixed hex hexfloat internal left noboolalpha noshowbase noshowpoint noshowpos noskipws nounitbuf nouppercase oct right scientific showbase showpoint showpos skipws unitbuf uppercase
+
+syntax keyword cppSTLtype
+        \ fmtflags iostate openmode
+
+" Some of these can be highlighted as both cppSTLios and cppSTLconstant
+" syntax keyword cppSTLconstant
+"         \ adjustfield app ate basefield binary floatfield in out trunc boolalpha dec fixed hex internal left oct right scientific showbase showpoint showpos skipws unitbuf uppercase
+
+syntax keyword cppSTLiterator
+        \ back_insert_iterator bidirectional_iterator const_iterator const_reverse_iterator forward_iterator front_insert_iterator input_iterator insert_iterator istream_iterator istreambuf_iterator iterator ostream_iterator ostreambuf_iterator output_iterator random_access_iterator raw_storage_iterator reverse_bidirectional_iterator reverse_iterator
+
+syntax keyword cppSTLiterator_tag
+        \ bidirectional_iterator_tag forward_iterator_tag input_iterator_tag output_iterator_tag random_access_iterator_tag
+
+syntax keyword cppSTLnamespace
+        \ experimental rel_ops std
+
+syntax keyword cppSTLtype
+        \ Init allocator auto_ptr basic_filebuf basic_fstream basic_ifstream basic_ios basic_iostream basic_istream basic_istringstream basic_ofstream basic_ostream basic_ostringstream basic_streambuf basic_string basic_stringbuf basic_stringstream binary_compose binder1st binder2nd bitset char_traits char_type const_mem_fun1_t const_mem_fun_ref1_t const_mem_fun_ref_t const_mem_fun_t const_pointer const_reference container_type deque difference_type div_t double_t event_callback filebuf first_type float_denorm_style float_round_style float_t fpos fstream gslice_array ifstream imaxdiv_t indirect_array int_type ios ios_base iostream istream istringstream istrstream iterator_category iterator_traits key_compare key_type ldiv_t list lldiv_t map mapped_type mask_array mbstate_t mem_fun1_t mem_fun_ref1_t mem_fun_ref_t mem_fun_t multimap multiset nothrow_t numeric_limits off_type ofstream ostream ostringstream ostrstream pair pointer pointer_to_binary_function pointer_to_unary_function pos_type priority_queue queue reference second_type seekdir sequence_buffer set sig_atomic_t size_type slice_array stack state_type stream streambuf streamoff streampos streamsize string stringbuf stringstream strstream strstreambuf temporary_buffer test_type time_t tm traits_type type_info u16string u32string unary_compose unary_negate valarray value_compare value_type vector wctrans_t wctype_t wfilebuf wfstream wifstream wint_t wios wiostream wistream wistringstream wofstream wostream wostringstream wstreambuf wstreampos wstring wstringbuf wstringstream
+
+" locale
+syntax keyword cppSTLtype
+        \ codecvt codecvt_base codecvt_byname collate collate_byname ctype ctype_base ctype_byname locale messages messages_base messages_byname money_base money_get money_put moneypunct moneypunct_byname num_get num_put numpunct numpunct_byname time_base time_get time_get_byname time_put time_put_byname
+
+" template functions that are called with template parameters, like
+" std::use_facet<std::moneypunct<char, true>>(loc).curr_symbol()
+syntax keyword cppSTLfunction use_facet has_facet
+
+" std::get is a template function, so when called as std::get<N>(t), we want it
+" to be highlighted as a function
+syntax keyword cppSTLfunction get
+
+
+" C++11 extensions {{{1
+if !exists('cpp_no_cpp11')
+    syntax keyword cppType char16_t char32_t
+    syntax keyword cppSTLconstant nullptr
+
+    " std containers
+    syntax keyword cppSTLtype array
+
+    " atomic
+    syntax keyword cppSTLconstant ATOMIC_FLAG_INIT
+    syntax keyword cppSTLenum memory_order
+    syntax keyword cppSTLtype
+            \ atomic atomic_bool atomic_char atomic_char16_t atomic_char32_t atomic_flag atomic_int atomic_int_fast16_t atomic_int_fast32_t atomic_int_fast64_t atomic_int_fast8_t atomic_int_least16_t atomic_int_least32_t atomic_int_least64_t atomic_int_least8_t atomic_intmax_t atomic_intptr_t atomic_llong atomic_long atomic_ptrdiff_t atomic_schar atomic_short atomic_size_t atomic_uchar atomic_uint atomic_uint_fast16_t atomic_uint_fast32_t atomic_uint_fast64_t atomic_uint_fast8_t atomic_uint_least16_t atomic_uint_least32_t atomic_uint_least64_t atomic_uint_least8_t atomic_uintmax_t atomic_uintptr_t atomic_ullong atomic_ulong atomic_ushort atomic_wchar_t
+
+    " chrono
+    syntax keyword cppSTLnamespace chrono
+    syntax keyword cppSTLcast duration_cast time_point_cast
+    syntax keyword cppSTLtype
+            \ duration duration_values high_resolution_clock hours microseconds milliseconds minutes nanoseconds seconds steady_clock system_clock time_point treat_as_floating_point
+
+    " condition_variable
+    syntax keyword cppSTLtype condition_variable
+
+    " cstddef
+    syntax keyword cppSTLtype nullptr_t max_align_t
+
+    " exception
+    syntax keyword cppSTLtype exception_ptr nested_exception
+
+    " functional
+    syntax keyword cppSTLexception bad_function_call
+    syntax keyword cppSTLfunctional function
+    syntax keyword cppSTLfunction mem_fn
+    syntax keyword cppSTLconstant _1 _2 _3 _4 _5 _6 _7 _8 _9
+    syntax keyword cppSTLtype
+            \ hash is_bind_expression is_placeholder reference_wrapper
+
+    " iterator
+    syntax keyword cppSTLiterator move_iterator
+
+    " forward_list
+    syntax keyword cppSTLtype forward_list
+
+    " future
+    syntax keyword cppSTLtype future packaged_task promise shared_future
+    syntax keyword cppSTLenum future_status future_errc launch
+    syntax keyword cppSTLexception future_error
+
+    " initializer_list
+    syntax keyword cppSTLtype initializer_list
+
+    " ios
+    syntax keyword cppSTLenum io_errc
+    " syntax keyword cppSTLtype is_error_code_enum
+
+    " limits
+    syntax keyword cppSTLconstant max_digits10
+
+    " locale
+    syntax keyword cppSTLfunction isblank
+    syntax keyword cppSTLtype
+            \ codecvt_mode codecvt_utf16 codecvt_utf8 codecvt_utf8_utf16 wbuffer_convert wstring_convert
+
+    " memory
+    syntax keyword cppSTLconstant allocator_arg
+    syntax keyword cppSTLexception bad_weak_ptr
+    syntax keyword cppSTLfunction allocate_shared make_shared
+    syntax keyword cppSTLfunction
+            \ const_pointer_cast dynamic_pointer_cast static_pointer_cast
+
+    syntax keyword cppSTLtype
+            \ allocator_arg_t allocator_traits allocator_type default_delete enable_shared_from_this is_always_equal owner_less pointer_safety pointer_traits propagate_on_container_copy_assignment propagate_on_container_move_assignment propagate_on_container_swap rebind_alloc rebind_traits shared_ptr unique_ptr uses_allocator void_pointer const_void_pointer weak_ptr
+
+    " mutex
+    syntax keyword cppSTLenum cv_status
+    syntax keyword cppSTLconstant defer_lock try_to_lock adopt_lock
+    syntax keyword cppSTLtype
+            \ adopt_lock_t condition_variable_any defer_lock_t lock_guard mutex once_flag recursive_mutex recursive_timed_mutex timed_mutex try_to_lock_t unique_lock
+
+    " new
+    syntax keyword cppSTLexception bad_array_new_length
+
+    " numerics, cmath
+    syntax keyword cppSTLconstant
+            \ FLT_EVAL_METHOD FP_INFINITE FP_NAN FP_NORMAL FP_SUBNORMAL FP_ZERO HUGE_VALF HUGE_VALL INFINITY MATH_ERREXCEPT MATH_ERRNO NAN math_errhandling
+
+    " random
+    syntax keyword cppSTLfunction generate_canonical
+    syntax keyword cppSTLtype
+            \ bernoulli_distribution binomial_distribution cauchy_distribution chi_squared_distribution default_random_engine discard_block_engine discrete_distribution exponential_distribution extreme_value_distribution fisher_f_distribution gamma_distribution geometric_distribution independent_bits_engine knuth_b linear_congruential_engine lognormal_distribution mersenne_twister_engine minstd_rand minstd_rand0 mt19937 mt19937_64 negative_binomial_distribution normal_distribution piecewise_constant_distribution piecewise_linear_distribution poisson_distribution random_device ranlux24 ranlux24_base ranlux48 ranlux48_base seed_seq shuffle_order_engine student_t_distribution subtract_with_carry_engine uniform_int_distribution uniform_real_distribution weibull_distribution
+
+    " ratio
+    syntax keyword cppSTLtype
+            \ atto centi deca deci exa femto giga hecto kilo mega micro milli nano peta pico ratio ratio_add ratio_divide ratio_equal ratio_greater ratio_greater_equal ratio_less ratio_less_equal ratio_multiply ratio_not_equal ratio_subtract tera yocto yotta zepto zetta
+
+    " regex
+    syntax keyword cppSTLiterator regex_iterator regex_token_iterator
+    syntax keyword cppSTLexception regex_error
+    syntax keyword cppSTLtype
+            \ basic_regex match_results regex_traits sub_match syntax_option_type match_flag_type error_type
+
+    " scoped_allocator
+    syntax keyword cppSTLtype
+            \ scoped_allocator_adaptor outer_allocator_type inner_allocator_type
+
+    " system_error
+    syntax keyword cppSTLenum errc
+    syntax keyword cppSTLexception system_error
+    syntax keyword cppSTLtype
+            \ error_code error_condition error_category is_error_code_enum is_error_condition_enum
+
+    " thread
+    syntax keyword cppSTLnamespace this_thread
+    syntax keyword cppSTLtype thread
+
+    " tuple
+    syntax keyword cppSTLtype tuple tuple_size tuple_element
+    syntax keyword cppSTLfunction forward_as_tuple make_tuple tie tuple_cat
+    " Note: ignore is also a function
+    " syntax keyword cppSTLVariable ignore
+
+    " typeindex
+    syntax keyword cppSTLtype type_index
+
+    " type_traits
+    syntax keyword cppSTLtype
+            \ add_const add_cv add_lvalue_reference add_pointer add_rvalue_reference add_volatile aligned_storage aligned_union alignment_of common_type conditional decay enable_if extent false_type has_virtual_destructor integral_constant is_abstract is_arithmetic is_array is_assignable is_base_of is_class is_compound is_const is_constructible is_convertible is_copy_assignable is_copy_constructible is_default_constructible is_destructible is_empty is_enum is_floating_point is_function is_fundamental is_integral is_literal_type is_lvalue_reference is_member_function_pointer is_member_object_pointer is_member_pointer is_move_assignable is_move_constructible is_nothrow_assignable is_nothrow_constructible is_nothrow_copy_assignable is_nothrow_copy_constructible is_nothrow_default_constructible is_nothrow_destructible is_nothrow_move_assignable is_nothrow_move_constructible is_object is_pod is_pointer is_polymorphic is_reference is_rvalue_reference is_same is_scalar is_signed is_standard_layout is_trivial is_trivially_assignable is_trivially_constructible is_trivially_copy_assignable is_trivially_copy_constructible is_trivially_copyable is_trivially_default_constructible is_trivially_destructible is_trivially_move_assignable is_trivially_move_constructible is_union is_unsigned is_void is_volatile make_signed make_unsigned rank remove_all_extents remove_const remove_cv remove_extent remove_pointer remove_reference remove_volatile result_of true_type underlying_type
+
+    " unordered_map, unordered_set, unordered_multimap, unordered_multiset
+    syntax keyword cppSTLiterator const_local_iterator local_iterator
+    syntax keyword cppSTLtype
+            \ hasher key_equal unordered_map unordered_multimap unordered_multiset unordered_set
+
+    " utility
+    syntax keyword cppSTLtype piecewise_construct_t
+    syntax keyword cppSTLconstant piecewise_construct
+    syntax keyword cppSTLfunction declval forward move move_if_noexcept
+endif
+
+
+" C++14 extensions {{{1
+if !exists('cpp_no_cpp14')
+    " chrono
+    syntax keyword cppSTLnamespace literals chrono_literals
+
+    " memory
+    syntax keyword cppSTLfunction make_unique
+
+    " utility
+    syntax keyword cppSTLtype
+            \ index_sequence index_sequence_for integer_sequence make_index_sequence make_integer_sequence
+
+    " shared_mutex
+    syntax keyword cppSTLtype shared_lock shared_timed_mutex
+
+    " string
+    syntax keyword cppSTLnamespace string_literals
+
+    " tuple
+    syntax keyword cppSTLtype tuple_element_t
+
+    " type_traits
+    syntax keyword cppSTLtype
+            \ add_const_t add_cv_t add_lvalue_reference_t add_pointer_t add_rvalue_reference_t add_volatile_t aligned_storage_t aligned_union_t common_type_t conditional_t decay_t enable_if_t is_null_pointer make_signed_t make_unsigned_t remove_all_extents_t remove_const_t remove_cv_t remove_extent_t remove_pointer_t remove_reference_t remove_volatile_t result_of_t underlying_type_t
+endif
+
+
+" C++17 extensions {{{1
+if !exists('cpp_no_cpp17')
+    " any
+    syntax keyword cppSTLtype any
+    syntax keyword cppSTLexception bad_any_cast
+    syntax keyword cppSTLcast any_cast
+
+    " atomic
+    syntax keyword cppSTLconstant is_always_lock_free
+
+    " chrono
+    syntax keyword cppSTLbool treat_as_floating_point_v
+
+    " execution
+    syntax keyword cppSTLnamespace execution
+    syntax keyword cppSTLconstant seq par par_unseq
+    syntax keyword cppSTLbool is_execution_policy_v
+    syntax keyword cppSTLtype
+            \ is_execution_policy parallel_policy parallel_unsequenced_policy sequenced_policy
+
+    " filesystem
+    syntax keyword cppSTLnamespace filesystem
+    syntax keyword cppSTLexception filesystem_error
+
+    syntax keyword cppSTLtype
+            \ directory_entry directory_iterator file_status file_time_type path recursive_directory_iterator space_info
+
+    syntax keyword cppSTLenum
+            \ copy_options directory_options file_type perm_options perms
+
+    " Note: There is std::filesystem::path::format and std::format() in <format>
+    syntax match cppSTLenum "\<format\>(\@!"
+
+    syntax keyword cppSTLconstant
+            \ copy_symlinks auto_format create_hard_links create_symlinks directories_only follow_directory_symlink generic_format group_all group_exec group_read group_write native_format others_all others_exec others_read others_write overwrite_existing owner_all owner_exec owner_read owner_write preferred_separator recursive set_gid set_uid skip_existing skip_permission_denied skip_symlinks sticky_bit update_existing
+
+    " Note: these keywords are very likely to coincide with user-defined variables
+    " syntax keyword cppSTLconstant
+    "         \ all mask unknown replace add remove nofollow none not_found regular directory symlink block character fifo socket unknown
+
+    " Note: these are also functions
+    " syntax keyword cppSTLconstant capacity free available
+
+    " functional
+    syntax keyword cppSTLbool is_bind_expression_v is_placeholder_v
+    syntax keyword cppSTLtype
+            \ default_order default_order_t default_searcher boyer_moore_searcher boyer_moore_horspool_searcher
+
+    " memory
+    syntax keyword cppSTLfunction reinterpret_pointer_cast
+    syntax keyword cppSTLconstant uses_allocator_v
+
+    " memory_resource
+    syntax keyword cppSTLtype
+            \ memory_resource monotonic_buffer_resource polymorphic_allocator pool_options synchronized_pool_resource unsynchronized_pool_resource
+
+    " mutex
+    syntax keyword cppSTLtype scoped_lock
+
+    " new
+    syntax keyword cppSTLconstant
+            \ hardware_destructive_interference_size hardware_constructive_interference_size
+
+    " optional
+    syntax keyword cppSTLtype optional nullopt_t
+    syntax keyword cppSTLexception bad_optional_access
+    syntax keyword cppSTLconstant nullopt
+    syntax keyword cppSTLfunction make_optional
+
+    " shared_mutex
+    syntax keyword cppSTLtype shared_mutex
+
+    " string_view
+    syntax keyword cppSTLtype
+            \ basic_string_view string_view u16string_view u32string_view wstring_view
+
+    " system_error
+    syntax keyword cppSTLbool is_error_code_enum_v is_error_condition_enum_v
+
+    " tuple
+    syntax keyword cppSTLconstant tuple_size_v
+    syntax keyword cppSTLfunction make_from_tuple
+
+    " type_traits
+    syntax keyword cppSTLconstant alignment_of_v rank_v extent_v
+    syntax keyword cppSTLbool
+            \ conjunction_v disjunction_v has_unique_object_representations_v has_virtual_destructor_v is_abstract_v is_aggregate_v is_arithmetic_v is_array_v is_assignable_v is_base_of_v is_callable_v is_class_v is_compound_v is_const_v is_constructible_v is_convertible_v is_copy_assignable_v is_copy_constructible_v is_default_constructible_v is_destructible_v is_empty_v is_enum_v is_floating_point_v is_function_v is_fundamental_v is_integral_v is_invocable_r_v is_invocable_v is_literal_type_v is_lvalue_reference_v is_member_function_pointer_v is_member_object_pointer_v is_member_pointer_v is_move_assignable_v is_move_constructible_v is_nothrow_assignable_v is_nothrow_constructible_v is_nothrow_copy_assignable_v is_nothrow_copy_constructible_v is_nothrow_default_constructible_v is_nothrow_destructible_v is_nothrow_invocable_r_v is_nothrow_invocable_v is_nothrow_move_assignable_v is_nothrow_move_constructible_v is_nothrow_swappable_v is_nothrow_swappable_with_v is_nowthrow_callable_v is_null_pointer_v is_object_v is_pod_v is_pointer_v is_polymorphic_v is_reference_v is_rvalue_reference_v is_same_v is_scalar_v is_signed_v is_standard_layout_v is_swappable_v is_swappable_with_v is_trivial_v is_trivially_assignable_v is_trivially_constructible_v is_trivially_copy_assignable_v is_trivially_copy_constructible_v is_trivially_copyable_v is_trivially_default_constructible_v is_trivially_destructible_v is_trivially_move_assignable_v is_trivially_move_constructible_v is_union_v is_unsigned_v is_void_v is_volatile_v negation_v
+
+    syntax keyword cppSTLtype
+            \ bool_constant conjunction disjunction has_unique_object_representations invoke_result invoke_result_t is_aggregate is_callable is_invocable is_invocable_r is_nothrow_invocable is_nothrow_invocable_r is_nothrow_swappable is_nothrow_swappable_with is_nowthrow_callable is_swappable is_swappable_with negation void_t
+
+    " unordered_map, unordered_set, unordered_multimap, unordered_multiset
+    syntax keyword cppSTLtype node_type insert_return_type
+
+    " utility
+    syntax keyword cppSTLtype
+            \ in_place_tag in_place_t in_place_type_t in_place_index_t
+
+    " variant
+    syntax keyword cppSTLconstant variant_npos variant_size_v
+    syntax keyword cppSTLexception bad_variant_access
+    syntax keyword cppSTLtype
+            \ monostate variant variant_size variant_alternative variant_alternative_t
+endif
+
+
+" C++20 extensions {{{1
+if !exists('cpp_no_cpp20')
+    syntax keyword cppType char8_t
+    syntax keyword cppOperator co_await
+    syntax keyword cppStatement consteval constinit concept requires co_yield co_return
+
+    " atomic
+    syntax keyword cppSTLtype atomic_ref
+
+    " bit
+    syntax keyword cppSTLtype endian
+
+    " compare
+    syntax keyword cppSTLtype
+            \ weak_ordering strong_ordering partial_ordering weak_equality strong_equality common_comparison_category common_comparison_category_t
+
+    " concepts
+    syntax keyword cppSTLconcept
+            \ assignable_from boolean common_reference_with common_with constructible_from convertible_to copy_constructible copyable default_constructible derived_from destructible equality_comparable equality_comparable_with equivalence_relation floating_point integral invocable movable move_constructible predicate regular regular_invocable relation same_as semiregular signed_integral strict_weak_order swappable swappable_with totally_ordered totally_ordered_with unsigned_integral default_initializable
+
+    " concepts - named requirements
+    " These are concepts that haven't made it into the C++ Standard yet
+    " https://en.cppreference.com/w/cpp/named_req
+    " http://en.cppreference.com/w/cpp/language/constraints
+    if get(g:, 'cpp_named_requirements_highlight', 0)
+        syntax keyword cppSTLNamedReq
+                \ Allocator AllocatorAwareContainer AssociativeContainer BasicLockable BidirectionalIterator BinaryPredicate BinaryTypeTrait BitmaskType Callable CharTraits Clock Compare ConstExprIterator Container ContiguousContainer ContiguousIterator CopyAssignable CopyInsertable CopyInsertable DefaultInsertable EmplaceConstructible Erasable FormattedInputFunction FormattedOutputFunction ForwardIterator FunctionObject Hash InputIterator Iterator LessThanComparable LiteralType Lockable MoveAssignable MoveInsertable Mutex NullablePointer NumericType OutputIterator PODType RandomAccessIterator RandomNumberDistribution RandomNumberEngine RandomNumberEngineAdaptor RegexTraits ReversibleContainer SeedSequence SequenceContainer SharedMutex SharedTimedMutex StandardLayoutType TimedLockable TimedMutex TransformationTrait TrivialClock TrivialType TriviallyCopyable UnaryTypeTrait UnformattedInputFunction UnformattedOutputFunction UniformRandomBitGenerator UnorderedAssociativeContainer ValueSwappable
+        hi def link cppSTLNamedReq Typedef
+    endif
+
+    " contract
+    syntax keyword cppSTLtype contract_violation
+
+    " coroutines
+    syntax keyword cppSTLtype
+            \ coroutine_traits coroutine_handle noop_coroutine_handle noop_coroutine_promise suspend_never suspend_always
+
+    " memory
+    syntax keyword cppSTLfunction
+            \ make_unique_default_init make_shared_default_init allocate_shared_default_init uses_allocator_construction_args make_obj_using_allocator
+
+    " type_traits
+    syntax keyword cppSTLtype
+            \ remove_cvref remove_cvref_t is_bounded_array is_layout_compatible is_unbounded_array is_nothrow_convertible has_strong_structural_equality is_pointer_interconvertible_base_of unwrap_reference unwrap_reference_t unwrap_ref_decay unwrap_ref_decay_t basic_common_reference common_reference common_reference_t
+
+    syntax keyword cppSTLbool
+            \ is_bounded_array_v is_layout_compatible_v is_unbounded_array_v is_nothrow_convertible_v has_strong_structural_equality_v is_pointer_interconvertible_base_of_v
+
+    syntax keyword cppSTLfunction is_corresponding_member
+
+    " ranges
+    syntax keyword cppSTLnamespace ranges views
+
+    syntax keyword cppSTLconcept
+            \ range sized_range view input_range output_range forward_range bidirectional_range random_access_range contiguous_range common_range viewable_range
+
+    syntax keyword cppSTLtype
+            \ iterator_t sentinel_t dangling safe_iterator_t safe_subrange_t ref_view filter_view transform_view iota_view join_view empty_view single_view split_view common_view reverse_view view_interface
+
+    " span
+    syntax keyword cppSTLtype span
+    syntax keyword cppSTLconstant dynamic_extent
+    syntax keyword cppSTLfunction subspan
+
+    " syncstream
+    syntax keyword cppSTLtype
+            \ basic_syncbuf basic_osyncstream syncbuf wsyncbuf osyncstream wosyncstream
+endif
+
+" Boost {{{1
+if !exists('cpp_no_boost')
+    syntax keyword cppSTLnamespace boost
+    syntax keyword cppSTLcast lexical_cast
+endif
+" }}}
+
+
+" Default highlighting
+hi def link cppSTLbool         Boolean
+hi def link cppStatement       Statement
+hi def link cppSTLfunction     Function
+hi def link cppSTLfunctional   Typedef
+hi def link cppSTLconstant     Constant
+hi def link cppSTLnamespace    Constant
+hi def link cppSTLtype         Typedef
+hi def link cppSTLexception    Exception
+hi def link cppSTLiterator     Typedef
+hi def link cppSTLiterator_tag Typedef
+hi def link cppSTLenum         Typedef
+hi def link cppSTLios          Function
+hi def link cppSTLcast         Statement
+hi def link cppSTLconcept      Typedef
+hi def link cppSTLVariable     Identifier
+
+" The keywords {inline, virtual, explicit, export, override, final} are
+" standard C++ keywords and NOT types!
+hi link cppModifier Statement
+
+
+" Highlight all standard C++ keywords as Statement
+if get(g:, 'cpp_simple_highlight', 0)
+    hi link cppStructure    Statement
+    hi link cppExceptions   Statement
+    hi link cppStorageClass Statement
+    hi link cppSTLexception Typedef
+endif
+
+endif

after/syntax/ruby.vim

@@ -22,6 +22,7 @@ syn match yardNote "@note" contained
 syn match yardOption "@option" contained
 syn match yardOverload "@overload" contained
 syn match yardParam "@param" contained
+syn match yardParamName /@param \h\+/hs=s+7 contained contains=yardParam
 syn match yardPrivate "@private" contained
 syn match yardRaise "@raise" contained
 syn match yardReturn "@return" contained
@@ -32,7 +33,7 @@ syn match yardVersion "@version" contained
 syn match yardYield "@yield" contained
 syn match yardYieldParam "@yieldparam" contained
 syn match yardYieldReturn "@yieldreturn" contained
-syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
+syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardParamName,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Directives
@@ -81,7 +82,7 @@ syn cluster rubyNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yard
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 hi def link yardComment rubyComment
 " Tags
-hi def link yardGenericTag rubyKeyword
+hi def link yardGenericTag rubyTodo
 hi def link yardAbstract yardGenericTag
 hi def link yardApi yardGenericTag
 hi def link yardAttr yardGenericTag
@@ -101,11 +102,11 @@ hi def link yardSee yardGenericTag
 hi def link yardSince yardGenericTag
 hi def link yardTodo yardGenericTag
 hi def link yardVersion yardGenericTag
-hi def link yield yardGenericTag
-hi def link yieldparam yardGenericTag
-hi def link yieldreturn yardGenericTag
+hi def link yardYield yardGenericTag
+hi def link yardYieldParam yardGenericTag
+hi def link yardYieldReturn yardGenericTag
 " Directives
-hi def link yardGenericDirective rubyKeyword
+hi def link yardGenericDirective rubyTodo
 hi def link yardAttribute yardGenericDirective
 hi def link yardEndGroup yardGenericDirective
 hi def link yardGroup yardGenericDirective

autoload/elixir/indent.vim

@@ -276,12 +276,14 @@ function! elixir#indent#handle_inside_block(context)
   " hack - handle do: better
   let block_info = searchpairpos(start_pattern, '', end_pattern, 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip() || getline(line('.')) =~ 'do:'", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
   let block_start_lnum = block_info[0]
+  call s:debug("block_start_lnum=" . block_start_lnum)
   let block_start_col = block_info[1]
   if block_start_lnum != 0 || block_start_col != 0
     let block_text = getline(block_start_lnum)
     let block_start_char = block_text[block_start_col - 1]
+    call s:debug("block_start_char=" . block_start_char)
 
-    let never_match = '\(a\)\@=b'
+    let never_match = ''
     let config = {
           \'f': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
           \'c': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
@@ -293,17 +295,25 @@ function! elixir#indent#handle_inside_block(context)
           \'(': {'aligned_clauses': ')', 'pattern_match_clauses': never_match}
           \}
 
+    " if `with` clause...
     if block_start_char == 'w'
       call s:debug("testing s:handle_with")
       return s:handle_with(block_start_lnum, block_start_col, a:context)
     else
       let block_config = config[block_start_char]
+      " if aligned clause (closing tag/`else` clause/etc...) then indent this
+      " at the same level as the block open tag (e.g. `if`/`case`/etc...)
       if s:starts_with(a:context, block_config.aligned_clauses)
         call s:debug("clause")
         return indent(block_start_lnum)
       else
-        let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
-        let relative_lnum = max([clause_lnum, block_start_lnum])
+        if block_config.pattern_match_clauses == never_match
+          let relative_lnum = block_start_lnum
+        else
+          let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
+          call s:debug("clause_lum=" . clause_lnum)
+          let relative_lnum = max([clause_lnum, block_start_lnum])
+        end
         call s:debug("pattern matching relative to lnum " . relative_lnum)
         return s:do_handle_pattern_match_block(relative_lnum, a:context)
       endif

autoload/fzf_gitignore.vim

@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+function! s:template_sink(templates) abort
+  try
+    let l:lines = _fzf_gitignore_create(a:templates)
+  catch /^Vim(\(let\|return\)):/
+    return
+  endtry
+
+  new
+  setlocal filetype=gitignore
+
+  call setline(1, l:lines)
+
+  $-2,$delete _
+  normal! gg
+endfunction
+
+function! fzf_gitignore#run() abort
+  try
+    let l:opts = {
+          \ 'source': _fzf_gitignore_get_all_templates(),
+          \ 'sink*': function('s:template_sink'),
+          \ 'options': '-m --prompt="Template> " --header="gitignore.io"'
+          \ }
+  catch /^Vim(\(let\|return\)):/
+    return
+  endtry
+
+  call fzf#run(fzf#wrap(l:opts))
+endfunction
+
+" vim: ts=2 et sw=2
+
+endif

autoload/go/config.vim

@@ -572,6 +572,10 @@ function! go#config#GoplsOptions() abort
   return get(g:, 'go_gopls_options', ['-remote=auto'])
 endfunction
 
+function! go#config#FillStructMode() abort
+  return get(g:, 'go_fillstruct_mode', 'fillstruct')
+endfunction
+
 " Set the default value. A value of "1" is a shortcut for this, for
 " compatibility reasons.
 if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1

autoload/polyglot.vim

@@ -1,16 +1,63 @@
+" Please do not edit this file directly, instead modify polyglot.vim or scripts/build
+
 " Line continuation is used here, remove 'C' from 'cpoptions'
 let s:cpo_save = &cpo
 set cpo&vim
 
-func! polyglot#Heuristics()
-  " Try to detect filetype from shebang
-  let filetype = polyglot#Shebang()
-  if filetype != ""
-    exec "setf " . filetype
-    return 1
+func! polyglot#Shebang()
+  if getline(1) =~# "^#!"
+    let ft = polyglot#ShebangFiletype()
+    if ft != ""
+      let &ft = ft
+    endif
   endif
 
-  return 0
+  if &ft == ""
+    runtime! scripts.vim
+  endif
+
+  return &ft != ""
+endfunc
+
+let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
+let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
+let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
+
+func! polyglot#ShebangFiletype()
+  let l:line1 = getline(1)
+
+  if l:line1 !~# "^#!"
+    return
+  endif
+
+  let l:pathrest = matchlist(l:line1, s:r_hashbang)
+
+  if len(l:pathrest) == 0
+    return
+  endif
+
+  let [_, l:path, l:rest; __] = l:pathrest
+
+  let l:script = split(l:path, "/")[-1]
+
+  if l:script == "env"
+    let l:argspath = matchlist(l:rest, s:r_env)
+    if len(l:argspath) == 0
+      return
+    endif
+
+    let l:script = l:argspath[1]
+  endif
+
+  if has_key(s:interpreters, l:script)
+    return s:interpreters[l:script]
+  endif
+
+  for interpreter in keys(s:interpreters)
+    if l:script =~# '^' . interpreter
+      return s:interpreters[interpreter]
+    endif
+  endfor
 endfunc
 
 let s:interpreters = {
@@ -44,6 +91,8 @@ let s:interpreters = {
   \ 'cperl': 'perl',
   \ 'perl': 'perl',
   \ 'php': 'php',
+  \ 'swipl': 'prolog',
+  \ 'yap': 'prolog',
   \ 'pwsh': 'ps1',
   \ 'python': 'python',
   \ 'python2': 'python',
@@ -81,84 +130,39 @@ let s:interpreters = {
   \ 'z3': 'smt2',
   \ 'deno': 'typescript',
   \ 'ts-node': 'typescript',
-  \ }
-
-let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
-let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
-let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
-
-func! polyglot#Shebang()
-  let line1 = getline(1)
-
-  if line1 !~# "^#!"
-    return
-  endif
-
-  let pathrest = matchlist(line1, s:r_hashbang)
-
-  if len(pathrest) == 0
-    return 
-  endif
-
-  let [_, path, rest; __] = pathrest
-
-  let script = split(path, "/")[-1]
-
-  if len(script) == 0
-    return
-  endif
-
-  if script == "env"
-    let argspath = matchlist(rest, s:r_env)
-    if len(argspath) == 0
-      return
-    endif
-
-    let script = argspath[1]
-  endif
-
-  if has_key(s:interpreters, script)
-    return s:interpreters[script]
-  endif
-
-  for interpreter in keys(s:interpreters)
-    if script =~# '^' . interpreter
-      return s:interpreters[interpreter]
-    endif
-  endfor
-endfunc
+\ }
 
 func! polyglot#DetectInpFiletype()
-  let line = getline(1)
+  let line = getline(nextnonblank(1))
   if line =~# '^\*'
-    setf abaqus | return
+    set ft=abaqus | return
   endif
   for lnum in range(1, min([line("$"), 500]))
     let line = getline(lnum)
     if line =~? '^header surface data'
-      setf trasys | return
+      set ft=trasys | return
     endif
   endfor
 endfunc
 
 func! polyglot#DetectAsaFiletype()
   if exists("g:filetype_asa")
-    exe "setf " . g:filetype_asa | return
+    let &ft = g:filetype_asa | return
   endif
-  setf aspvbs | return
+  set ft=aspvbs | return
 endfunc
 
 func! polyglot#DetectAspFiletype()
   if exists("g:filetype_asp")
-    exe "setf " . g:filetype_asp | return
+    let &ft = g:filetype_asp | return
   endif
   for lnum in range(1, min([line("$"), 3]))
     let line = getline(lnum)
     if line =~? 'perlscript'
-      setf aspperl | return
+      set ft=aspperl | return
     endif
   endfor
-  setf aspvbs | return
+  set ft=aspvbs | return
 endfunc
 
 func! polyglot#DetectHFiletype()
@@ -166,18 +170,18 @@ func! polyglot#DetectHFiletype()
     let line = getline(lnum)
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
       if exists("g:c_syntax_for_h")
-        setf objc | return
+        set ft=objc | return
       endif
-      setf objcpp | return
+      set ft=objcpp | return
     endif
   endfor
   if exists("g:c_syntax_for_h")
-    setf c | return
+    set ft=c | return
   endif
   if exists("g:ch_syntax_for_h")
-    setf ch | return
+    set ft=ch | return
   endif
-  setf cpp | return
+  set ft=cpp | return
 endfunc
 
 func! polyglot#DetectMFiletype()
@@ -188,53 +192,53 @@ func! polyglot#DetectMFiletype()
       let saw_comment = 1
     endif
     if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
-      setf objc | return
+      set ft=objc | return
     endif
     if line =~# '^\s*%'
-      setf octave | return
+      set ft=octave | return
     endif
     if line =~# '^\s*(\*'
-      setf mma | return
+      set ft=mma | return
     endif
     if line =~? '^\s*\(\(type\|var\)\(\<\|\>\)\|--\)'
-      setf murphi | return
+      set ft=murphi | return
     endif
   endfor
   if saw_comment
-    setf objc | return
+    set ft=objc | return
   endif
   if exists("g:filetype_m")
-    exe "setf " . g:filetype_m | return
+    let &ft = g:filetype_m | return
   endif
-  setf octave | return
+  set ft=octave | return
 endfunc
 
 func! polyglot#DetectFsFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\(: \|new-device\)'
-      setf forth | return
+      set ft=forth | return
     endif
     if line =~# '^\s*\(#light\|import\|let\|module\|namespace\|open\|type\)'
-      setf fsharp | return
+      set ft=fsharp | return
     endif
     if line =~# '\s*\(#version\|precision\|uniform\|varying\|vec[234]\)'
-      setf glsl | return
+      set ft=glsl | return
     endif
   endfor
   if exists("g:filetype_fs")
-    exe "setf " . g:filetype_fs | return
+    let &ft = g:filetype_fs | return
   endif
-  setf forth | return
+  set ft=forth | return
 endfunc
 
 func! polyglot#DetectReFiletype()
   for lnum in range(1, min([line("$"), 50]))
     let line = getline(lnum)
     if line =~# '^\s*#\%(\%(if\|ifdef\|define\|pragma\)\s\+\w\|\s*include\s\+[<"]\|template\s*<\)'
-      setf cpp | return
+      set ft=cpp | return
     endif
-    setf reason | return
+    set ft=reason | return
   endfor
 endfunc
 
@@ -242,56 +246,460 @@ func! polyglot#DetectIdrFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~# '^\s*--.*[Ii]dris \=1'
-      setf idris | return
+      set ft=idris | return
     endif
     if line =~# '^\s*--.*[Ii]dris \=2'
-      setf idris2 | return
+      set ft=idris2 | return
     endif
   endfor
   for lnum in range(1, min([line("$"), 30]))
     let line = getline(lnum)
     if line =~# '^pkgs =.*'
-      setf idris | return
+      set ft=idris | return
     endif
     if line =~# '^depends =.*'
-      setf idris2 | return
+      set ft=idris2 | return
     endif
     if line =~# '^%language \(TypeProviders\|ElabReflection\)'
-      setf idris | return
+      set ft=idris | return
     endif
     if line =~# '^%language PostfixProjections'
-      setf idris2 | return
+      set ft=idris2 | return
     endif
     if line =~# '^%access .*'
-      setf idris | return
-    endif
-    if exists("g:filetype_idr")
-      exe "setf " . g:filetype_idr | return
+      set ft=idris | return
     endif
   endfor
-  setf idris2 | return
+  if exists("g:filetype_idr")
+    let &ft = g:filetype_idr | return
+  endif
+  set ft=idris2 | return
 endfunc
 
 func! polyglot#DetectLidrFiletype()
   for lnum in range(1, min([line("$"), 200]))
     let line = getline(lnum)
     if line =~# '^>\s*--.*[Ii]dris \=1'
-      setf lidris | return
+      set ft=lidris | return
     endif
   endfor
-  setf lidris2 | return
+  set ft=lidris2 | return
 endfunc
 
 func! polyglot#DetectBasFiletype()
   for lnum in range(1, min([line("$"), 5]))
     let line = getline(lnum)
     if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
-      setf vb | return
+      set ft=vb | return
     endif
   endfor
-  setf basic | return
+  set ft=basic | return
 endfunc
 
+func! polyglot#DetectPmFiletype()
+  let line = getline(nextnonblank(1))
+  if line =~# 'XPM2'
+    set ft=xpm2 | return
+  endif
+  if line =~# 'XPM'
+    set ft=xpm | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      set ft=raku | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      set ft=perl | return
+    endif
+  endfor
+  if exists("g:filetype_pm")
+    let &ft = g:filetype_pm | return
+  endif
+  set ft=perl | return
+endfunc
+
+func! polyglot#DetectPlFiletype()
+  let line = getline(nextnonblank(1))
+  if line =~# '^[^#]*:-' || line =~# '^\s*\%(%\|/\*\)' || line =~# '\.\s*$'
+    set ft=prolog | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      set ft=raku | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      set ft=perl | return
+    endif
+  endfor
+  if exists("g:filetype_pl")
+    let &ft = g:filetype_pl | return
+  endif
+  set ft=perl | return
+endfunc
+
+func! polyglot#DetectTFiletype()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~# '^\.'
+      set ft=nroff | return
+    endif
+  endfor
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '^\s*\%(use\s\+v6\(\<\|\>\)\|\(\<\|\>\)module\(\<\|\>\)\|\(\<\|\>\)\%(my\s\+\)\=class\(\<\|\>\)\)'
+      set ft=raku | return
+    endif
+    if line =~# '\(\<\|\>\)use\s\+\%(strict\(\<\|\>\)\|v\=5\.\)'
+      set ft=perl | return
+    endif
+  endfor
+  if exists("g:filetype_t")
+    let &ft = g:filetype_t | return
+  endif
+  set ft=perl | return
+endfunc
+
+func! polyglot#DetectTt2Filetype()
+  for lnum in range(1, min([line("$"), 3]))
+    let line = getline(lnum)
+    if line =~? '<\%(!DOCTYPE HTML\|[%?]\|html\)'
+      set ft=tt2html | return
+    endif
+  endfor
+  set ft=tt2 | return
+endfunc
+
+func! polyglot#DetectHtmlFiletype()
+  let line = getline(nextnonblank(1))
+  if line =~# '^\(%\|<[%&].*>\)'
+    set ft=mason | return
+  endif
+  for lnum in range(1, min([line("$"), 50]))
+    let line = getline(lnum)
+    if line =~# '{{.*}}\|{%-\=\s*\(end.*\|extends\|block\|macro\|set\|if\|for\|include\|trans\)\(\<\|\>\)\|{#\s\+'
+      set ft=htmldjango | return
+    endif
+    if line =~# '\(\<\|\>\)DTD\s\+XHTML\s'
+      set ft=xhtml | return
+    endif
+  endfor
+  set ft=html | au! BufWritePost <buffer> ++once call polyglot#DetectHtmlFiletype()
+  return
+endfunc
+
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save
+
+""" ftdetect/polyglot.vim
+
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Disable all native vim ftdetect
+if exists('g:polyglot_test')
+  autocmd!
+endif
+
+func! s:Observe(fn)
+  let b:polyglot_observe = a:fn
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+  augroup END
+endfunc
+
+let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+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)
+
+" Needed for sql highlighting
+call s:SetDefault('g:javascript_sql_dialect', 'sql')
+
+" 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
+
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+augroup filetypedetect
+
+" scripts/build inserts here filetype detection autocommands
+
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
+  \ call polyglot#Shebang() | endif
+
+au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
+      \ call s:Observe('Shebang') | endif
+
+augroup END
+
+if !has_key(s:disabled_packages, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
+
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
+
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let i = 0
+
+    for line in a:lines
+      let i += 1
+
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+      if line[0] == "\t"
+        setlocal noexpandtab
+        let &l:shiftwidth=&tabstop
+        let b:sleuth_culprit .= ':' . i
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
+      endif
+    endfor
+
+    if minindent < 10
+      setlocal expandtab
+      let &l:shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
+      return 1
+    endif
+
+    return 0
+  endfunction
+
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    unlet b:sleuth_culprit
+  endfunction
+
+  setglobal smarttab
+
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
+  augroup polyglot-sleuth
+    au!
+    au FileType * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+au VimEnter * call s:verify()
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
+" restore Vi compatibility settings
+let &cpo = s:cpo_save

autoload/rustfmt.vim

@@ -109,7 +109,7 @@ function! s:DeleteLines(start, end) abort
 endfunction
 
 function! s:RunRustfmt(command, tmpname, from_writepre)
-    mkview!
+    let l:view = winsaveview()
 
     let l:stderr_tmpname = tempname()
     call writefile([], l:stderr_tmpname)
@@ -215,7 +215,7 @@ function! s:RunRustfmt(command, tmpname, from_writepre)
         lwindow
     endif
 
-    silent! loadview
+    call winrestview(l:view)
 endfunction
 
 function! rustfmt#FormatRange(line1, line2)

autoload/sleuth.vim

@@ -2,7 +2,7 @@ let s:globs = {
   \ '8th': '*.8th',
   \ 'Dockerfile': '*.dockerfile,*.dock,*.Dockerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'Jenkinsfile': '*.jenkinsfile,*.Jenkinsfile,Jenkinsfile,Jenkinsfile*',
-  \ 'a2ps': 'a2psrc',
+  \ 'a2ps': 'a2psrc,.a2psrc',
   \ 'a65': '*.a65',
   \ 'aap': '*.aap',
   \ 'abap': '*.abap',
@@ -13,15 +13,15 @@ let s:globs = {
   \ 'ada': '*.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m',
   \ 'ahdl': '*.tdf',
   \ 'aidl': '*.aidl',
-  \ 'alsaconf': '',
+  \ 'alsaconf': '.asoundrc',
   \ 'aml': '*.aml',
   \ 'ampl': '*.run',
   \ 'ant': 'build.xml',
-  \ 'apache': 'access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
+  \ 'apache': '.htaccess,access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
   \ 'apiblueprint': '*.apib',
   \ 'applescript': '*.applescript,*.scpt',
   \ 'aptconf': 'apt.conf',
-  \ 'arch': '=tagging-method',
+  \ 'arch': '.arch-inventory,=tagging-method',
   \ 'arduino': '*.pde,*.ino',
   \ 'art': '*.art',
   \ 'asciidoc': '*.asciidoc,*.adoc,*.asc',
@@ -38,6 +38,7 @@ let s:globs = {
   \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
+  \ 'bzl': '*.bzl,*.bazel,*.BUILD,BUCK,BUILD,BUILD.bazel,Tiltfile,WORKSPACE',
   \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
   \ 'caddyfile': 'Caddyfile',
   \ 'carp': '*.carp',
@@ -57,7 +58,7 @@ let s:globs = {
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
   \ 'dhall': '*.dhall',
-  \ 'dosini': '*.wrap,*.ini,*.cfg,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dsdl': '*.sdl',
   \ 'dune': 'jbuild,dune,dune-project,dune-workspace',
   \ 'ecrystal': '*.ecr',
@@ -79,9 +80,10 @@ let s:globs = {
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
   \ 'gdscript3': '*.gd',
   \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
-  \ 'gitconfig': '*.gitconfig',
+  \ 'gitconfig': '*.gitconfig,.gitconfig,.gitmodules',
+  \ 'gitignore': '.gitignore',
   \ 'gitrebase': 'git-rebase-todo',
-  \ 'gitsendemail': '',
+  \ 'gitsendemail': '.gitsendemail.*',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
   \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
@@ -100,17 +102,19 @@ let s:globs = {
   \ 'help': '',
   \ 'hive': '*.q,*.hql,*.ql',
   \ 'html': '*.html,*.htm,*.html.hl,*.inc,*.st,*.xht,*.xhtml',
+  \ 'html.handlebars': '*.handlebars,*.hbs,*.hdbs,*.hb',
+  \ 'html.mustache': '*.mustache,*.hogan,*.hulk,*.hjs',
   \ 'html.twig': '*.twig',
-  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
+  \ 'htmldjango': '*.jinja,*.j2,*.jinja2,*.njk',
+  \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config,.i3.config,.i3config',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
   \ 'idris2': '*.idr,*.ipkg,idris-response',
   \ 'ion': '*.ion',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
-  \ 'jinja.html': '*.jinja,*.j2,*.jinja2',
-  \ 'jq': '*.jq',
-  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,composer.lock,mcmod.info,Pipfile.lock',
+  \ 'jq': '*.jq,.jqrc,.jqrc*',
+  \ 'json': '*.json,*.avsc,*.geojson,*.gltf,*.har,*.ice,*.JSON-tmLanguage,*.jsonl,*.mcmeta,*.tfstate,*.tfstate.backup,*.topojson,*.webapp,*.webmanifest,*.yy,*.yyp,*.jsonp,*.template,.arcconfig,.htmlhintrc,.tern-config,.tern-project,.watchmanconfig,composer.lock,mcmod.info,Pipfile.lock',
   \ 'json5': '*.json5',
   \ 'jsonnet': '*.jsonnet,*.libsonnet',
   \ 'jst': '*.ejs,*.ect,*.jst',
@@ -124,43 +128,46 @@ let s:globs = {
   \ 'livescript': '*.ls,*._ls,Slakefile',
   \ 'llvm': '*.ll',
   \ 'log': '*.log,*.LOG,*_log,*_LOG',
-  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua',
+  \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
   \ 'm4': '*.m4,*.at',
   \ 'mako': '*.mako,*.mao',
   \ 'markdown': '*.md,*.markdown,*.mdown,*.mdwn,*.mkd,*.mkdn,*.mkdown,*.ronn,*.workbook,contents.lr',
   \ 'markdown.mdx': '*.mdx',
+  \ 'mason': '*.mason,*.mhtml,*.comp',
   \ 'meson': 'meson.build,meson_options.txt',
   \ 'mma': '*.mathematica,*.cdf,*.m,*.ma,*.mt,*.nb,*.nbp,*.wl,*.wlt,*.wls,*.mma',
   \ 'moon': '*.moon',
   \ 'murphi': '*.m',
-  \ 'mustache': '*.handlebars,*.hbs,*.hulk,*.hjs,*.mustache,*.njk,*.hogan,*.hdbs,*.hb',
   \ 'nginx': '*.nginx,*.nginxconf,*.vhost,nginx.conf,nginx*.conf,*nginx.conf',
   \ 'nim': '*.nim,*.nim.cfg,*.nimble,*.nimrod,*.nims,nim.cfg',
   \ 'nix': '*.nix',
   \ 'oasis': '_oasis',
   \ 'objc': '*.m,*.h',
-  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo',
+  \ 'ocaml': '*.ml,*.eliom,*.eliomi,*.ml4,*.mli,*.mll,*.mly,*.mlt,*.mlp,*.mlip,*.mli.cppo,*.ml.cppo,.ocamlinit',
   \ 'ocamlbuild_tags': '_tags',
   \ 'ocpbuild': '*.ocp',
   \ 'ocpbuildroot': '*.root',
   \ 'octave': '*.oct,*.m',
+  \ 'odin': '*.odin',
   \ 'omake': '*.om,OMakefile,OMakeroot,OMakeroot.in',
   \ 'opam': '*.opam,*.opam.template,opam',
   \ 'opencl': '*.cl,*.opencl',
   \ 'perl': '*.pl,*.al,*.cgi,*.fcgi,*.perl,*.ph,*.plx,*.pm,*.psgi,*.t,Makefile.PL,Rexfile,ack,cpanfile',
-  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,Phakefile',
+  \ 'php': '*.php,*.aw,*.ctp,*.fcgi,*.inc,*.php3,*.php4,*.php5,*.phps,*.phpt,.php,.php_cs,.php_cs.dist,Phakefile',
   \ 'plantuml': '*.puml,*.iuml,*.plantuml,*.uml,*.pu',
+  \ 'pod': '*.pod',
   \ 'pony': '*.pony',
+  \ 'prolog': '*.pl,*.pro,*.prolog,*.yap',
   \ 'proto': '*.proto',
   \ 'ps1': '*.ps1,*.psd1,*.psm1,*.pssc',
   \ 'ps1xml': '*.ps1xml',
   \ 'pug': '*.jade,*.pug',
   \ 'puppet': '*.pp,Modulefile',
   \ 'purescript': '*.purs',
-  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,DEPS,SConscript,SConstruct,Snakefile,wscript',
+  \ 'python': '*.py,*.cgi,*.fcgi,*.gyp,*.gypi,*.lmi,*.py3,*.pyde,*.pyi,*.pyp,*.pyt,*.pyw,*.rpy,*.smk,*.spec,*.tac,*.wsgi,*.xpy,.gclient,DEPS,SConscript,SConstruct,Snakefile,wscript',
   \ 'qmake': '*.pro,*.pri',
   \ 'qml': '*.qml,*.qbs',
-  \ 'r': '*.r,*.rsx,*.s,*.S,expr-dist',
+  \ 'r': '*.r,*.rsx,*.s,*.S,.Rprofile,expr-dist',
   \ 'racket': '*.rkt,*.rktd,*.rktl,*.scrbl',
   \ 'ragel': '*.rl',
   \ 'raku': '*.6pl,*.6pm,*.nqp,*.p6,*.p6l,*.p6m,*.pl,*.pl6,*.pm,*.pm6,*.t,*.rakudoc,*.rakutest,*.raku,*.rakumod,*.pod6,*.t6',
@@ -170,13 +177,13 @@ let s:globs = {
   \ 'requirements': '*.pip,*requirements.{txt,in},*require.{txt,in},constraints.{txt,in}',
   \ 'rhelp': '*.rd',
   \ 'rst': '*.rst,*.rest,*.rest.txt,*.rst.txt',
-  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,Cheffile,KitchenSink,Routefile,vagrantfile,[Rr]akefile*,*_spec.rb',
+  \ 'ruby': '*.rb,*.builder,*.eye,*.fcgi,*.gemspec,*.god,*.jbuilder,*.mspec,*.pluginspec,*.podspec,*.rabl,*.rake,*.rbi,*.rbuild,*.rbw,*.rbx,*.ru,*.ruby,*.spec,*.thor,*.watchr,*.rxml,*.rjs,*.rant,*.axlsx,*.cap,*.opal,.irbrc,.pryrc,.simplecov,Appraisals,Berksfile,Buildfile,Capfile,Dangerfile,Deliverfile,Fastfile,Gemfile,Gemfile.lock,Guardfile,Jarfile,Mavenfile,Podfile,Puppetfile,Rakefile,Snapfile,Thorfile,Vagrantfile,buildfile,Rantfile,.autotest,Cheffile,KitchenSink,Routefile,.Guardfile,.Brewfile,vagrantfile,[Rr]akefile*,*_spec.rb',
   \ 'rust': '*.rs,*.rs.in',
   \ 'sbt.scala': '*.sbt',
   \ 'scala': '*.scala,*.kojo,*.sc',
   \ 'scss': '*.scss',
   \ 'sexplib': '*.sexp',
-  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
+  \ 'sh': '*.sh,*.bash,*.bats,*.cgi,*.command,*.env,*.fcgi,*.ksh,*.sh.in,*.tmux,*.tool,.bash_aliases,.bash_history,.bash_logout,.bash_profile,.bashrc,.cshrc,.env,.env.example,.flaskenv,.login,.profile,9fs,PKGBUILD,bash_aliases,bash_logout,bash_profile,bashrc,cshrc,gradlew,login,man,profile',
   \ 'slim': '*.slim',
   \ 'slime': '*.slime',
   \ 'smt2': '*.smt2,*.smt',
@@ -189,13 +196,16 @@ let s:globs = {
   \ 'sxhkdrc': '*.sxhkdrc,sxhkdrc',
   \ 'systemd': '*.automount,*.mount,*.path,*.service,*.socket,*.swap,*.target,*.timer',
   \ 'tablegen': '*.td',
+  \ 'tads': '*.t',
   \ 'terraform': '*.hcl,*.nomad,*.tf,*.tfvars,*.workflow',
   \ 'textile': '*.textile',
   \ 'thrift': '*.thrift',
-  \ 'tmux': '',
+  \ 'tmux': '.tmux.conf',
   \ 'toml': '*.toml,Cargo.lock,Gopkg.lock,poetry.lock,Pipfile',
   \ 'tptp': '*.p,*.tptp,*.ax',
   \ 'trasys': '*.inp',
+  \ 'tt2': '*.tt2',
+  \ 'tt2html': '*.tt2',
   \ 'typescript': '*.ts',
   \ 'typescriptreact': '*.tsx',
   \ 'unison': '*.u,*.uu',
@@ -208,16 +218,17 @@ let s:globs = {
   \ 'vmasm': '*.mar',
   \ 'vue': '*.vue,*.wpy',
   \ 'xdc': '*.xdc',
-  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
+  \ 'xml': '*.xml,*.adml,*.admx,*.ant,*.axml,*.builds,*.ccproj,*.ccxml,*.clixml,*.cproject,*.cscfg,*.csdef,*.csl,*.csproj,*.ct,*.depproj,*.dita,*.ditamap,*.ditaval,*.dll.config,*.dotsettings,*.filters,*.fsproj,*.fxml,*.glade,*.gml,*.gmx,*.grxml,*.gst,*.iml,*.ivy,*.jelly,*.jsproj,*.kml,*.launch,*.mdpolicy,*.mjml,*.mm,*.mod,*.mxml,*.natvis,*.ncl,*.ndproj,*.nproj,*.nuspec,*.odd,*.osm,*.pkgproj,*.pluginspec,*.proj,*.props,*.ps1xml,*.psc1,*.pt,*.rdf,*.resx,*.rss,*.sch,*.scxml,*.sfproj,*.shproj,*.srdf,*.storyboard,*.sublime-snippet,*.targets,*.tml,*.ui,*.urdf,*.ux,*.vbproj,*.vcxproj,*.vsixmanifest,*.vssettings,*.vstemplate,*.vxml,*.wixproj,*.workflow,*.wsdl,*.wsf,*.wxi,*.wxl,*.wxs,*.x3d,*.xacro,*.xaml,*.xib,*.xlf,*.xliff,*.xmi,*.xml.dist,*.xproj,*.xsd,*.xspec,*.xul,*.zcml,*.cdxml,*.tpm,*.csproj.user,*.wpl,.classpath,.cproject,.project,App.config,NuGet.config,Settings.StyleCop,Web.Debug.config,Web.Release.config,Web.config,packages.config',
   \ 'xml.twig': '*.xml.twig',
+  \ 'xs': '*.xs',
   \ 'xsl': '*.xslt,*.xsl',
-  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,glide.lock,yarn.lock,fish_history,fish_read_history',
+  \ 'yaml': '*.yml,*.mir,*.reek,*.rviz,*.sublime-syntax,*.syntax,*.yaml,*.yaml-tmlanguage,*.yaml.sed,*.yml.mysql,.clang-format,.clang-tidy,.gemrc,glide.lock,yarn.lock,fish_history,fish_read_history',
   \ 'yaml.ansible': 'playbook.y{a,}ml,site.y{a,}ml,main.y{a,}ml,local.y{a,}ml,requirements.y{a,}ml,tasks.*.y{a,}ml,roles.*.y{a,}ml,handlers.*.y{a,}ml',
   \ 'yaml.docker-compose': 'docker-compose*.yaml,docker-compose*.yml',
   \ 'zephir': '*.zep',
   \ 'zig': '*.zig,*.zir',
   \ 'zir': '*.zir',
-  \ 'zsh': '*.zsh',
+  \ 'zsh': '*.zsh,.zshrc,.zshenv,.zlogin,.zprofile,.zlogout',
   \}
 
 func! sleuth#GlobForFiletype(type)

autoload/terraform.vim

@@ -68,6 +68,7 @@ function! terraform#commands(ArgLead, CmdLine, CursorPos) abort
     \ 'version',
     \ 'workspace',
     \ '0.12upgrade',
+    \ '0.13upgrade',
     \ 'debug',
     \ 'force-unlock',
     \ 'push',

doc/fzf_gitignore.txt

@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+*fzf_gitignore.txt* Create useful .gitignore files for your project
+
+Author: Filip Szymański <fszymanski.pl@gmail.com>
+
+==============================================================================
+CONTENTS                                              *fzf-gitignore-contents*
+
+  1. Introduction                                |fzf-gitignore-introduction|
+  2. Configuration                               |fzf-gitignore-configuration|
+  3. Commands                                    |fzf-gitignore-commands|
+  4. Mappings                                    |fzf-gitignore-mappings|
+  5. License                                     |fzf-gitignore-license|
+  6. Bugs                                        |fzf-gitignore-bugs|
+  7. Contributing                                |fzf-gitignore-contributing|
+
+==============================================================================
+INTRODUCTION                                      *fzf-gitignore-introduction*
+
+fzf[1] interface for creating .gitignore files using the gitignore.io[2] API.
+
+Note: This plugin was inspired by helm-gitignore[3].
+
+==============================================================================
+CONFIGURATION                                    *fzf-gitignore-configuration*
+
+                                                     *g:fzf_gitignore_no_maps*
+Set this option to disable all key mappings.
+>
+  let g:fzf_gitignore_no_maps = 1
+<
+Default: Not defined (number)
+
+                                                         *g:fzf_gitignore_map*
+Set this option to change the |<Plug>(fzf-gitignore)| key mapping.
+>
+  let g:fzf_gitignore_map = '<Leader>i'
+<
+Default: '<Leader>gi' (string)
+
+==============================================================================
+COMMANDS                                              *fzf-gitignore-commands*
+
+                                                               *:FzfGitignore*
+Create .gitignore file.
+
+==============================================================================
+MAPPINGS                                              *fzf-gitignore-mappings*
+
+ -----------------------------------+----------------------------------------
+  Mapping                           | Description                            ~
+ -----------------------------------+----------------------------------------
+  <Plug>(fzf-gitignore)             | Create .gitignore file
+ -----------------------------------+----------------------------------------
+
+==============================================================================
+LICENSE                                                *fzf-gitignore-license*
+
+MIT
+
+==============================================================================
+BUGS                                                      *fzf-gitignore-bugs*
+
+If you find a bug please create an issue on GitHub.
+
+https://github.com/fszymanski/fzf-gitignore/issues
+
+==============================================================================
+CONTRIBUTING                                      *fzf-gitignore-contributing*
+
+Think you can make this plugin better? Awesome. Fork it on GitHub and create
+a pull request.
+
+https://github.com/fszymanski/fzf-gitignore
+
+==============================================================================
+
+[1] https://github.com/junegunn/fzf
+[2] https://www.gitignore.io/
+[3] https://github.com/jupl/helm-gitignore
+
+ vim: tw=78 ts=8 ft=help norl
+
+endif

doc/vim-go.txt

@@ -426,10 +426,6 @@ CTRL-t
 
     If [!] is not given the first error is jumped to.
 
-    If using neovim `:GoTestFunc` will run in a new terminal or run
-    asynchronously in the background according to |'g:go_term_enabled'|. You
-    can set the mode of the new terminal with |'g:go_term_mode'|.
-
                                                               *:GoTestCompile*
 :GoTestCompile[!] [expand]
 
@@ -441,10 +437,6 @@ CTRL-t
 
     If [!] is not given the first error is jumped to.
 
-    If using neovim `:GoTestCompile` will run in a new terminal or run
-    asynchronously in the background according to |'g:go_term_enabled'|. You
-    can set the mode of the new terminal with |'g:go_term_mode'|.
-
                                                                  *:GoCoverage*
 :GoCoverage[!] [options]
 
@@ -1483,6 +1475,14 @@ accuracy or `godef` for its performance. Valid options are `godef`, `gopls`,
 and `guru`.
 >
   let g:go_def_mode = 'gopls'
+<
+                                                      *'g:go_fillstruct_mode'*
+
+Use this option to define the command to be used for |:GoFillStruct|. By
+default `fillstruct` is used. Valid values are `fillstruct` and `gopls`. By
+default it is `fillstruct`.
+>
+  let g:go_fillstruct_mode = 'fillstruct'
 <
                                                        *'g:go_referrers_mode'*
 
@@ -1789,25 +1789,34 @@ same.
 
                                                         *'g:go_gopls_enabled'*
 
-Specifies whether `gopls` can be used by vim-go. By default gopls is enabled.
-When gopls is disabled completion will not work and other configuration
+Specifies whether `gopls` can be used by vim-go.
+
+Completion will not work when gopls is disabled and other configuration
 options may also need to be adjusted.
 
+By default gopls is enabled.
+
 >
   let g:go_gopls_enabled = 1
 <
 
                                                         *'g:go_gopls_options'*
 
-The commandline arguments to pass to gopls. By default, it's `-remote=auto`.
+The commandline arguments to pass to gopls.
+
+By default, it is `['-remote=auto']`.
 >
-  let g:go_gopls_options = []
+  let g:go_gopls_options = ['-remote=auto']
 <
 
                                                        *'g:go_gopls_analyses'*
 
-The analyses settings for `gopls`. By default, it's `v:null`. Valid map values
-are `v:true` and `v:false`.
+The analyses settings for `gopls`.
+
+The Expected value is either `v:null` or a dictionary. The dictionary will be
+provided to `gopls` via json-rpc, so dictionary values need to be of the
+appropriate type for Vim to convert to JSON (e.g. truthy dictionary values
+should be `v:true` or `v:false`). By default, it is `v:null`.
 >
   let g:go_gopls_analyses = v:null
 <
@@ -1815,34 +1824,36 @@ are `v:true` and `v:false`.
                                             *'g:go_gopls_complete_unimported'*
 
 Specifies whether `gopls` should include suggestions from unimported packages.
-When it is `v:null`, `gopls`' default will be used. By default it is
-`v:null`.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_complete_unimported = v:null
 <
 
                                                 *'g:go_gopls_deep_completion'*
 
-Specifies whether `gopls` should use deep completion. When it is `v:null`,
-`gopls`' default will be used. By default it is `v:null`.
+Specifies whether `gopls` should use deep completion.
 
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_deep_completion = v:null
 <
 
                                                        *'g:go_gopls_matcher'*
 
-Specifies how `gopls` should match for completions. Valid values are `v:null`,
-`fuzzy`, and `caseSensitive`.  When it is `v:null`, `gopls`' default will be
-used. By default it is `v:null`.
+Specifies how `gopls` should match for completions.
+
+Valid values are `v:null`, `fuzzy`, and `caseSensitive`. When it is `v:null`,
+`gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_matcher = v:null
 <
 
                                                    *'g:go_gopls_staticcheck'*
 
-Specifies whether `gopls` should run staticcheck checks. When it is `v:null`,
-`gopls`' default will be used. By default it is `v:null`.
+Specifies whether `gopls` should run staticcheck checks.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_staticcheck = v:null
 <
@@ -1852,8 +1863,9 @@ Specifies whether `gopls` should run staticcheck checks. When it is `v:null`,
 Specifies whether `gopls` can provide placeholders for function parameters and
 struct fields. When set, completion items will be treated as anonymous
 snippets if UltiSnips is installed and configured to be used as
-|'g:go_snippet_engine'|. When it is `v:null`, `gopls`' default will be used.
-By default it is `v:null`.
+|'g:go_snippet_engine'|.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_use_placeholders = v:null
 <
@@ -1861,8 +1873,9 @@ By default it is `v:null`.
                                                    *'g:go_gopls_temp_modfile'*
 
 Specifies whether `gopls` should use a temp modfile and suggest edits rather
-than modifying the ambient go.mod file.  When it is `v:null`, `gopls`' default
-will be used.  By default it is `v:null`.
+than modifying the ambient go.mod file.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_temp_modfile = v:null
 <
@@ -1870,16 +1883,18 @@ will be used.  By default it is `v:null`.
                                                          *'g:go_gopls_local'*
 
 Specifies the prefix for imports that `gopls` should consider group
-separately. When it is `v:null`, `gopls`' default will be used.  By default it
-is `v:null`.
+separately.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_local = v:null
 <
 
                                                        *'g:go_gopls_gofumpt'*
 
-Specifies whether `gopls` should use `gofumpt` for formatting. When it is
-`v:null`, `gopls`' default will be used.  By default it is `v:null`.
+Specifies whether `gopls` should use `gofumpt` for formatting.
+
+When it is `v:null`, `gopls`' default will be used. By default it is `v:null`.
 >
   let g:go_gopls_gofumpt = v:null
 <
@@ -1887,10 +1902,12 @@ Specifies whether `gopls` should use `gofumpt` for formatting. When it is
                                                       *'g:go_gopls_settings'*
 
 Specifies `gopls` workspace settings for `gopls` that are not yet officially
-supported by vim-go. Any value in the dictionary will be overridden by values
-provided in the specific options supported by vim-go (e.g.
-g:go_gopls_staticcheck) or settings statically configured by vim-go to ensure
-expected behavior. By default it is `v:null`.
+supported by vim-go.
+
+Any value in the dictionary will be overridden by values provided in the
+specific options supported by vim-go (e.g.  g:go_gopls_staticcheck) or
+settings statically configured by vim-go to ensure expected behavior. By
+default it is `v:null`.
 >
   let g:go_gopls_settings = v:null
 <
@@ -1898,7 +1915,9 @@ expected behavior. By default it is `v:null`.
 
 Specifies whether `gopls` diagnostics are enabled. Only the diagnostics for
 the current buffer will be processed when it is not set; all others will be
-ignored. By default it is disabled.
+ignored.
+
+By default it is disabled.
 >
   let g:go_diagnostics_enabled = 0
 <
@@ -2323,6 +2342,14 @@ The rest of the commands and mappings become available after executing
     Use `-test.flag` to pass flags to `go test` when debugging a test; for
     example `-test.v` or `-test.run TestFoo`
 
+                                                            *:GoDebugTestFunc*
+:GoDebugTestFunc [expand]
+
+    Behaves the same as |:GoDebugTest| and implicitly adds `-test.run` to run
+    the nearest test or example function (i.e the nearest function declaration
+    that matches `func Test` or `func Example`) at or previous to the cursor.
+    Search will not wrap around when at the top of the file.
+
                                                              *:GoDebugRestart*
 :GoDebugRestart
 

ftplugin/aspvbs.vim

@@ -0,0 +1,64 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
+
+" Vim filetype plugin file
+" Language:	aspvbs
+" Maintainer:	Dan Sharp <dwsharp at users dot sourceforge dot net>
+" Last Changed: 20 Jan 2009
+" URL:		http://dwsharp.users.sourceforge.net/vim/ftplugin
+
+if exists("b:did_ftplugin") | finish | endif
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Define some defaults in case the included ftplugins don't set them.
+let s:undo_ftplugin = ""
+let s:browsefilter = "HTML Files (*.html, *.htm)\t*.htm*\n" .
+	    \	     "All Files (*.*)\t*.*\n"
+let s:match_words = ""
+
+runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
+let b:did_ftplugin = 1
+
+" Override our defaults if these were set by an included ftplugin.
+if exists("b:undo_ftplugin")
+    let s:undo_ftplugin = b:undo_ftplugin
+endif
+if exists("b:browsefilter")
+    let s:browsefilter = b:browsefilter
+endif
+if exists("b:match_words")
+    let s:match_words = b:match_words
+endif
+
+" ASP:  Active Server Pages (with Visual Basic Script)
+" thanks to Gontran BAERTS
+if exists("loaded_matchit")
+  let s:notend = '\%(\<end\s\+\)\@<!'
+  let b:match_ignorecase = 1
+  let b:match_words =
+  \ s:notend . '\<if\>\%(.\{-}then\s\+\w\)\@!:\<elseif\>:^\s*\<else\>:\<end\s\+\<if\>,' .
+  \ s:notend . '\<select\s\+case\>:\<case\>:\<case\s\+else\>:\<end\s\+select\>,' .
+  \ '^\s*\<sub\>:\<end\s\+sub\>,' .
+  \ '^\s*\<function\>:\<end\s\+function\>,' .
+  \ '\<class\>:\<end\s\+class\>,' .
+  \ '^\s*\<do\>:\<loop\>,' .
+  \ '^\s*\<for\>:\<next\>,' .
+  \ '\<while\>:\<wend\>,' .
+  \ s:match_words
+endif
+
+" Change the :browse e filter to primarily show ASP-related files.
+if has("gui_win32")
+    let  b:browsefilter="ASP Files (*.asp)\t*.asp\n" . s:browsefilter
+endif
+
+let b:undo_ftplugin = "unlet! b:match_words b:match_ignorecase b:browsefilter | " . s:undo_ftplugin
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif

ftplugin/bzl.vim

@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
+
+" Vim filetype plugin file
+" Language:	Bazel (http://bazel.io)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Last Change:	2015 Aug 11
+
+""
+" @section Introduction, intro
+" Core settings for the bzl filetype, used for BUILD and *.bzl files for the
+" Bazel build system (http://bazel.io/).
+
+if exists('b:did_ftplugin')
+  finish
+endif
+
+
+" Vim 7.4.051 has opinionated settings in ftplugin/python.vim that try to force
+" PEP8 conventions on every python file, but these conflict with Google's
+" indentation guidelines. As a workaround, we explicitly source the system
+" ftplugin, but save indentation settings beforehand and restore them after.
+let s:save_expandtab = &l:expandtab
+let s:save_shiftwidth = &l:shiftwidth
+let s:save_softtabstop = &l:softtabstop
+let s:save_tabstop = &l:tabstop
+
+" NOTE: Vim versions before 7.3.511 had a ftplugin/python.vim that was broken
+" for compatible mode.
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Load base python ftplugin (also defines b:did_ftplugin).
+source $VIMRUNTIME/ftplugin/python.vim
+
+" NOTE: Vim versions before 7.4.104 and later set this in ftplugin/python.vim.
+setlocal comments=b:#,fb:-
+
+" Restore pre-existing indentation settings.
+let &l:expandtab = s:save_expandtab
+let &l:shiftwidth = s:save_shiftwidth
+let &l:softtabstop = s:save_softtabstop
+let &l:tabstop = s:save_tabstop
+
+setlocal formatoptions-=t
+
+" Make gf work with imports in BUILD files.
+setlocal includeexpr=substitute(v:fname,'//','','')
+
+" Enable syntax-based folding, if specified.
+if get(g:, 'ft_bzl_fold', 0)
+  setlocal foldmethod=syntax
+  setlocal foldtext=BzlFoldText()
+endif
+
+if exists('*BzlFoldText')
+  finish
+endif
+
+function BzlFoldText() abort
+  let l:start_num = nextnonblank(v:foldstart)
+  let l:end_num = prevnonblank(v:foldend)
+
+  if l:end_num <= l:start_num + 1
+    " If the fold is empty, don't print anything for the contents.
+    let l:content = ''
+  else
+    " Otherwise look for something matching the content regex.
+    " And if nothing matches, print an ellipsis.
+    let l:content = '...'
+    for l:line in getline(l:start_num + 1, l:end_num - 1)
+      let l:content_match = matchstr(l:line, '\m\C^\s*name = \zs.*\ze,$')
+      if !empty(l:content_match)
+        let l:content = l:content_match
+        break
+      endif
+    endfor
+  endif
+
+  " Enclose content with start and end
+  let l:start_text = getline(l:start_num)
+  let l:end_text = substitute(getline(l:end_num), '^\s*', '', '')
+  let l:text = l:start_text . ' ' . l:content . ' ' . l:end_text
+
+  " Compute the available width for the displayed text.
+  let l:width = winwidth(0) - &foldcolumn - (&number ? &numberwidth : 0)
+  let l:lines_folded = ' ' . string(1 + v:foldend - v:foldstart) . ' lines'
+
+  " Expand tabs, truncate, pad, and concatenate
+  let l:text = substitute(l:text, '\t', repeat(' ', &tabstop), 'g')
+  let l:text = strpart(l:text, 0, l:width - len(l:lines_folded))
+  let l:padding = repeat(' ', l:width - len(l:lines_folded) - len(l:text))
+  return l:text . l:padding . l:lines_folded
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif

ftplugin/gitignore.vim

@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal commentstring=#\ %s
+
+let b:undo_ftplugin = 'setlocal commentstring<'
+
+" vim: ts=2 et sw=2
+
+endif

ftplugin/handlebars.vim

@@ -0,0 +1,127 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+
+if exists('b:loaded_mustache_handlebars')
+  finish
+endif
+let b:loaded_mustache_handlebars = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Matchit support for Mustache & Handlebars
+" extending HTML matchit groups
+if exists("loaded_matchit") && exists("b:match_words")
+  let b:match_words = b:match_words
+  \ . ',{:},[:],(:),'
+  \ . '\%({{\)\@<=#\s*\%(if\|unless\)\s*.\{-}}}'
+  \ . ':'
+  \ . '\%({{\)\@<=\s*else\s*}}'
+  \ . ':'
+  \ . '\%({{\)\@<=/\s*\%(if\|unless\)\s*}},'
+  \ . '\%({{\)\@<=[#^]\s*\([-0-9a-zA-Z_?!/.]\+\).\{-}}}'
+  \ . ':'
+  \ . '\%({{\)\@<=/\s*\1\s*}}'
+endif
+
+" Set template for comment
+setlocal commentstring={{!--\ %s\ --}}
+
+if exists("g:mustache_abbreviations")
+  inoremap <buffer> {{{ {{{}}}<left><left><left>
+  inoremap <buffer> {{ {{}}<left><left>
+  inoremap <buffer> {{! {{!}}<left><left>
+  inoremap <buffer> {{< {{<}}<left><left>
+  inoremap <buffer> {{> {{>}}<left><left>
+  inoremap <buffer> {{# {{#}}<cr>{{/}}<up><left><left>
+  inoremap <buffer> {{if {{#if }}<cr>{{/if}}<up><left>
+  inoremap <buffer> {{ife {{#if }}<cr>{{else}}<cr>{{/if}}<up><up><left>
+endif
+
+
+" Section movement
+" Adapted from vim-ruby - many thanks to the maintainers of that plugin
+
+function! s:sectionmovement(pattern,flags,mode,count)
+  norm! m'
+  if a:mode ==# 'v'
+    norm! gv
+  endif
+  let i = 0
+  while i < a:count
+    let i = i + 1
+    " saving current position
+    let line = line('.')
+    let col  = col('.')
+    let pos = search(a:pattern,'W'.a:flags)
+    " if there's no more matches, return to last position
+    if pos == 0
+      call cursor(line,col)
+      return
+    endif
+  endwhile
+endfunction
+
+nnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','n',v:count1)<CR>
+nnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'n',v:count1)<CR>
+xnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','v',v:count1)<CR>
+xnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'v',v:count1)<CR>
+
+
+" Operator pending mappings
+
+" Operators are available by default. Set `let g:mustache_operators = 0` in
+" your .vimrc to disable them.
+if ! exists("g:mustache_operators")
+  let g:mustache_operators = 1
+endif
+
+if exists("g:mustache_operators") && g:mustache_operators
+  onoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
+  onoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
+  xnoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
+  xnoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
+endif
+
+function! s:wrap_around()
+  " If the cursor is at the end of the tag element, move back
+  " so that the end tag can be detected.
+  while getline('.')[col('.')-1] ==# '}'
+    execute 'norm h'
+  endwhile
+
+  " Moves to the end of the closing tag
+  let pos = search('}}','We')
+  if pos != 0
+    if getline('.')[col('.')] ==# '}'
+      " Ending tag contains 3 closing brackets '}}}',
+      " move to the last bracket.
+      execute 'norm l'
+    endif
+
+    " select the whole tag
+    execute 'norm v%'
+  endif
+endfunction
+
+function! s:wrap_inside()
+  " If the cursor is at the end of the tag element, move back
+  " so that the end tag can be detected.
+  while getline('.')[col('.')-1] ==# '}'
+    execute 'norm h'
+  endwhile
+
+  " Moves to the end of the closing tag
+  let pos = search('}}','W')
+  if pos != 0
+    " select only inside the tag
+    execute 'norm v%loho'
+  endif
+endfunction
+
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: nofoldenable
+
+endif

ftplugin/htmldjango.vim

@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim filetype plugin file
+" Language:	Django HTML template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2007 Jan 25
+
+" Only use this filetype plugin when no other was loaded.
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Use HTML and Django template ftplugins.
+runtime! ftplugin/html.vim
+runtime! ftplugin/django.vim
+
+endif

ftplugin/mustache.vim

@@ -1,127 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
-if exists('b:loaded_mustache_handlebars')
-  finish
-endif
-let b:loaded_mustache_handlebars = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-
-" Matchit support for Mustache & Handlebars
-" extending HTML matchit groups
-if exists("loaded_matchit") && exists("b:match_words")
-  let b:match_words = b:match_words
-  \ . ',{:},[:],(:),'
-  \ . '\%({{\)\@<=#\s*\%(if\|unless\)\s*.\{-}}}'
-  \ . ':'
-  \ . '\%({{\)\@<=\s*else\s*}}'
-  \ . ':'
-  \ . '\%({{\)\@<=/\s*\%(if\|unless\)\s*}},'
-  \ . '\%({{\)\@<=[#^]\s*\([-0-9a-zA-Z_?!/.]\+\).\{-}}}'
-  \ . ':'
-  \ . '\%({{\)\@<=/\s*\1\s*}}'
-endif
-
-" Set template for comment
-setlocal commentstring={{!--\ %s\ --}}
-
-if exists("g:mustache_abbreviations")
-  inoremap <buffer> {{{ {{{}}}<left><left><left>
-  inoremap <buffer> {{ {{}}<left><left>
-  inoremap <buffer> {{! {{!}}<left><left>
-  inoremap <buffer> {{< {{<}}<left><left>
-  inoremap <buffer> {{> {{>}}<left><left>
-  inoremap <buffer> {{# {{#}}<cr>{{/}}<up><left><left>
-  inoremap <buffer> {{if {{#if }}<cr>{{/if}}<up><left>
-  inoremap <buffer> {{ife {{#if }}<cr>{{else}}<cr>{{/if}}<up><up><left>
-endif
-
-
-" Section movement
-" Adapted from vim-ruby - many thanks to the maintainers of that plugin
-
-function! s:sectionmovement(pattern,flags,mode,count)
-  norm! m'
-  if a:mode ==# 'v'
-    norm! gv
-  endif
-  let i = 0
-  while i < a:count
-    let i = i + 1
-    " saving current position
-    let line = line('.')
-    let col  = col('.')
-    let pos = search(a:pattern,'W'.a:flags)
-    " if there's no more matches, return to last position
-    if pos == 0
-      call cursor(line,col)
-      return
-    endif
-  endwhile
-endfunction
-
-nnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','n',v:count1)<CR>
-nnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'n',v:count1)<CR>
-xnoremap <silent> <buffer> [[ :<C-U>call <SID>sectionmovement('{{','b','v',v:count1)<CR>
-xnoremap <silent> <buffer> ]] :<C-U>call <SID>sectionmovement('{{','' ,'v',v:count1)<CR>
-
-
-" Operator pending mappings
-
-" Operators are available by default. Set `let g:mustache_operators = 0` in
-" your .vimrc to disable them.
-if ! exists("g:mustache_operators")
-  let g:mustache_operators = 1
-endif
-
-if exists("g:mustache_operators") && g:mustache_operators
-  onoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
-  onoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
-  xnoremap <silent> <buffer> ie :<C-U>call <SID>wrap_inside()<CR>
-  xnoremap <silent> <buffer> ae :<C-U>call <SID>wrap_around()<CR>
-endif
-
-function! s:wrap_around()
-  " If the cursor is at the end of the tag element, move back
-  " so that the end tag can be detected.
-  while getline('.')[col('.')-1] ==# '}'
-    execute 'norm h'
-  endwhile
-
-  " Moves to the end of the closing tag
-  let pos = search('}}','We')
-  if pos != 0
-    if getline('.')[col('.')] ==# '}'
-      " Ending tag contains 3 closing brackets '}}}',
-      " move to the last bracket.
-      execute 'norm l'
-    endif
-
-    " select the whole tag
-    execute 'norm v%'
-  endif
-endfunction
-
-function! s:wrap_inside()
-  " If the cursor is at the end of the tag element, move back
-  " so that the end tag can be detected.
-  while getline('.')[col('.')-1] ==# '}'
-    execute 'norm h'
-  endwhile
-
-  " Moves to the end of the closing tag
-  let pos = search('}}','W')
-  if pos != 0
-    " select only inside the tag
-    execute 'norm v%loho'
-  endif
-endfunction
-
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: nofoldenable
+runtime! ftplugin/handlebars*.vim ftplugin/handlebars/*.vim
 
 endif

ftplugin/prolog.vim

@@ -0,0 +1,24 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
+
+" Vim filetype plugin file
+" Language:             Prolog
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
+" Latest Revision:      2008-07-09
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< fo<"
+
+setlocal comments=s1:/*,mb:*,ex:*/,:% commentstring=%\ %s
+setlocal formatoptions-=t formatoptions+=croql
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif

ftplugin/zig.vim

@@ -21,14 +21,31 @@ setlocal formatoptions-=t formatoptions+=croql
 setlocal suffixesadd=.zig,.zir
 setlocal makeprg=zig\ build
 
-if has("comments")
+if has('comments')
     setlocal comments=:///,://!,://,:\\\\
     setlocal commentstring=//\ %s
 endif
 
-let b:undo_ftplugin = "setl et< ts< sts< sw< fo< sua< mp< com< cms<"
+if has('find_in_path')
+    let &l:includeexpr='substitute(v:fname, "^([^.])$", "\1.zig", "")'
+    let &l:include='\v(\@import>|\@cInclude>|^\s*\#\s*include)'
+endif
+
+let &l:define='\v(<fn>|<const>|<var>|^\s*\#\s*define)'
+
+if exists("*json_decode") && executable('zig')
+    silent let s:env = system('zig env')
+    if v:shell_error == 0
+        let &l:path=json_decode(s:env)['std_dir'] . ',' . &l:path
+    endif
+    unlet! s:env
+endif
+
+let b:undo_ftplugin =
+    \ 'setl et< ts< sts< sw< fo< sua< mp< com< cms< inex< inc< pa<'
 
 let &cpo = s:cpo_orig
 unlet s:cpo_orig
+" vim: tabstop=8 shiftwidth=4 softtabstop=4 expandtab
 
 endif

heuristics.yaml

@@ -11,12 +11,12 @@ rules:
 ---
 extensions: [asa]
 rules:
-- override: "g:filetype_asa"
+- override: true
 - filetype: aspvbs
 ---
 extensions: [asp]
 rules:
-- override: "g:filetype_asp"
+- override: true
 - lines: 3
   pattern: 'perlscript'
   ignore_case: true
@@ -54,7 +54,7 @@ rules:
     filetype: murphi
 - if_set: "saw_comment"
   filetype: objc
-- override: "g:filetype_m"
+- override: true
 - filetype: octave
 ---
 extensions: [fs]
@@ -67,7 +67,7 @@ rules:
     filetype: fsharp
   - pattern: '\s*(#version|precision|uniform|varying|vec[234])'
     filetype: glsl
-- override: "g:filetype_fs"
+- override: true
 - filetype: forth
 ---
 extensions: [re]
@@ -98,7 +98,7 @@ rules:
     filetype: idris2
   - pattern: '^%access .*'
     filetype: idris
-  - override: 'g:filetype_idr'
+- override: true
 - filetype: idris2
 ---
 extensions: [lidr]
@@ -115,3 +115,76 @@ rules:
   filetype: vb
   ignore_case: true
 - filetype: basic
+---
+extensions: [pm]
+rules:
+- lines: 1
+  rules:
+  - pattern: 'XPM2'
+    filetype: xpm2
+  - pattern: 'XPM'
+    filetype: xpm
+- lines: 50
+  rules:
+  - pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+    filetype: raku
+  - pattern: '\buse\s+(?:strict\b|v?5\.)'
+    filetype: perl
+- override: true
+- filetype: perl
+---
+extensions: [pl]
+rules:
+- lines: 1
+  or:
+  - pattern: '^[^#]*:-'
+  - pattern: '^\s*(?:%|/\*)'
+  - pattern: '\.\s*$'
+  filetype: prolog
+- lines: 50
+  rules:
+  - pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+    filetype: raku
+  - pattern: '\buse\s+(?:strict\b|v?5\.)'
+    filetype: perl
+- override: true
+- filetype: perl
+---
+extensions: [t]
+rules:
+- lines: 5
+  pattern: '^\.'
+  filetype: nroff
+- lines: 50
+  rules:
+  - pattern: '^\s*(?:use\s+v6\b|\bmodule\b|\b(?:my\s+)?class\b)'
+    filetype: raku
+  - pattern: '\buse\s+(?:strict\b|v?5\.)'
+    filetype: perl
+  ## I haven't found turing syntax for vim...
+  # - pattern: '^\s*%[ \t]+|^\s*var\s+\w+(\s*:\s*\w+)?\s*:=\s*\w+'
+  #   filetype: turing
+- override: true
+- filetype: perl
+---
+extensions: [tt2]
+rules:
+- lines: 3
+  pattern: '<(?:!DOCTYPE HTML|[%?]|html)'
+  ignore_case: true
+  filetype: tt2html
+- filetype: tt2
+---
+extensions: [html]
+rules:
+- lines: 1
+  pattern: '^(%|<[%&].*>)'
+  filetype: mason
+- lines: 50
+  rules:
+  - pattern: '{{.*}}|{%-?\s*(end.*|extends|block|macro|set|if|for|include|trans)\b|{#\s+'
+    filetype: htmldjango
+  - pattern: '\bDTD\s+XHTML\s'
+    filetype: xhtml
+- filetype: html
+  fallback: true

indent/bzl.vim

@@ -0,0 +1,98 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
+
+" Vim indent file
+" Language:	Bazel (http://bazel.io)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Last Change:	2017 Jun 13
+
+if exists('b:did_indent')
+  finish
+endif
+
+" Load base python indent.
+if !exists('*GetPythonIndent')
+  runtime! indent/python.vim
+endif
+
+let b:did_indent = 1
+
+" Only enable bzl google indent if python google indent is enabled.
+if !get(g:, 'no_google_python_indent')
+  setlocal indentexpr=GetBzlIndent(v:lnum)
+endif
+
+if exists('*GetBzlIndent')
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo-=C
+
+" Maximum number of lines to look backwards.
+let s:maxoff = 50
+
+""
+" Determine the correct indent level given an {lnum} in the current buffer.
+function GetBzlIndent(lnum) abort
+  let l:use_recursive_indent = !get(g:, 'no_google_python_recursive_indent')
+  if l:use_recursive_indent
+    " Backup and override indent setting variables.
+    if exists('g:pyindent_nested_paren')
+      let l:pyindent_nested_paren = g:pyindent_nested_paren
+    endif
+    if exists('g:pyindent_open_paren')
+      let l:pyindent_open_paren = g:pyindent_open_paren
+    endif
+    let g:pyindent_nested_paren = 'shiftwidth() * 2'
+    let g:pyindent_open_paren = 'shiftwidth() * 2'
+  endif
+
+  let l:indent = -1
+
+  " Indent inside parens.
+  " Align with the open paren unless it is at the end of the line.
+  " E.g.
+  "   open_paren_not_at_EOL(100,
+  "                         (200,
+  "                          300),
+  "                         400)
+  "   open_paren_at_EOL(
+  "       100, 200, 300, 400)
+  call cursor(a:lnum, 1)
+  let [l:par_line, l:par_col] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW',
+      \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" .
+      \ " synIDattr(synID(line('.'), col('.'), 1), 'name')" .
+      \ " =~ '\\(Comment\\|String\\)$'")
+  if l:par_line > 0
+    call cursor(l:par_line, 1)
+    if l:par_col != col('$') - 1
+      let l:indent = l:par_col
+    endif
+  endif
+
+  " Delegate the rest to the original function.
+  if l:indent == -1
+    let l:indent = GetPythonIndent(a:lnum)
+  endif
+
+  if l:use_recursive_indent
+    " Restore global variables.
+    if exists('l:pyindent_nested_paren')
+      let g:pyindent_nested_paren = l:pyindent_nested_paren
+    else
+      unlet g:pyindent_nested_paren
+    endif
+    if exists('l:pyindent_open_paren')
+      let g:pyindent_open_paren = l:pyindent_open_paren
+    else
+      unlet g:pyindent_open_paren
+    endif
+  endif
+
+  return l:indent
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif

indent/erlang.vim

@@ -6,7 +6,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Contributors: Edwin Fine <efine145_nospam01 at usa dot net>
 "               Pawel 'kTT' Salata <rockplayer.pl@gmail.com>
 "               Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
-" Last Update:  2017-Feb-28
+" Last Update:  2020-Jun-11
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 

indent/graphql.vim

@@ -45,6 +45,10 @@ endif
 let s:cpo_save = &cpoptions
 set cpoptions&vim
 
+" searchpair() skip expression that matches in comments and strings.
+let s:pair_skip_expr =
+  \ 'synIDattr(synID(line("."), col("."), 0), "name") =~? "comment\\|string"'
+
 " Check if the character at lnum:col is inside a string.
 function s:InString(lnum, col)
   return synIDattr(synID(a:lnum, a:col, 1), 'name') ==# 'graphqlString'
@@ -61,18 +65,18 @@ function GetGraphQLIndent()
   let l:line = getline(v:lnum)
 
   " If this line contains just a closing bracket, find its matching opening
-  " bracket and indent the closing backet to match.
+  " bracket and indent the closing bracket to match.
   let l:col = matchend(l:line, '^\s*[]})]')
   if l:col > 0 && !s:InString(v:lnum, l:col)
-    let l:bracket = l:line[l:col - 1]
     call cursor(v:lnum, l:col)
 
-    if l:bracket is# '}'
-      let l:matched = searchpair('{', '', '}', 'bW')
-    elseif l:bracket is# ']'
-      let l:matched = searchpair('\[', '', '\]', 'bW')
-    elseif l:bracket is# ')'
-      let l:matched = searchpair('(', '', ')', 'bW')
+    let l:bracket = l:line[l:col - 1]
+    if l:bracket ==# '}'
+      let l:matched = searchpair('{', '', '}', 'bW', s:pair_skip_expr)
+    elseif l:bracket ==# ']'
+      let l:matched = searchpair('\[', '', '\]', 'bW', s:pair_skip_expr)
+    elseif l:bracket ==# ')'
+      let l:matched = searchpair('(', '', ')', 'bW', s:pair_skip_expr)
     else
       let l:matched = -1
     endif
@@ -85,9 +89,8 @@ function GetGraphQLIndent()
     return indent(v:lnum)
   endif
 
-  " If the previous line contained an opening bracket, and we are still in it,
-  " add indent depending on the bracket type.
-  if getline(l:prevlnum) =~# '[[{(]\s*$'
+  " If the previous line ended with an opening bracket, indent this line.
+  if getline(l:prevlnum) =~# '\%(#.*\)\@<![[{(]\s*$'
     return indent(l:prevlnum) + shiftwidth()
   endif
 

indent/handlebars.vim

@@ -0,0 +1,129 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+
+" Mustache & Handlebars syntax
+" Language:	Mustache, Handlebars
+" Maintainer:	Juvenn Woo <machese@gmail.com>
+" Screenshot:   http://imgur.com/6F408
+" Version:	3
+" Last Change:  26 Nov 2018
+" Remarks: based on eruby indent plugin by tpope
+" References:
+"   [Mustache](http://github.com/defunkt/mustache)
+"   [Handlebars](https://github.com/wycats/handlebars.js)
+"   [ctemplate](http://code.google.com/p/google-ctemplate/)
+"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
+"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
+
+if exists("b:did_indent_hbs")
+  finish
+endif
+
+unlet! b:did_indent
+setlocal indentexpr=
+
+runtime! indent/html.vim
+unlet! b:did_indent
+
+" Force HTML indent to not keep state.
+let b:html_indent_usestate = 0
+
+if &l:indentexpr == ''
+  if &l:cindent
+    let &l:indentexpr = 'cindent(v:lnum)'
+  else
+    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
+  endif
+endif
+let b:handlebars_subtype_indentexpr = &l:indentexpr
+
+let b:did_indent = 1
+let b:did_indent_hbs = 1
+
+setlocal indentexpr=GetHandlebarsIndent()
+setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
+
+" Only define the function once.
+if exists("*GetHandlebarsIndent")
+  finish
+endif
+
+function! GetHandlebarsIndent(...)
+  " The value of a single shift-width
+  if exists('*shiftwidth')
+    let sw = shiftwidth()
+  else
+    let sw = &sw
+  endif
+
+  if a:0 && a:1 == '.'
+    let v:lnum = line('.')
+  elseif a:0 && a:1 =~ '^\d'
+    let v:lnum = a:1
+  endif
+  let vcol = col('.')
+  call cursor(v:lnum,1)
+  call cursor(v:lnum,vcol)
+  exe "let ind = ".b:handlebars_subtype_indentexpr
+
+  " Workaround for Andy Wokula's HTML indent. This should be removed after
+  " some time, since the newest version is fixed in a different way.
+  if b:handlebars_subtype_indentexpr =~# '^HtmlIndent('
+  \ && exists('b:indent')
+  \ && type(b:indent) == type({})
+  \ && has_key(b:indent, 'lnum')
+    " Force HTML indent to not keep state
+    let b:indent.lnum = -1
+  endif
+  let lnum = prevnonblank(v:lnum-1)
+  let prevLine = getline(lnum)
+  let currentLine = getline(v:lnum)
+
+  " all indent rules only apply if the block opening/closing
+  " tag is on a separate line
+
+  " indent after block {{#block
+  if prevLine =~# '\v\s*\{\{[#^].*\s*'
+    let ind = ind + sw
+  endif
+  " but not if the block ends on the same line
+  if prevLine =~# '\v\s*\{\{\#(.+)(\s+|\}\}).*\{\{\/\1'
+    let ind = ind - sw
+  endif
+  " unindent after block close {{/block}}
+  if currentLine =~# '\v^\s*\{\{\/\S*\}\}\s*'
+    let ind = ind - sw
+  endif
+  " indent after component block {{a-component
+  if prevLine =~# '\v\s*\{\{\w'
+    let ind = ind + sw
+  endif
+  " but not if the component block ends on the same line
+  if prevLine =~# '\v\s*\{\{\w(.+)\}\}'
+    let ind = ind - sw
+  endif
+  " unindent }} lines, and following lines if not inside a block expression
+  let savedPos = getpos('.')
+  if currentLine =~# '\v^\s*\}\}\s*$' || (currentLine !~# '\v^\s*\{\{\/' && prevLine =~# '\v^\s*[^\{\} \t]+\}\}\s*$')
+    let closingLnum = search('}}\s*$', 'Wbc', lnum)
+    let [openingLnum, col] = searchpairpos('{{', '', '}}', 'Wb')
+    if openingLnum > 0 && closingLnum > 0
+      if strpart(getline(openingLnum), col - 1, 3) !~ '{{[#^]'
+        let ind = ind - sw
+      endif
+    else
+      call setpos('.', savedPos)
+    endif
+  endif
+  " unindent {{else}}
+  if currentLine =~# '\v^\s*\{\{else.*\}\}\s*$'
+    let ind = ind - sw
+  endif
+  " indent again after {{else}}
+  if prevLine =~# '\v^\s*\{\{else.*\}\}\s*$'
+    let ind = ind + sw
+  endif
+
+  return ind
+endfunction
+
+endif

indent/htmldjango.vim

@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim indent file
+" Language:	Django HTML template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2007 Jan 25
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+  finish
+endif
+
+" Use HTML formatting rules.
+runtime! indent/html.vim
+
+endif

indent/jinja.vim

@@ -1,84 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" Vim indent file
-" Language:	Jinja HTML template
-" Maintainer:	Evan Hammer <evan@evanhammer.com>
-" Last Change:	2013 Jan 26
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-  finish
-endif
-
-" Use HTML formatting rules.
-setl indentkeys=o,O,<Return>,<>>,!^F
-runtime! indent/html.vim		 +setl nosmartindent
-let b:did_indent = 1
-
-" Indent within the jinja tags
-" Made by Steve Losh <steve@stevelosh.com>
-if &l:indentexpr == ''
-    if &l:cindent
-        let &l:indentexpr = 'cindent(v:lnum)'
-    else
-        let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
-    endif
-endif
-let b:html_indentexpr = &l:indentexpr
-
-let b:did_indent = 1
-
-setlocal indentexpr=GetDjangoIndent()
-setlocal indentkeys=o,O,*<Return>,{,},o,O,!^F,<>>
-
-" Only define the function once.
-if exists("*GetDjangoIndent")
-    finish
-endif
-
-function! GetDjangoIndent(...)
-    if a:0 && a:1 == '.'
-        let v:lnum = line('.')
-    elseif a:0 && a:1 =~ '^\d'
-        let v:lnum = a:1
-    endif
-    let vcol = col('.')
-
-    call cursor(v:lnum,vcol)
-
-    exe "let ind = ".b:html_indentexpr
-
-    let lnum = prevnonblank(v:lnum-1)
-    let pnb = getline(lnum)
-    let cur = getline(v:lnum)
-
-    let tagstart = '.*' . '{%\s*'
-    let tagend = '.*%}' . '.*'
-
-    let blocktags = '\(block\|for\|if\|with\|autoescape\|comment\|filter\|spaceless\)'
-    let midtags = '\(empty\|else\|elif\)'
-
-    let pnb_blockstart = pnb =~# tagstart . blocktags . tagend
-    let pnb_blockend   = pnb =~# tagstart . 'end' . blocktags . tagend
-    let pnb_blockmid   = pnb =~# tagstart . midtags . tagend
-
-    let cur_blockstart = cur =~# tagstart . blocktags . tagend
-    let cur_blockend   = cur =~# tagstart . 'end' . blocktags . tagend
-    let cur_blockmid   = cur =~# tagstart . midtags . tagend
-
-    if pnb_blockstart && !pnb_blockend
-        let ind = ind + &sw
-    elseif pnb_blockmid && !pnb_blockend
-        let ind = ind + &sw
-    endif
-
-    if cur_blockend && !cur_blockstart
-        let ind = ind - &sw
-    elseif cur_blockmid
-        let ind = ind - &sw
-    endif
-
-    return ind
-endfunction
-
-endif

indent/mustache.vim

@@ -1,129 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
-" Mustache & Handlebars syntax
-" Language:	Mustache, Handlebars
-" Maintainer:	Juvenn Woo <machese@gmail.com>
-" Screenshot:   http://imgur.com/6F408
-" Version:	3
-" Last Change:  26 Nov 2018
-" Remarks: based on eruby indent plugin by tpope
-" References:
-"   [Mustache](http://github.com/defunkt/mustache)
-"   [Handlebars](https://github.com/wycats/handlebars.js)
-"   [ctemplate](http://code.google.com/p/google-ctemplate/)
-"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
-"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
-
-if exists("b:did_indent_hbs")
-  finish
-endif
-
-unlet! b:did_indent
-setlocal indentexpr=
-
-runtime! indent/html.vim
-unlet! b:did_indent
-
-" Force HTML indent to not keep state.
-let b:html_indent_usestate = 0
-
-if &l:indentexpr == ''
-  if &l:cindent
-    let &l:indentexpr = 'cindent(v:lnum)'
-  else
-    let &l:indentexpr = 'indent(prevnonblank(v:lnum-1))'
-  endif
-endif
-let b:handlebars_subtype_indentexpr = &l:indentexpr
-
-let b:did_indent = 1
-let b:did_indent_hbs = 1
-
-setlocal indentexpr=GetHandlebarsIndent()
-setlocal indentkeys=o,O,*<Return>,<>>,{,},0),0],o,O,!^F,=end,=else,=elsif,=rescue,=ensure,=when
-
-" Only define the function once.
-if exists("*GetHandlebarsIndent")
-  finish
-endif
-
-function! GetHandlebarsIndent(...)
-  " The value of a single shift-width
-  if exists('*shiftwidth')
-    let sw = shiftwidth()
-  else
-    let sw = &sw
-  endif
-
-  if a:0 && a:1 == '.'
-    let v:lnum = line('.')
-  elseif a:0 && a:1 =~ '^\d'
-    let v:lnum = a:1
-  endif
-  let vcol = col('.')
-  call cursor(v:lnum,1)
-  call cursor(v:lnum,vcol)
-  exe "let ind = ".b:handlebars_subtype_indentexpr
-
-  " Workaround for Andy Wokula's HTML indent. This should be removed after
-  " some time, since the newest version is fixed in a different way.
-  if b:handlebars_subtype_indentexpr =~# '^HtmlIndent('
-  \ && exists('b:indent')
-  \ && type(b:indent) == type({})
-  \ && has_key(b:indent, 'lnum')
-    " Force HTML indent to not keep state
-    let b:indent.lnum = -1
-  endif
-  let lnum = prevnonblank(v:lnum-1)
-  let prevLine = getline(lnum)
-  let currentLine = getline(v:lnum)
-
-  " all indent rules only apply if the block opening/closing
-  " tag is on a separate line
-
-  " indent after block {{#block
-  if prevLine =~# '\v\s*\{\{[#^].*\s*'
-    let ind = ind + sw
-  endif
-  " but not if the block ends on the same line
-  if prevLine =~# '\v\s*\{\{\#(.+)(\s+|\}\}).*\{\{\/\1'
-    let ind = ind - sw
-  endif
-  " unindent after block close {{/block}}
-  if currentLine =~# '\v^\s*\{\{\/\S*\}\}\s*'
-    let ind = ind - sw
-  endif
-  " indent after component block {{a-component
-  if prevLine =~# '\v\s*\{\{\w'
-    let ind = ind + sw
-  endif
-  " but not if the component block ends on the same line
-  if prevLine =~# '\v\s*\{\{\w(.+)\}\}'
-    let ind = ind - sw
-  endif
-  " unindent }} lines, and following lines if not inside a block expression
-  let savedPos = getpos('.')
-  if currentLine =~# '\v^\s*\}\}\s*$' || (currentLine !~# '\v^\s*\{\{\/' && prevLine =~# '\v^\s*[^\{\} \t]+\}\}\s*$')
-    let closingLnum = search('}}\s*$', 'Wbc', lnum)
-    let [openingLnum, col] = searchpairpos('{{', '', '}}', 'Wb')
-    if openingLnum > 0 && closingLnum > 0
-      if strpart(getline(openingLnum), col - 1, 3) !~ '{{[#^]'
-        let ind = ind - sw
-      endif
-    else
-      call setpos('.', savedPos)
-    endif
-  endif
-  " unindent {{else}}
-  if currentLine =~# '\v^\s*\{\{else.*\}\}\s*$'
-    let ind = ind - sw
-  endif
-  " indent again after {{else}}
-  if prevLine =~# '\v^\s*\{\{else.*\}\}\s*$'
-    let ind = ind + sw
-  endif
-
-  return ind
-endfunction
+runtime! indent/handlebars.vim
 
 endif

indent/odin.vim

@@ -0,0 +1,41 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal nosmartindent
+setlocal nolisp
+setlocal autoindent
+
+setlocal indentexpr=GetOdinIndent(v:lnum)
+
+if exists("*GetOdinIndent")
+  finish
+endif
+
+function! GetOdinIndent(lnum)
+  let prev = prevnonblank(a:lnum-1)
+
+  if prev == 0
+    return 0
+  endif
+
+  let prevline = getline(prev)
+  let line = getline(a:lnum)
+
+  let ind = indent(prev)
+
+  if prevline =~ '[({]\s*$'
+    let ind += &sw
+  endif
+
+  if line =~ '^\s*[)}]'
+    let ind -= &sw
+  endif
+
+  return ind
+endfunction
+
+endif

indent/prolog.vim

@@ -0,0 +1,71 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
+
+"  vim: set sw=4 sts=4:
+"  Maintainer	: Gergely Kontra <kgergely@mcl.hu>
+"  Revised on	: 2002.02.18. 23:34:05
+"  Language	: Prolog
+"  Last change by: Takuya Fujiwara, 2018 Sep 23
+
+" TODO:
+"   checking with respect to syntax highlighting
+"   ignoring multiline comments
+"   detecting multiline strings
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetPrologIndent()
+setlocal indentkeys-=:,0#
+setlocal indentkeys+=0%,-,0;,>,0)
+
+" Only define the function once.
+"if exists("*GetPrologIndent")
+"    finish
+"endif
+
+function! GetPrologIndent()
+    " Find a non-blank line above the current line.
+    let pnum = prevnonblank(v:lnum - 1)
+    " Hit the start of the file, use zero indent.
+    if pnum == 0
+       return 0
+    endif
+    let line = getline(v:lnum)
+    let pline = getline(pnum)
+
+    let ind = indent(pnum)
+    " Previous line was comment -> use previous line's indent
+    if pline =~ '^\s*%'
+	return ind
+    endif
+    " Previous line was the start of block comment -> +1 after '/*' comment
+    if pline =~ '^\s*/\*'
+	return ind + 1
+    endif
+    " Previous line was the end of block comment -> -1 after '*/' comment
+    if pline =~ '^\s*\*/'
+	return ind - 1
+    endif
+    " Check for clause head on previous line
+    if pline =~ '\%(:-\|-->\)\s*\(%.*\)\?$'
+	let ind = ind + shiftwidth()
+    " Check for end of clause on previous line
+    elseif pline =~ '\.\s*\(%.*\)\?$'
+	let ind = ind - shiftwidth()
+    endif
+    " Check for opening conditional on previous line
+    if pline =~ '^\s*\([(;]\|->\)'
+	let ind = ind + shiftwidth()
+    endif
+    " Check for closing an unclosed paren, or middle ; or ->
+    if line =~ '^\s*\([);]\|->\)'
+	let ind = ind - shiftwidth()
+    endif
+    return ind
+endfunction
+
+endif

indent/terraform.vim

@@ -10,11 +10,11 @@ let s:cpo_save = &cpoptions
 set cpoptions&vim
 
 setlocal nolisp
-setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
 setlocal indentexpr=TerraformIndent(v:lnum)
 setlocal indentkeys+=<:>,0=},0=)
 let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
-  \ . ' indentexpr< indentkeys<'
+  \ . ' expandtab< indentexpr< indentkeys<'
 
 let &cpoptions = s:cpo_save
 unlet s:cpo_save

packages.yaml

@@ -169,7 +169,7 @@ filetypes:
   - '*/etc/httpd/conf.d/*.conf*'
 ---
 name: apiblueprint
-remote: sheerun/apiblueprint.vim
+remote: kylef/apiblueprint.vim
 filetypes:
 - name: apiblueprint
   linguist: API Blueprint
@@ -345,6 +345,11 @@ filetypes:
   filenames:
   - Caddyfile
 ---
+name: cpp-modern
+remote: bfrg/vim-cpp-modern
+after: c/c++
+filetypes: []
+---
 name: carp
 remote: hellerve/carp-vim
 filetypes:
@@ -435,9 +440,6 @@ remote: tpope/vim-cucumber
 filetypes:
 - name: cucumber
   linguist: Gherkin
-  extra_extensions:
-  # https://github.com/search?q=extension%3Astory+when&type=Code
-  - story
 ---
 name: cue
 remote: mgrabovsky/vim-cuesheet
@@ -715,7 +717,8 @@ filetypes:
   - '*/etc/grub.conf'
 ---
 name: haml
-remote: sheerun/vim-haml
+remote: tpope/vim-haml
+glob: '**/haml.vim'
 filetypes:
 - name: haml
   linguist: Haml
@@ -724,16 +727,17 @@ filetypes:
   - hamlbars
 ---
 name: handlebars
-remote: sheerun/vim-mustache-handlebars
+remote: mustache/vim-mustache-handlebars
 filetypes:
-- name: mustache
-  linguist: Handlebars
+- name: html.mustache
+  linguist: Mustache
   extra_extensions:
+  - hogan
   - hulk
   - hjs
-  - mustache
-  - njk
-  - hogan
+- name: html.handlebars
+  linguist: Handlebars
+  extra_extensions:
   - hdbs
   - hb
 ---
@@ -765,8 +769,6 @@ remote: b4b4r07/vim-hcl
 filetypes:
 - name: hcl
   linguist: HCL
-  extra_extensions:
-  - nomad
   extra_filenames:
   - Appfile
   ignored_extensions:
@@ -868,15 +870,14 @@ filetypes:
   - Jenkinsfile
   - Jenkinsfile*
 ---
-name: jinja
-remote: lepture/vim-jinja
+name: htmldjango
+remote: vim/vim:runtime
+globs:
+- '**/django.vim'
+- '**/htmldjango.vim'
 filetypes:
-- name: jinja.html
+- name: htmldjango
   linguist: HTML+Django
-  extra_extensions:
-  - j2
-  ignored_extensions:
-  - njk
   ignore_warnings:
   # handled by mustache plugin
   - mustache
@@ -1175,6 +1176,23 @@ remote: vim-perl/vim-perl
 filetypes:
 - name: perl
   linguist: Perl
+- name: pod
+  extensions:
+  - pod
+- name: mason
+  extensions:
+  - mason
+  - mhtml
+  - comp
+- name: tt2
+  extensions:
+  - tt2
+- name: tt2html
+  extensions:
+  - tt2
+- name: xs
+  extensions:
+  - xs
 ---
 name: pgsql
 remote: lifepillar/pgsql.vim
@@ -1197,7 +1215,6 @@ remote: StanAngeloff/php.vim
 filetypes:
 - name: php
   linguist: PHP
-# Needs to be after .php (can be .blade.php)
 ---
 name: blade
 remote: jwalton512/vim-blade
@@ -1416,7 +1433,9 @@ filetypes:
   - '*_spec.rb'
 ---
 name: yard
-remote: sheerun/vim-yardoc
+remote: noprompt/vim-yardoc
+patches:
+- 'https://github.com/sheerun/vim-yardoc/commit/173924ec12a66e26a886e80431b92cc9bda578d4.patch'
 # just adds to ruby
 filetypes: []
 ---
@@ -1706,6 +1725,9 @@ filetypes:
   linguist: XML
   extra_extensions:
   - cdxml
+  - tpm
+  - csproj.user
+  - wpl
   ignored_extensions:
   - ts
   - tsx
@@ -1825,5 +1847,47 @@ filetypes:
   - 'php.ini-*'
   - '*/etc/yum.conf'
   - '*/etc/yum.repos.d/*'
+  ignored_extensions:
+  - cfg
   ignored_warnings:
   - php.ini
+---
+name: odin
+remote: Tetralux/odin.vim
+filetypes:
+- name: odin
+  linguist: Odin
+---
+name: bzl
+remote: vim/vim:runtime
+glob: '**/bzl.vim'
+filetypes:
+- name: bzl
+  linguist: Starlark
+  extra_extensions:
+  - bazel
+  - BUILD
+---
+name: prolog
+remote: vim/vim:runtime
+glob: '**/prolog.vim'
+filetypes:
+- name: prolog
+  linguist: Prolog
+---
+name: tads
+remote: vim/vim:runtime
+glob: '**/tads.vim'
+filetypes:
+- name: tads
+  extensions:
+  - t
+---
+name: gitignore
+remote: fszymanski/fzf-gitignore
+filetypes:
+- name: gitignore
+  filenames:
+  - '.gitignore'
+  - '*/.config/git/ignore'
+  - '*.git/info/exclude'

polyglot.vim

@@ -0,0 +1,379 @@
+""" autoload/polyglot.vim
+
+" Line continuation is used here, remove 'C' from 'cpoptions'
+let s:cpo_save = &cpo
+set cpo&vim
+
+func! polyglot#Shebang()
+  if getline(1) =~# "^#!"
+    let ft = polyglot#ShebangFiletype()
+    if ft != ""
+      let &ft = ft
+    endif
+  endif
+
+  if &ft == ""
+    runtime! scripts.vim
+  endif
+
+  return &ft != ""
+endfunc
+
+let s:r_hashbang = '^#!\s*\(\S\+\)\s*\(.*\)\s*'
+let s:r_envflag = '%(\S\+=\S\+\|-[iS]\|--ignore-environment\|--split-string\)'
+let s:r_env = '^\%(\' . s:r_envflag . '\s\+\)*\(\S\+\)'
+
+func! polyglot#ShebangFiletype()
+  let l:line1 = getline(1)
+
+  if l:line1 !~# "^#!"
+    return
+  endif
+
+  let l:pathrest = matchlist(l:line1, s:r_hashbang)
+
+  if len(l:pathrest) == 0
+    return
+  endif
+
+  let [_, l:path, l:rest; __] = l:pathrest
+
+  let l:script = split(l:path, "/")[-1]
+
+  if l:script == "env"
+    let l:argspath = matchlist(l:rest, s:r_env)
+    if len(l:argspath) == 0
+      return
+    endif
+
+    let l:script = l:argspath[1]
+  endif
+
+  if has_key(s:interpreters, l:script)
+    return s:interpreters[l:script]
+  endif
+
+  for interpreter in keys(s:interpreters)
+    if l:script =~# '^' . interpreter
+      return s:interpreters[interpreter]
+    endif
+  endfor
+endfunc
+
+" scripts/build generates heuristics functions here
+
+" Restore 'cpoptions'
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+""" ftdetect/polyglot.vim
+
+" don't spam the user when Vim is started in Vi compatibility mode
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Disable all native vim ftdetect
+if exists('g:polyglot_test')
+  autocmd!
+endif
+
+func! s:Observe(fn)
+  let b:polyglot_observe = a:fn
+  augroup polyglot-observer
+    au! CursorHold,CursorHoldI,BufWritePost <buffer>
+      \ execute('if polyglot#' . b:polyglot_observe . '() | au! polyglot-observer | endif')
+  augroup END
+endfunc
+
+let s:disabled_packages = {}
+let s:new_polyglot_disabled = []
+
+if exists('g:polyglot_disabled')
+  for pkg in g:polyglot_disabled
+    let base = split(pkg, '\.')
+    if len(base) > 0
+      let s:disabled_packages[pkg] = 1
+      call add(s:new_polyglot_disabled, base[0]) 
+    endif
+  endfor
+else
+  let g:polyglot_disabled_not_set = 1
+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)
+
+" Needed for sql highlighting
+call s:SetDefault('g:javascript_sql_dialect', 'sql')
+
+" 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
+
+" We need it because scripts.vim in vim uses "set ft=" which cannot be
+" overridden with setf (and we can't use set ft= so our scripts.vim work)
+func! s:Setf(ft)
+  if &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat && &filetype !~# '\<'.a:ft.'\>'
+    let &filetype = a:ft
+  endif
+endfunc
+
+augroup filetypedetect
+
+" scripts/build inserts here filetype detection autocommands
+
+au! BufNewFile,BufRead,StdinReadPost * if expand("<afile>") !~ g:ft_ignore_pat |
+  \ call polyglot#Shebang() | endif
+
+au BufEnter * if &ft == "" && expand("<afile>") !~ g:ft_ignore_pat |
+      \ call s:Observe('Shebang') | endif
+
+augroup END
+
+if !has_key(s:disabled_packages, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
+
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
+
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let i = 0
+
+    for line in a:lines
+      let i += 1
+
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+      if line[0] == "\t"
+        setlocal noexpandtab
+        let &l:shiftwidth=&tabstop
+        let b:sleuth_culprit .= ':' . i
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
+      endif
+    endfor
+
+    if minindent < 10
+      setlocal expandtab
+      let &l:shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
+      return 1
+    endif
+
+    return 0
+  endfunction
+
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    unlet b:sleuth_culprit
+  endfunction
+
+  setglobal smarttab
+
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
+  augroup polyglot-sleuth
+    au!
+    au FileType * call s:detect_indent()
+    au User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be defined before loading vim-polyglot"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+au VimEnter * call s:verify()
+
+" Save polyglot_disabled without postfixes
+if exists('g:polyglot_disabled')
+  let g:polyglot_disabled = s:new_polyglot_disabled
+endif
+
+" restore Vi compatibility settings
+let &cpo = s:cpo_save
+
+""" end

scripts/build

@@ -12,6 +12,11 @@ Dir.chdir(File.dirname(__dir__))
 
 BASE_URL = 'https://raw.githubusercontent.com/github/linguist/master'
 
+def read_section(name)
+  "\" Please do not edit this file directly, instead modify polyglot.vim or scripts/build\n\n" +
+  File.read('polyglot.vim').match(/""" #{Regexp.escape(name)}\n*(.*)\n(?=\n""")/m)[1]
+end
+
 def camelize(str)
   str.split(/[-_\.]/).map { |a| a.capitalize }.join("")
 end
@@ -29,15 +34,8 @@ def load_data()
 
   deps = Hash.new { |h, k| h[k] = [] }
 
-  for package in packages.values
-    for name in [package.fetch("after", [])].flatten
-      packages[name] or raise "#{package["name"]} depends on unknown package: #{name}"
-      deps[name] << package["name"]
-    end
-  end
-
   each_node = lambda {|&b| packages.keys.each(&b) }
-  each_child = lambda {|n, &b| deps[n].each(&b) }
+  each_child = lambda {|n, &b| [packages[n]["after"] || []].flatten.each(&b) }
 
   languages = load_languages
 
@@ -97,25 +95,6 @@ def load_data()
   [packages, transform_patterns(heuristics)]
 end
 
-def parallel(*procs)
-  threads = procs.map { |p| Thread.new { method(p).call } }
-  threads.map(&:join).map(&:value)
-end
-
-def read_strings(data, keys, print=false)
-  if data.is_a?(Hash)
-    data.flat_map do |key, val|
-      read_strings(val, keys, keys.include?(key))
-    end
-  elsif data.is_a?(Array)
-    data.flat_map { |d| read_strings(d, keys, print) }
-  elsif data.is_a?(String)
-    print ? [data] : []
-  else
-    []
-  end
-end
-
 def patterns_to_vim_patterns(patterns)
   stdin, stdout, stderr = Open3.popen3('vim', '-V', '--clean', '/dev/stdin', '-es', '-c', "echo expand('%:p:h') | source #{__dir__}/eregex.vim", '-c', "for line in range(0, line('$')) | call setline(line, ExtendedRegex2VimRegex(getline(line))) | endfor", '-c', ':wq! /dev/stdout', chdir: __dir__)
   stdin.write(patterns.join("\n"))
@@ -154,8 +133,15 @@ def transform_patterns(heuristics)
 end
 
 def load_languages
-  url = "#{BASE_URL}/lib/linguist/languages.yml"
-  data = URI.open(url) { |io| YAML.load(io.read) }
+  file = 'tmp/languages.yml'
+
+  unless File.exist?(file)
+    url = "#{BASE_URL}/lib/linguist/languages.yml"
+    data = URI.open(url) { |io| io.read }
+    File.write(file, data)
+  end
+
+  YAML.load(File.read(file))
 end
 
 def parse_remote(remote)
@@ -168,28 +154,30 @@ def copy_file(package, src, dest)
   FileUtils.mkdir_p(File.dirname(dest))
   name = package.fetch("name")
 
-  header = '" Polyglot metafile'
-  if File.exist?(dest)
-    meta_dest = dest
-    new_dest = dest
-    i = 0
-    while File.exist?(new_dest)
-      i += 1
-      new_dest = "#{dest.gsub(/\.vim$/, '')}-#{i}.vim"
-    end
-
-    if File.read(dest).include?(header)
-      dest = new_dest
-    else
-      FileUtils.mv(dest, new_dest)
-      File.write(meta_dest, "#{header}\n")
-      open(meta_dest, "a+") do |output|
-        output << "source <sfile>:h/#{File.basename(new_dest)}\n"
+  if dest.end_with?(".vim")
+    header = '" Polyglot metafile'
+    if File.exist?(dest)
+      meta_dest = dest
+      new_dest = dest
+      i = 0
+      while File.exist?(new_dest)
+        i += 1
+        new_dest = "#{dest.gsub(/\.vim$/, '')}-#{i}.vim"
+      end
+
+      if File.read(dest).include?(header)
+        dest = new_dest
+      else
+        FileUtils.mv(dest, new_dest)
+        File.write(meta_dest, "#{header}\n")
+        open(meta_dest, "a+") do |output|
+          output << "source <sfile>:h/#{File.basename(new_dest)}\n"
+        end
+        dest = "#{dest.gsub(/\.vim$/, '')}-#{i+1}.vim"
+      end
+      open(meta_dest, "a+") do |output|
+        output << "source <sfile>:h/#{File.basename(dest)}\n"
       end
-      dest = "#{dest.gsub(/\.vim$/, '')}-#{i+1}.vim"
-    end
-    open(meta_dest, "a+") do |output|
-      output << "source <sfile>:h/#{File.basename(dest)}\n"
     end
   end
 
@@ -274,13 +262,15 @@ def rules_to_code(rules)
   end
 
   output << rule_to_code(rules)
+
+  output
 end
 
 def rule_to_code(rule)
   if rule.has_key?("lines")
     if rule["lines"] == 1
       return <<~EOS
-        let line = getline(1)
+        let line = getline(nextnonblank(1))
 
         #{indent(rule_to_code(except(rule, "lines")), 0)}
       EOS
@@ -304,7 +294,9 @@ def rule_to_code(rule)
   end
 
   if rule.has_key?("rules")
-    return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
+    return rule["rules"].map do |r|
+      indent(rule_to_code({ "extensions" => rule["extensions"] }.merge(r)), 0)
+    end.join("\n")
   end
 
   if rule.has_key?("if_set")
@@ -330,22 +322,33 @@ def rule_to_code(rule)
     EOS
   end
 
-  if (rule.keys - ["filetype", "override", "set"]).size > 0
-    raise "Unknown rule: #{JSON.generate(rule)}"
-  end
-  
-  if rule.has_key?("override")
+  if rule.has_key?("filetype")
+    if rule.has_key?("fallback")
+      return <<~EOS
+        set ft=#{rule["filetype"]} | au! BufWritePost <buffer> ++once call polyglot#Detect#{camelize(rule["extensions"].first)}Filetype()
+        return
+      EOS
+    end
+
     return <<~EOS
-      if exists("#{rule["override"]}")
-        exe "setf " . #{rule["override"]} | return
+      set ft=#{rule["filetype"]} | return
+      #{indent(rule_to_code(except(rule, "filetype")), 0)}
+    EOS
+  end
+
+  if rule.has_key?("override")
+    variable = "g:filetype_#{rule["extensions"].first}"
+    return <<~EOS
+      if exists("#{variable}")
+        let &ft = #{variable} | return
       endif
     EOS
   end
 
-  if rule.has_key?("filetype")
-    return "setf #{rule["filetype"]} | return"
+  if (rule.keys - ["extensions"]).size > 0
+    raise "Unknown rule: #{JSON.generate(rule)}"
   end
-
+  
   return ""
 end
 
@@ -360,8 +363,7 @@ def extract(packages)
   FileUtils.rm_rf(all_dirs)
 
   output = []
-  # We need to reverse packages so they are included in proper order
-  packages.reverse.map do |package|
+  packages.map do |package|
     repo, branch, path, dir = parse_remote(package["remote"])
     dirs = package.fetch("dirs", default_dirs)
     ignored_dirs = package.fetch("ignored_dirs", [])
@@ -376,13 +378,15 @@ def extract(packages)
         if repo == "vim/vim" && (["glob", "globs"] & package.keys).size == 0
           raise "Package from vim/vim should define glob or globs: #{package["name"]}"
         end
-        glob = package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))
-        Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
-          next unless File.file?("#{subtree}/#{p}")
-          if p.include?("samba")
-            raise package["name"]
+        globs = [package.fetch("glob", package.fetch('globs', '**/*.{vim,ctags,vital,txt}'))].flatten
+        globs.each do |glob|
+          Dir.glob("#{subdir}/#{glob}", base: subtree).each do |p|
+            next unless File.file?("#{subtree}/#{p}")
+            if p.include?("samba")
+              raise package["name"]
+            end
+            copy_file(package, "#{subtree}/#{p}", p)
           end
-          copy_file(package, "#{subtree}/#{p}", p)
         end
       elsif File.exist?(subpath)
         copy_file(package, subpath, subdir)
@@ -441,6 +445,7 @@ def generate_ftdetect(packages, heuristics)
   expected_filetypes = expected_filetypes.select { |e| filetype_names.include?(e["name"]) }
 
   native_extensions = Set.new(native_filetypes.flat_map { |f| f["extensions"] || [] })
+  native_filenames = Set.new(native_filetypes.flat_map { |f| f["filenames"] || [] })
 
   for package in packages
     name = package.fetch("name")
@@ -453,6 +458,12 @@ def generate_ftdetect(packages, heuristics)
           to_disable << "*." + extension
         end
       end
+
+      for filename in filetype["filenames"]
+        if native_filenames.include?(filename)
+          to_disable << filename
+        end
+      end
     end
 
     if to_disable.size > 0
@@ -472,10 +483,10 @@ def generate_ftdetect(packages, heuristics)
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
 
-      set_command = "setf #{name}"
+      set_command = "set ft=#{name}"
 
       if filetype["syntax"]
-        set_command = "if !did_filetype() | set ft=#{name} syntax=#{filetype["syntax"]} | endif"
+        set_command = "set ft=#{name} syntax=#{filetype["syntax"]}"
       end
 
       if filetype["custom_set"]
@@ -506,7 +517,7 @@ def generate_ftdetect(packages, heuristics)
 
       for filename in filenames.sort
         if filename[0] == "."
-          filename = "{.,}" + filename[1..]
+          filename = "{.,}" + filename[1..-1]
         end
         if filename[-1] == "*"
           autocommands << "  au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
@@ -546,25 +557,14 @@ def generate_ftdetect(packages, heuristics)
     puts "Missing filename for #{name}: #{e}"
   end
 
-  ftdetect = File.read('ftdetect/polyglot.vim')
-  File.write('ftdetect/polyglot.vim', ftdetect.gsub(/(?<=" filetypes\n).*(?=\n" end filetypes)/m, output))
+  ftdetect = read_section('ftdetect/polyglot.vim')
+
+  File.write(
+    'ftdetect/polyglot.vim',
+     ftdetect.gsub('" scripts/build inserts here filetype detection autocommands') { output }
+  )
 
   output = <<~EOS
-    " Line continuation is used here, remove 'C' from 'cpoptions'
-    let s:cpo_save = &cpo
-    set cpo&vim
-
-    func! polyglot#Heuristics()
-      " Try to detect filetype from shebang
-      let l:filetype = polyglot#Shebang()
-      if l:filetype != ""
-        exec "setf " . l:filetype
-        return 1
-      endif
-
-      return 0
-    endfunc
-    
     let s:interpreters = {
     EOS
 
@@ -577,47 +577,6 @@ def generate_ftdetect(packages, heuristics)
   output << <<~EOS
       \\ }
 
-    let s:r_hashbang = '^#!\\s*\\(\\S\\+\\)\\s*\\(.*\\)\\s*'
-    let s:r_envflag = '%(\\S\\+=\\S\\+\\|-[iS]\\|--ignore-environment\\|--split-string\\)'
-    let s:r_env = '^\\%(\\' . s:r_envflag . '\\s\\+\\)*\\(\\S\\+\\)'
-
-    func! polyglot#Shebang()
-      let l:line1 = getline(1)
-
-      if l:line1 !~# "^#!"
-        return
-      endif
-
-      let l:pathrest = matchlist(l:line1, s:r_hashbang)
-
-      if len(l:pathrest) == 0
-        return 
-      endif
-
-      let [_, l:path, l:rest; __] = l:pathrest
-
-      let l:script = split(l:path, "/")[-1]
-
-      if l:script == "env"
-        let l:argspath = matchlist(l:rest, s:r_env)
-        if len(l:argspath) == 0
-          return
-        endif
-
-        let l:script = l:argspath[1]
-      endif
-
-      if has_key(s:interpreters, l:script)
-        return s:interpreters[l:script]
-      endif
-
-      for interpreter in keys(s:interpreters)
-        if l:script =~# '^' . interpreter
-          return s:interpreters[interpreter]
-        endif
-      endfor
-    endfunc
-
   EOS
 
   for heuristic in heuristics
@@ -629,27 +588,19 @@ def generate_ftdetect(packages, heuristics)
     EOS
   end
 
-  output << <<~EOS
-    " Restore 'cpoptions'
-    let &cpo = s:cpo_save
-    unlet s:cpo_save
-  EOS
+  autoload_script = read_section('autoload/polyglot.vim')
+  autoload_script["\" scripts/build generates heuristics functions here\n"] = output
 
-  File.write('autoload/polyglot.vim', output)
+  File.write('autoload/polyglot.vim', autoload_script)
 end
 
 def generate_tests(packages)
   output = <<~EOS
     function! TestFiletype(filetype)
-      try
-        enew
-        exec 'set ft=' . a:filetype
-      catch
-        echo 'Error loading filetype ' . a:filetype  . ':'
-        echo v:exception
-        echo v:throwpoint
-        exec ':cq!'
-      endtry
+      call Log('Loading ' . a:filetype . ' filetype...')
+
+      enew
+      exec 'set ft=' . a:filetype
     endfunction
 
   EOS
@@ -660,7 +611,7 @@ def generate_tests(packages)
     end
   end
 
-  File.write('scripts/test_filetypes.vim', output)
+  File.write('tests/filetypes.vim', output)
 
 
 end
@@ -732,15 +683,13 @@ def detect_filetypes(glob)
   end.group_by { |a, b| a }.map { |a, b| [a, b.map { |c, d| d }] }.map { |a, b|
     {
       "name" => a,
-      "extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..] },
+      "extensions" => b.select { |x| x.match(/^\*\.[^\/]+$/) }.map { |a| a.strip[2..-1] },
       "filenames" => expand_all(b.select { |x| !x.match(/^\*\.[^\/]+$/) })
     }
   }
 end
 
 def generate_plugins(packages)
-  FileUtils.mkdir_p('autoload/polyglot')
-
   output = "let s:globs = {\n"
 
   patterns = Hash.new { |h, k| h[k] = [] }
@@ -748,7 +697,7 @@ def generate_plugins(packages)
   for package in packages
     for filetype in package["filetypes"]
       extensions = (filetype["extensions"] || []).map { |e| "*.#{e}" }
-      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) || e[0] == "." }
+      files = (filetype["filenames"] || []).reject { |e| e.match(/\*\*|\//) }
       patterns[filetype["name"]].concat(extensions)
       patterns[filetype["name"]].concat(files)
     end
@@ -776,6 +725,8 @@ if __FILE__ == $0
     FileUtils.rm_rf("tmp")
   end
 
+  Dir.mkdir('tmp') unless File.exists?('tmp')
+
   packages, heuristics = load_data()
   download(packages)
   extract(packages)

scripts/test

@@ -1,16 +1,60 @@
-#!/bin/bash
+#!/usr/bin/env ruby
 
-set -e
+def run_script(src)
+  system("bash", "-c", src)
+end
 
-vim --clean -N -u <(echo "
-  let &rtp='$PWD,'.&rtp
-  let g:polyglot_test = 1
-  source scripts/test_extensions.vim
-  \"source scripts/test_filetypes.vim
-  qa!
-")
+def run_vimscript(src)
+  wrapper = <<~EOF
+    vim --clean --not-a-term -u <(cat <<- "EOM"
+    let g:polyglot_test = 1
+    let &rtp='$PWD,' . &rtp
+    runtime filetype.vim
+    set t_ti= t_te=
+    set shortmess+=F
+    set noswapfile
+    set nocp
+    set nomore
+    func! Log(msg)
+      if $DEV != '1'
+        echo a:msg
+      else
+        echon '.'
+      endif
+    endfunc
+    EOM
+    ) -S <(cat <<- "EOM"
+      try
+      #{src}
+      catch
+        echo v:exception
+        echo v:throwpoint
+      endtry
+      qa!
+    EOM
+    ) | perl -pe 's/\e\[[0-9;]*[a-zA-Z]//g'
+  EOF
 
-if ! expect -c 'set timeout 1' -c 'spawn vim -N --clean -c "set nomore | :helptags ./doc | q"' -c 'expect "ENTER" { exit 1 }' > /dev/null; then
-  echo "Please ensure ':helptags ./doc' works properly"
-  exit 1
-fi
+  run_script(wrapper)
+end
+
+test_helptags = <<~EOF
+  if ! expect -c 'set timeout 1' -c 'spawn vim -N --clean -c "set nomore | :helptags ./doc | q"' -c 'expect "ENTER" { exit 1 }' > /dev/null; then
+    echo "Please ensure ':helptags ./doc' works properly"
+    exit 1
+  fi
+EOF
+
+run_vimscript('source tests/filetypes.vim')
+run_vimscript('source tests/extensions.vim')
+run_script(test_helptags)
+
+# run_vimscript("
+#   func! TestIndent(file)
+#     :e a:file
+#     echo 'ok'
+#     echo &filetype
+#   endfunc
+#
+#   #{Dir['tests/indent/**/test.*'].map { |f| "call TestIndent(\"#{f}\")"}.join("\n")}
+# ")

syntax/aspperl.vim

@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspperl') == -1
+
+" Vim syntax file
+" Language:	Active State's PerlScript (ASP)
+" Maintainer:	Aaron Hope <edh@brioforge.com>
+" URL:		http://nim.dhs.org/~edh/aspperl.vim
+" Last Change:	2001 May 09
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'perlscript'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn include @AspPerlScript syntax/perl.vim
+
+syn cluster htmlPreproc add=AspPerlScriptInsideHtmlTags
+
+syn region  AspPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<%=\=+ skip=+".*%>.*"+ end=+%>+ contains=@AspPerlScript
+syn region  AspPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<script\s\+language="\=perlscript"\=[^>]*>+ end=+</script>+ contains=@AspPerlScript
+
+let b:current_syntax = "aspperl"
+
+endif

syntax/aspvbs.vim

@@ -0,0 +1,186 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'aspvbs') == -1
+
+" Vim syntax file
+" Language:	Microsoft VBScript Web Content (ASP)
+" Maintainer:	Devin Weaver <ktohg@tritarget.com> (non-functional)
+" URL:		http://tritarget.com/pub/vim/syntax/aspvbs.vim (broken)
+" Last Change:	2006 Jun 19
+" 		by Dan Casey
+" Version:	$Revision: 1.3 $
+" Thanks to Jay-Jay <vim@jay-jay.net> for a syntax sync hack, hungarian
+" notation, and extra highlighting.
+" Thanks to patrick dehne <patrick@steidle.net> for the folding code.
+" Thanks to Dean Hall <hall@apt7.com> for testing the use of classes in
+" VBScripts which I've been too scared to do.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'aspvbs'
+endif
+
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn cluster htmlPreProc add=AspVBScriptInsideHtmlTags
+
+
+" Colored variable names, if written in hungarian notation
+hi def AspVBSVariableSimple   term=standout  ctermfg=3  guifg=#99ee99
+hi def AspVBSVariableComplex  term=standout  ctermfg=3  guifg=#ee9900
+syn match AspVBSVariableSimple  contained "\<\(bln\|byt\|dtm\=\|dbl\|int\|str\)\u\w*"
+syn match AspVBSVariableComplex contained "\<\(arr\|ary\|obj\)\u\w*"
+
+
+" Functions and methods that are in VB but will cause errors in an ASP page
+" This is helpfull if your porting VB code to ASP
+" I removed (Count, Item) because these are common variable names in AspVBScript
+syn keyword AspVBSError contained Val Str CVar CVDate DoEvents GoSub Return GoTo
+syn keyword AspVBSError contained Stop LinkExecute Add Type LinkPoke
+syn keyword AspVBSError contained LinkRequest LinkSend Declare Optional Sleep
+syn keyword AspVBSError contained ParamArray Static Erl TypeOf Like LSet RSet Mid StrConv
+" It may seem that most of these can fit into a keyword clause but keyword takes
+" priority over all so I can't get the multi-word matches
+syn match AspVBSError contained "\<Def[a-zA-Z0-9_]\+\>"
+syn match AspVBSError contained "^\s*Open\s\+"
+syn match AspVBSError contained "Debug\.[a-zA-Z0-9_]*"
+syn match AspVBSError contained "^\s*[a-zA-Z0-9_]\+:"
+syn match AspVBSError contained "[a-zA-Z0-9_]\+![a-zA-Z0-9_]\+"
+syn match AspVBSError contained "^\s*#.*$"
+syn match AspVBSError contained "\<As\s\+[a-zA-Z0-9_]*"
+syn match AspVBSError contained "\<End\>\|\<Exit\>"
+syn match AspVBSError contained "\<On\s\+Error\>\|\<On\>\|\<Error\>\|\<Resume\s\+Next\>\|\<Resume\>"
+syn match AspVBSError contained "\<Option\s\+\(Base\|Compare\|Private\s\+Module\)\>"
+" This one I want 'cause I always seem to mis-spell it.
+syn match AspVBSError contained "Respon\?ce\.\S*"
+syn match AspVBSError contained "Respose\.\S*"
+" When I looked up the VBScript syntax it mentioned that Property Get/Set/Let
+" statements are illegal, however, I have recived reports that they do work.
+" So I commented it out for now.
+" syn match AspVBSError contained "\<Property\s\+\(Get\|Let\|Set\)\>"
+
+" AspVBScript Reserved Words.
+syn match AspVBSStatement contained "\<On\s\+Error\s\+\(Resume\s\+Next\|goto\s\+0\)\>\|\<Next\>"
+syn match AspVBSStatement contained "\<End\s\+\(If\|For\|Select\|Class\|Function\|Sub\|With\|Property\)\>"
+syn match AspVBSStatement contained "\<Exit\s\+\(Do\|For\|Sub\|Function\)\>"
+syn match AspVBSStatement contained "\<Exit\s\+\(Do\|For\|Sub\|Function\|Property\)\>"
+syn match AspVBSStatement contained "\<Option\s\+Explicit\>"
+syn match AspVBSStatement contained "\<For\s\+Each\>\|\<For\>"
+syn match AspVBSStatement contained "\<Set\>"
+syn keyword AspVBSStatement contained Call Class Const Default Dim Do Loop Erase And
+syn keyword AspVBSStatement contained Function If Then Else ElseIf Or
+syn keyword AspVBSStatement contained Private Public Randomize ReDim
+syn keyword AspVBSStatement contained Select Case Sub While With Wend Not
+
+" AspVBScript Functions
+syn keyword AspVBSFunction contained Abs Array Asc Atn CBool CByte CCur CDate CDbl
+syn keyword AspVBSFunction contained Chr CInt CLng Cos CreateObject CSng CStr Date
+syn keyword AspVBSFunction contained DateAdd DateDiff DatePart DateSerial DateValue
+syn keyword AspVBSFunction contained Date Day Exp Filter Fix FormatCurrency
+syn keyword AspVBSFunction contained FormatDateTime FormatNumber FormatPercent
+syn keyword AspVBSFunction contained GetObject Hex Hour InputBox InStr InStrRev Int
+syn keyword AspVBSFunction contained IsArray IsDate IsEmpty IsNull IsNumeric
+syn keyword AspVBSFunction contained IsObject Join LBound LCase Left Len LoadPicture
+syn keyword AspVBSFunction contained Log LTrim Mid Minute Month MonthName MsgBox Now
+syn keyword AspVBSFunction contained Oct Replace RGB Right Rnd Round RTrim
+syn keyword AspVBSFunction contained ScriptEngine ScriptEngineBuildVersion
+syn keyword AspVBSFunction contained ScriptEngineMajorVersion
+syn keyword AspVBSFunction contained ScriptEngineMinorVersion Second Sgn Sin Space
+syn keyword AspVBSFunction contained Split Sqr StrComp StrReverse String Tan Time Timer
+syn keyword AspVBSFunction contained TimeSerial TimeValue Trim TypeName UBound UCase
+syn keyword AspVBSFunction contained VarType Weekday WeekdayName Year
+
+" AspVBScript Methods
+syn keyword AspVBSMethods contained Add AddFolders BuildPath Clear Close Copy
+syn keyword AspVBSMethods contained CopyFile CopyFolder CreateFolder CreateTextFile
+syn keyword AspVBSMethods contained Delete DeleteFile DeleteFolder DriveExists
+syn keyword AspVBSMethods contained Exists FileExists FolderExists
+syn keyword AspVBSMethods contained GetAbsolutePathName GetBaseName GetDrive
+syn keyword AspVBSMethods contained GetDriveName GetExtensionName GetFile
+syn keyword AspVBSMethods contained GetFileName GetFolder GetParentFolderName
+syn keyword AspVBSMethods contained GetSpecialFolder GetTempName Items Keys Move
+syn keyword AspVBSMethods contained MoveFile MoveFolder OpenAsTextStream
+syn keyword AspVBSMethods contained OpenTextFile Raise Read ReadAll ReadLine Remove
+syn keyword AspVBSMethods contained RemoveAll Skip SkipLine Write WriteBlankLines
+syn keyword AspVBSMethods contained WriteLine
+syn match AspVBSMethods contained "Response\.\w*"
+" Colorize boolean constants:
+syn keyword AspVBSMethods contained true false
+
+" AspVBScript Number Contstants
+" Integer number, or floating point number without a dot.
+syn match  AspVBSNumber	contained	"\<\d\+\>"
+" Floating point number, with dot
+syn match  AspVBSNumber	contained	"\<\d\+\.\d*\>"
+" Floating point number, starting with a dot
+syn match  AspVBSNumber	contained	"\.\d\+\>"
+
+" String and Character Contstants
+" removed (skip=+\\\\\|\\"+) because VB doesn't have backslash escaping in
+" strings (or does it?)
+syn region  AspVBSString	contained	  start=+"+  end=+"+ keepend
+
+" AspVBScript Comments
+syn region  AspVBSComment	contained start="^REM\s\|\sREM\s" end="$" contains=AspVBSTodo keepend
+syn region  AspVBSComment   contained start="^'\|\s'"   end="$" contains=AspVBSTodo keepend
+" misc. Commenting Stuff
+syn keyword AspVBSTodo contained	TODO FIXME
+
+" Cosmetic syntax errors commanly found in VB but not in AspVBScript
+" AspVBScript doesn't use line numbers
+syn region  AspVBSError	contained start="^\d" end="\s" keepend
+" AspVBScript also doesn't have type defining variables
+syn match   AspVBSError  contained "[a-zA-Z0-9_][\$&!#]"ms=s+1
+" Since 'a%' is a VB variable with a type and in AspVBScript you can have 'a%>'
+" I have to make a special case so 'a%>' won't show as an error.
+syn match   AspVBSError  contained "[a-zA-Z0-9_]%\($\|[^>]\)"ms=s+1
+
+" Top Cluster
+syn cluster AspVBScriptTop contains=AspVBSStatement,AspVBSFunction,AspVBSMethods,AspVBSNumber,AspVBSString,AspVBSComment,AspVBSError,AspVBSVariableSimple,AspVBSVariableComplex
+
+" Folding
+syn region AspVBSFold start="^\s*\(class\)\s\+.*$" end="^\s*end\s\+\(class\)\>.*$" fold contained transparent keepend
+syn region AspVBSFold start="^\s*\(private\|public\)\=\(\s\+default\)\=\s\+\(sub\|function\)\s\+.*$" end="^\s*end\s\+\(function\|sub\)\>.*$" fold contained transparent keepend
+
+" Define AspVBScript delimeters
+" <%= func("string_with_%>_in_it") %> This is illegal in ASP syntax.
+syn region  AspVBScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<%=\=+ end=+%>+ contains=@AspVBScriptTop, AspVBSFold
+syn region  AspVBScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<script\s\+language="\=vbscript"\=[^>]*\s\+runatserver[^>]*>+ end=+</script>+ contains=@AspVBScriptTop
+
+
+" Synchronization
+" syn sync match AspVBSSyncGroup grouphere AspVBScriptInsideHtmlTags "<%"
+" This is a kludge so the HTML will sync properly
+syn sync match htmlHighlight grouphere htmlTag "%>"
+
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+"hi def link AspVBScript		Special
+hi def link AspVBSLineNumber	Comment
+hi def link AspVBSNumber		Number
+hi def link AspVBSError		Error
+hi def link AspVBSStatement	Statement
+hi def link AspVBSString		String
+hi def link AspVBSComment		Comment
+hi def link AspVBSTodo		Todo
+hi def link AspVBSFunction		Identifier
+hi def link AspVBSMethods		PreProc
+hi def link AspVBSEvents		Special
+hi def link AspVBSTypeSpecifier	Type
+
+
+let b:current_syntax = "aspvbs"
+
+if main_syntax == 'aspvbs'
+  unlet main_syntax
+endif
+
+" vim: ts=8:sw=2:sts=0:noet
+
+endif

syntax/basic/type.vim

@@ -56,6 +56,7 @@ syntax cluster typescriptPrimaryType contains=
   \ typescriptTupleType,
   \ typescriptTypeQuery,
   \ typescriptStringLiteralType,
+  \ typescriptTemplateLiteralType,
   \ typescriptReadonlyArrayKeyword,
   \ typescriptAssertType
 
@@ -64,6 +65,17 @@ syntax region  typescriptStringLiteralType contained
   \ nextgroup=typescriptUnion
   \ skipwhite skipempty
 
+syntax region  typescriptTemplateLiteralType contained
+  \ start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/
+  \ contains=typescriptTemplateSubstitutionType
+  \ nextgroup=typescriptTypeOperator
+  \ skipwhite skipempty
+
+syntax region  typescriptTemplateSubstitutionType matchgroup=typescriptTemplateSB
+  \ start=/\${/ end=/}/
+  \ contains=@typescriptType
+  \ contained
+
 syntax region typescriptParenthesizedType matchgroup=typescriptParens
   \ start=/(/ end=/)/
   \ contains=@typescriptType
@@ -103,10 +115,12 @@ syntax region typescriptTupleType matchgroup=typescriptBraces
   \ contained skipwhite
 
 syntax cluster typescriptTypeOperator
-  \ contains=typescriptUnion,typescriptTypeBracket
+  \ contains=typescriptUnion,typescriptTypeBracket,typescriptConstraint,typescriptConditionalType
 
 syntax match typescriptUnion /|\|&/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
 
+syntax match typescriptConditionalType /?\|:/ contained nextgroup=@typescriptPrimaryType skipwhite skipempty
+
 syntax cluster typescriptFunctionType contains=typescriptGenericFunc,typescriptFuncType
 syntax region typescriptGenericFunc matchgroup=typescriptTypeBrackets
   \ start=/</ end=/>/

syntax/bzl.vim

@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'bzl') == -1
+
+" Vim syntax file
+" Language:	Bazel (http://bazel.io)
+" Maintainer:	David Barnett (https://github.com/google/vim-ft-bzl)
+" Last Change:	2015 Aug 11
+
+if exists('b:current_syntax')
+  finish
+endif
+
+
+runtime! syntax/python.vim
+
+let b:current_syntax = 'bzl'
+
+syn region bzlRule start='^\w\+($' end='^)\n*' transparent fold
+syn region bzlList start='\[' end='\]' transparent fold
+
+endif

syntax/common.vim

@@ -71,6 +71,7 @@ if exists("did_typescript_hilink")
   HiLink typescriptString               String
   HiLink typescriptSpecial              Special
   HiLink typescriptStringLiteralType    String
+  HiLink typescriptTemplateLiteralType  String
   HiLink typescriptStringMember         String
   HiLink typescriptTemplate             String
   HiLink typescriptEventString          String

syntax/django.vim

@@ -0,0 +1,87 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim syntax file
+" Language:	Django template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2014 Jul 13
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax case match
+
+" Mark illegal characters
+syn match djangoError "%}\|}}\|#}"
+
+" Django template built-in tags and parameters
+" 'comment' doesn't appear here because it gets special treatment
+syn keyword djangoStatement contained autoescape csrf_token empty
+" FIXME ==, !=, <, >, <=, and >= should be djangoStatements:
+" syn keyword djangoStatement contained == != < > <= >=
+syn keyword djangoStatement contained and as block endblock by cycle debug else elif
+syn keyword djangoStatement contained extends filter endfilter firstof for
+syn keyword djangoStatement contained endfor if endif ifchanged endifchanged
+syn keyword djangoStatement contained ifequal endifequal ifnotequal
+syn keyword djangoStatement contained endifnotequal in include load not now or
+syn keyword djangoStatement contained parsed regroup reversed spaceless
+syn keyword djangoStatement contained endspaceless ssi templatetag openblock
+syn keyword djangoStatement contained closeblock openvariable closevariable
+syn keyword djangoStatement contained openbrace closebrace opencomment
+syn keyword djangoStatement contained closecomment widthratio url with endwith
+syn keyword djangoStatement contained get_current_language trans noop blocktrans
+syn keyword djangoStatement contained endblocktrans get_available_languages
+syn keyword djangoStatement contained get_current_language_bidi plural
+
+" Django templete built-in filters
+syn keyword djangoFilter contained add addslashes capfirst center cut date
+syn keyword djangoFilter contained default default_if_none dictsort
+syn keyword djangoFilter contained dictsortreversed divisibleby escape escapejs
+syn keyword djangoFilter contained filesizeformat first fix_ampersands
+syn keyword djangoFilter contained floatformat get_digit join last length length_is
+syn keyword djangoFilter contained linebreaks linebreaksbr linenumbers ljust
+syn keyword djangoFilter contained lower make_list phone2numeric pluralize
+syn keyword djangoFilter contained pprint random removetags rjust slice slugify
+syn keyword djangoFilter contained safe safeseq stringformat striptags
+syn keyword djangoFilter contained time timesince timeuntil title truncatechars
+syn keyword djangoFilter contained truncatewords truncatewords_html unordered_list upper urlencode
+syn keyword djangoFilter contained urlize urlizetrunc wordcount wordwrap yesno
+
+" Keywords to highlight within comments
+syn keyword djangoTodo contained TODO FIXME XXX
+
+" Django template constants (always surrounded by double quotes)
+syn region djangoArgument contained start=/"/ skip=/\\"/ end=/"/
+
+" Mark illegal characters within tag and variables blocks
+syn match djangoTagError contained "#}\|{{\|[^%]}}\|[&#]"
+syn match djangoVarError contained "#}\|{%\|%}\|[<>!&#%]"
+
+" Django template tag and variable blocks
+syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display
+syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display
+
+" Django template 'comment' tag and comment block
+syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" contains=djangoTodo
+syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link djangoTagBlock PreProc
+hi def link djangoVarBlock PreProc
+hi def link djangoStatement Statement
+hi def link djangoFilter Identifier
+hi def link djangoArgument Constant
+hi def link djangoTagError Error
+hi def link djangoVarError Error
+hi def link djangoError Error
+hi def link djangoComment Comment
+hi def link djangoComBlock Comment
+hi def link djangoTodo Todo
+
+
+let b:current_syntax = "django"
+
+endif

syntax/dune.vim

@@ -20,7 +20,7 @@ syn keyword lispKey ppx_runtime_libraries virtual_deps js_of_ocaml link_flags
 syn keyword lispKey javascript_files flags ocamlc_flags ocamlopt_flags pps staged_pps
 syn keyword lispKey library_flags c_flags c_library_flags kind package action
 syn keyword lispKey deps targets locks fallback
-syn keyword lispKey inline_tests tests names
+syn keyword lispKey inline_tests tests test names
 
 syn keyword lispAtom true false
 

syntax/elixir.vim

@@ -20,10 +20,6 @@ syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
 
 syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>' contains=elixirUnusedVariable
 
-syn match elixirFunctionCall '\<[a-z_]\w*[!?]\?\(\s*\.\?\s*(\|\s\+[a-zA-Z0-9@:\'\"\[]\)\@='
-syn match elixirFunctionCall '\(:\w\+\s*\.\s*\|[A-Z]\w*\s*\.\s*\)\@<=[a-z_]\w*[!?]\?'
-syn match elixirFunctionCall '\(>\s+\)\<[a-z_]\w*[!?]\?'
-
 syn match elixirKeyword '\(\.\)\@<!\<\(for\|case\|when\|with\|cond\|if\|unless\|try\|receive\|after\|raise\|rescue\|catch\|else\|quote\|unquote\|super\|unquote_splicing\)\>:\@!'
 
 syn keyword elixirInclude import require alias use
@@ -48,7 +44,7 @@ syn match   elixirOperator '\~>\|\~>>\|<\~\|<<\~\|<\~>'
 
 syn match   elixirAlias '\([a-z]\)\@<![A-Z]\w*\%(\.[A-Z]\w*\)*'
 
-syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
+syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_*]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\?\|>=\?\|<=\?\)'
 syn match   elixirAtom '\(:\)\@<!:\%(<=>\|&&\?\|%\(()\|\[\]\|{}\)\|++\?\|--\?\|||\?\|!\|//\|[%&`/|]\)'
 syn match   elixirAtom "\%([a-zA-Z_]\w*[?!]\?\):\(:\)\@!"
 

syntax/erlang.vim

@@ -4,7 +4,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'erlang') == -1
 " Language:     Erlang (http://www.erlang.org)
 " Maintainer:   Csaba Hoch <csaba.hoch@gmail.com>
 " Contributor:  Adam Rutkowski <hq@mtod.org>
-" Last Update:  2019-Jun-18
+" Last Update:  2020-May-26
 " License:      Vim license
 " URL:          https://github.com/vim-erlang/vim-erlang-runtime
 

syntax/gitignore.vim

@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'gitignore') == -1
+
+scriptencoding utf-8
+
+" Copyright (c) 2017-2020 Filip Szymański. All rights reserved.
+" Use of this source code is governed by an MIT license that can be
+" found in the LICENSE file.
+
+if exists('b:current_syntax')
+  finish
+endif
+
+" https://git-scm.com/docs/gitignore#_pattern_format
+syntax keyword gitignoreTodo TODO FIXME XXX NOTE SEE contained
+syntax match gitignoreComment '^#.*' contains=gitignoreTodo
+syntax match gitignoreComment '\s#.*'ms=s+1 contains=gitignoreTodo
+syntax match gitignoreNegation '^!'
+syntax match gitignoreSeparator '/'
+syntax match gitignoreWildcard '\(\\\)\@<![*?]'
+syntax region gitignoreSet start='\[' skip='\\\]' end='\]'
+
+highlight default link gitignoreTodo Todo
+highlight default link gitignoreComment Comment
+highlight default link gitignoreNegation Exception
+highlight default link gitignoreSeparator Constant
+highlight default link gitignoreWildcard Special
+highlight default link gitignoreSet Character
+
+let b:current_syntax = 'gitignore'
+
+" vim: ts=2 et sw=2
+
+endif

syntax/handlebars.vim

@@ -0,0 +1,110 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
+
+" Mustache & Handlebars syntax
+" Language:	Mustache, Handlebars
+" Maintainer:	Juvenn Woo <machese@gmail.com>
+" Screenshot:   http://imgur.com/6F408
+" Version:	6
+" Last Change:  Jul 16 2019
+" Remark:
+"   It lexically hilights embedded mustaches (exclusively) in html file.
+"   While it was written for Ruby-based Mustache template system, it should
+"   work for Google's C-based *ctemplate* as well as Erlang-based *et*. All
+"   of them are, AFAIK, based on the idea of ctemplate.
+" References:
+"   [Mustache](http://github.com/defunkt/mustache)
+"   [Handlebars](https://github.com/wycats/handlebars.js)
+"   [ctemplate](http://code.google.com/p/google-ctemplate/)
+"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
+"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
+" TODO: Feedback is welcomed.
+
+
+" Read the HTML syntax to start with
+if version < 600
+  so <sfile>:p:h/html.vim
+else
+  runtime! syntax/html.vim
+  unlet b:current_syntax
+endif
+
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+" Standard HiLink will not work with included syntax files
+if version < 508
+  command! -nargs=+ HtmlHiLink hi link <args>
+else
+  command! -nargs=+ HtmlHiLink hi def link <args>
+endif
+
+syntax match mustacheError '}}}\?'
+syntax match mustacheInsideError '{{[{$#<>=!\/]\?'
+
+" Ember angle bracket syntax syntax starts with a capital letter:
+" https://github.com/emberjs/rfcs/blob/master/text/0311-angle-bracket-invocation.md
+syntax case match
+syntax region mustacheAngleComponent start=/<\/\?[[:upper:]]/ end=/>/ keepend containedin=TOP,@htmlMustacheContainer
+syntax case ignore
+syntax match mustacheAngleBrackets '</\?\|/\?>' contained containedin=mustacheAngleComponent
+syntax match mustacheAngleComponentName '</[[:alnum:]]\+'hs=s+2 contained containedin=mustacheAngleBrackets
+syntax match mustacheAngleComponentName '<[[:alnum:]]\+'hs=s+1 contained containedin=mustacheAngleBrackets
+
+syntax region mustacheHbsComponent start=/{{[^!][$#^/]\?/ end=/}}}\?/ keepend containedin=TOP,@htmlMustacheContainer
+
+syntax cluster mustacheInside add=mustacheHbsComponent,mustacheAngleComponent
+
+syntax match mustacheOperators '=\|\.\|/^>' contained containedin=@mustacheInside,mustacheParam
+syntax region mustacheHtmlValue start=/={{[^!][$#^/]\?/rs=s+1,hs=s+1 end=/}}/ oneline keepend contained containedin=htmlTag contains=@mustacheInside
+syntax region mustachePartial start=/{{[<>]/lc=2 end=/}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
+syntax region mustacheMarkerSet start=/{{=/lc=2 end=/=}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
+syntax match mustacheHandlebars '{{\|}}' contained containedin=@mustacheInside
+syntax match mustacheUnescape '{{{\|}}}' contained containedin=@mustacheInside
+syntax match mustacheConditionals '\([/#]\?\<\(if\|unless\)\|\<else\)\>' contained containedin=@mustacheInside
+syntax match mustacheHelpers '[/#]\?\<\(with\|link\-to\|each\(\-in\)\?\|let\)\>' contained containedin=@mustacheInside
+syntax match mustacheHelpers 'else \(if\|unless\|with\|link\-to\|each\(\-in\)\?\)' contained containedin=@mustacheInside
+syntax match mustacheParam /[a-z@_-]\+=/he=e-1 contained containedin=@mustacheInside
+syntax region mustacheComment      start=/{{!/rs=s+2   skip=/{{.\{-}}}/ end=/}}/re=e-2   contains=Todo contained containedin=TOP,@mustacheInside,@htmlMustacheContainer
+syntax region mustacheBlockComment start=/{{!--/rs=s+2 skip=/{{.\{-}}}/ end=/--}}/re=e-2 contains=Todo contained extend containedin=TOP,@mustacheInside,@htmlMustacheContainer
+syntax region mustacheQString start=/'/ skip=/\\'/ end=/'/ contained containedin=@mustacheInside
+syntax region mustacheDQString start=/"/ skip=/\\"/ end=/"/ contained containedin=@mustacheInside
+
+" Clustering
+syntax cluster htmlMustacheContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlLink,htmlBold,htmlUnderline,htmlItalic,htmlValue
+
+
+" Hilighting
+" mustacheInside hilighted as Number, which is rarely used in html
+" you might like change it to Function or Identifier
+HtmlHiLink mustacheVariable Number
+HtmlHiLink mustacheVariableUnescape Number
+HtmlHiLink mustachePartial Number
+HtmlHiLink mustacheMarkerSet Number
+HtmlHiLink mustacheParam htmlArg
+HtmlHiLink mustacheAngleComponentName htmlTag
+
+HtmlHiLink mustacheComment Comment
+HtmlHiLink mustacheBlockComment Comment
+HtmlHiLink mustacheError Error
+HtmlHiLink mustacheInsideError Error
+
+HtmlHiLink mustacheHandlebars Special
+HtmlHiLink mustacheAngleBrackets htmlTagName
+HtmlHiLink mustacheUnescape Identifier
+HtmlHiLink mustacheOperators Operator
+HtmlHiLink mustacheConditionals Conditional
+HtmlHiLink mustacheHelpers Repeat
+HtmlHiLink mustacheQString String
+HtmlHiLink mustacheDQString String
+
+syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustache\|x-handlebars-template\)[^>]*>+
+\                       end=+</script>+me=s-1 keepend
+\                       contains=mustacheInside,@htmlMustacheContainer,htmlTag,htmlEndTag,htmlTagName,htmlSpecialChar
+
+let b:current_syntax = "handlebars"
+delcommand HtmlHiLink
+
+endif

syntax/html-1.vim

@@ -1,94 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" Vim syntax file
-" Language:	HTML (version 5)
-" Maintainer:	Rodrigo Machado <rcmachado@gmail.com>
-" URL:		http://rm.blog.br/vim/syntax/html.vim
-" Last Change:  2009 Aug 19
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Note: This file just adds the new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Modified:     othree <othree@gmail.com>
-" Changes:      update to Draft 28 August 2010
-"               add complete new attributes
-"               add wai-aria attributes
-"               add microdata attributes
-"               add rdfa attributes
-
-
-syn keyword htmlTagName contained script
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen mark meter menu nav output
-syn keyword htmlTagName contained progress time ruby rt rp section source summary time track video wbr
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id lang spellcheck style tabindex title
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange 
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime pubdate
-
-" Custom Data Attributes
-" http://dev.w3.org/html5/spec/Overview.html#custom-data-attribute
-syn match   htmlArg "\<\(data(\-[a-z]\+)\+\)=" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained item itemid itemscope itemtype itemprop 
-
-" RDFa
-" http://www.w3.org/TR/rdfa-syntax/#a_xhtmlrdfa_dtd
-syn keyword htmlArg contained about typeof property resource content datatype rel rev 
-
-" WAI-ARIA States and Properties
-" http://www.w3.org/TR/wai-aria/states_and_properties
-syn keyword htmlArg contained role
-" Global States and Properties
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|controls\|describedby\)\>"
-syn match  htmlArg contained "\<aria-\(disabled\|dropeffect\|flowto\|grabbed\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|live\|owns\|relevant\)\>"
-
-" Widget Attributes
-syn match  htmlArg contained "\<aria-\(autocomplete\|checked\|disabled\|expanded\)\>"
-syn match  htmlArg contained "\<aria-\(haspopup\|hidden\|invalid\|label\)\>"
-syn match  htmlArg contained "\<aria-\(level\|multiline\|multiselectable\|orientation\)\>"
-syn match  htmlArg contained "\<aria-\(pressed\|readonly\|required\|selected\)\>"
-syn match  htmlArg contained "\<aria-\(sort\|valuemax\|valuemin\|valuenow\|valuetext\|\)\>"
-
-" Live Region Attributes
-syn match  htmlArg contained "\<aria-\(atomic\|busy\|live\|relevant\|\)\>"
-
-" Drag-and-Drop attributes
-syn match  htmlArg contained "\<aria-\(dropeffect\|grabbed\)\>"
-
-" Relationship Attributes
-syn match  htmlArg contained "\<aria-\(activedescendant\|controls\|describedby\|flowto\|\)\>"
-syn match  htmlArg contained "\<aria-\(labelledby\|owns\|posinset\|setsize\|\)\>"
-
-endif

syntax/html-2.vim

@@ -1,196 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-
-" Vim syntax file
-" Language:     HTML (version 5.1)
-"               SVG (SVG 1.1 Second Edition)
-"               MathML (MathML 3.0 Second Edition)
-" Last Change:  2017 Mar 07
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Note: This file just add new tags from HTML 5
-"       and don't replace default html.vim syntax file
-"
-" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-" Changes:      update to Draft 2016 Jan 13
-"               add microdata Attributes
-" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
-" URL:          http://rm.blog.br/vim/syntax/html.vim
-" Modified:     htdebeer <H.T.de.Beer@gmail.com>
-" Changes:      add common SVG elements and attributes for inline SVG
-
-" Patch 7.4.1142
-if has("patch-7.4-1142")
-  if has("win32")
-    syn iskeyword @,48-57,_,128-167,224-235,-
-  else
-    syn iskeyword @,48-57,_,192-255,-
-  endif
-endif
-
-" HTML 5 tags
-syn keyword htmlTagName contained article aside audio canvas command
-syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
-syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
-syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
-syn keyword htmlTagName contained template content shadow slot
-syn keyword htmlTagName contained wbr bdi
-syn keyword htmlTagName contained picture
-
-" SVG tags
-" http://www.w3.org/TR/SVG/
-" as found in http://www.w3.org/TR/SVG/eltindex.html
-syn keyword htmlTagName contained svg 
-syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
-syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
-syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
-syn keyword htmlTagName contained clipPath color-profile cursor 
-syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
-syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
-syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
-syn keyword htmlTagName contained glyph glyphRef hkern 
-syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
-syn keyword htmlTagName contained missing-glyph mpath 
-syn keyword htmlTagName contained text textPath tref tspan vkern
-syn keyword htmlTagName contained metadata title
-
-" MathML tags
-" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
-syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
-syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
-syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
-syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
-syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
-syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
-syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
-syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
-syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
-syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
-syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
-syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
-syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
-syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
-syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
-syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
-syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
-syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
-syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
-syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
-
-" Custom Element
-syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
-syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
-
-" HTML 5 arguments
-" Core Attributes
-syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
-syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
-" Event-handler Attributes
-syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
-syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
-syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
-syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
-syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
-syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
-syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
-syn keyword htmlArg contained onvolumechange onwaiting
-" XML Attributes
-syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
-" new features
-" <body>
-syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
-syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
-" <video>, <audio>, <source>, <track>
-syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
-" <form>, <input>, <button>
-syn keyword htmlArg contained form autocomplete autofocus list min max step
-syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
-syn keyword htmlArg contained required placeholder pattern
-" <command>, <details>, <time>
-syn keyword htmlArg contained label icon open datetime-local pubdate
-" <script>
-syn keyword htmlArg contained async
-" <content>
-syn keyword htmlArg contained select
-" <iframe>
-syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
-" <picture>
-syn keyword htmlArg contained srcset sizes
-" <a>
-syn keyword htmlArg contained download media
-" <script>, <style>
-syn keyword htmlArg contained nonce
-" <area>, <a>, <img>, <iframe>, <link>
-syn keyword htmlArg contained referrerpolicy
-" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
-syn keyword htmlArg contained integrity crossorigin
-" <link>
-syn keyword htmlArg contained prefetch 
-" syn keyword htmlArg contained preload
-" <img>
-syn keyword htmlArg contained decoding
-" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
-syn keyword htmlArg contained onselectstart onselectionchange
-" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
-syn keyword htmlArg contained loading
-
-" Custom Data Attributes
-" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
-syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Vendor Extension Attributes
-" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
-syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
-
-" Microdata
-" http://dev.w3.org/html5/md/
-syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
-
-" SVG
-" http://www.w3.org/TR/SVG/
-" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
-syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
-syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
-syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
-syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
-syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
-syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
-syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
-syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
-syn keyword htmlArg contained id ideographic in in2 intercept 
-syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
-syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
-syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
-syn keyword htmlArg contained numOctaves 
-syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
-syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
-syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
-syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
-syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
-syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
-syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
-syn keyword htmlArg contained width widths 
-syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
-syn keyword htmlArg contained y y1 y2 yChannelSelector 
-syn keyword htmlArg contained z zoomAndPan 
-syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
-
-" MathML attributes
-" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
-syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
-syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
-syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
-syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
-syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
-syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
-syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
-syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
-syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
-syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
-syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
-syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
-syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
-syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
-
-
-endif

syntax/html.vim

@@ -1,3 +1,196 @@
-" Polyglot metafile
-source <sfile>:h/html-1.vim
-source <sfile>:h/html-2.vim
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+
+" Vim syntax file
+" Language:     HTML (version 5.1)
+"               SVG (SVG 1.1 Second Edition)
+"               MathML (MathML 3.0 Second Edition)
+" Last Change:  2017 Mar 07
+" License:      Public domain
+"               (but let me know if you like :) )
+"
+" Note: This file just add new tags from HTML 5
+"       and don't replace default html.vim syntax file
+"
+" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
+" Changes:      update to Draft 2016 Jan 13
+"               add microdata Attributes
+" Maintainer:   Rodrigo Machado <rcmachado@gmail.com>
+" URL:          http://rm.blog.br/vim/syntax/html.vim
+" Modified:     htdebeer <H.T.de.Beer@gmail.com>
+" Changes:      add common SVG elements and attributes for inline SVG
+
+" Patch 7.4.1142
+if has("patch-7.4-1142")
+  if has("win32")
+    syn iskeyword @,48-57,_,128-167,224-235,-
+  else
+    syn iskeyword @,48-57,_,192-255,-
+  endif
+endif
+
+" HTML 5 tags
+syn keyword htmlTagName contained article aside audio canvas command
+syn keyword htmlTagName contained datalist details dialog embed figcaption figure footer
+syn keyword htmlTagName contained header hgroup keygen main mark meter menu menuitem nav output
+syn keyword htmlTagName contained progress ruby rt rp rb rtc section source summary time track video data
+syn keyword htmlTagName contained template content shadow slot
+syn keyword htmlTagName contained wbr bdi
+syn keyword htmlTagName contained picture
+
+" SVG tags
+" http://www.w3.org/TR/SVG/
+" as found in http://www.w3.org/TR/SVG/eltindex.html
+syn keyword htmlTagName contained svg 
+syn keyword htmlTagName contained altGlyph altGlyphDef altGlyphItem 
+syn keyword htmlTagName contained animate animateColor animateMotion animateTransform 
+syn keyword htmlTagName contained circle ellipse rect line polyline polygon image path
+syn keyword htmlTagName contained clipPath color-profile cursor 
+syn keyword htmlTagName contained defs desc g symbol view use switch foreignObject
+syn keyword htmlTagName contained filter feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence 
+syn keyword htmlTagName contained font font-face font-face-format font-face-name font-face-src font-face-uri 
+syn keyword htmlTagName contained glyph glyphRef hkern 
+syn keyword htmlTagName contained linearGradient marker mask pattern radialGradient set stop
+syn keyword htmlTagName contained missing-glyph mpath 
+syn keyword htmlTagName contained text textPath tref tspan vkern
+syn keyword htmlTagName contained metadata title
+
+" MathML tags
+" https://www.w3.org/TR/MathML3/appendixi.html#index.elem
+syn keyword htmlTagName contained abs and annotation annotation-xml apply approx arccos arccosh arccot arccoth
+syn keyword htmlTagName contained arccsc arccsch arcsec arcsech arcsin arcsinh arctan arctanh arg bind
+syn keyword htmlTagName contained bvar card cartesianproduct cbytes ceiling cerror ci cn codomain complexes
+syn keyword htmlTagName contained compose condition conjugate cos cosh cot coth cs csc csch
+syn keyword htmlTagName contained csymbol curl declare degree determinant diff divergence divide domain domainofapplication
+syn keyword htmlTagName contained emptyset eq equivalent eulergamma exists exp exponentiale factorial factorof false
+syn keyword htmlTagName contained floor fn forall gcd geq grad gt ident image imaginary
+syn keyword htmlTagName contained imaginaryi implies in infinity int integers intersect interval inverse lambda
+syn keyword htmlTagName contained laplacian lcm leq limit list ln log logbase lowlimit lt
+syn keyword htmlTagName contained maction maligngroup malignmark math matrix matrixrow max mean median menclose
+syn keyword htmlTagName contained merror mfenced mfrac mglyph mi mi" min minus mlabeledtr mlongdiv
+syn keyword htmlTagName contained mmultiscripts mn mo mode moment momentabout mover mpadded mphantom mprescripts
+syn keyword htmlTagName contained mroot mrow ms mscarries mscarry msgroup msline mspace msqrt msrow
+syn keyword htmlTagName contained mstack mstyle msub msubsup msup mtable mtd mtext mtr munder
+syn keyword htmlTagName contained munderover naturalnumbers neq none not notanumber notin notprsubset notsubset or
+syn keyword htmlTagName contained otherwise outerproduct partialdiff pi piece piecewise plus power primes product
+syn keyword htmlTagName contained prsubset quotient rationals real reals reln rem root scalarproduct sdev
+syn keyword htmlTagName contained sec sech selector semantics sep set setdiff share sin sinh
+syn keyword htmlTagName contained span subset sum tan tanh tendsto times transpose true union
+syn keyword htmlTagName contained uplimit variance vector vectorproduct xor
+
+" Custom Element
+syn match htmlTagName contained "\<[a-z][-.0-9_a-z]*-[-.0-9_a-z]*\>"
+syn match htmlTagName contained "[.0-9_a-z]\@<=-[-.0-9_a-z]*\>"
+
+" HTML 5 arguments
+" Core Attributes
+syn keyword htmlArg contained accesskey class contenteditable contextmenu dir 
+syn keyword htmlArg contained draggable hidden id is lang spellcheck style tabindex title translate
+" Event-handler Attributes
+syn keyword htmlArg contained onabort onblur oncanplay oncanplaythrough onchange
+syn keyword htmlArg contained onclick oncontextmenu ondblclick ondrag ondragend ondragenter ondragleave ondragover 
+syn keyword htmlArg contained ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformchange 
+syn keyword htmlArg contained onforminput oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata 
+syn keyword htmlArg contained onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup
+syn keyword htmlArg contained onmousewheel onpause onplay onplaying onprogress onratechange onreadystatechange 
+syn keyword htmlArg contained onscroll onseeked onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate 
+syn keyword htmlArg contained onvolumechange onwaiting
+" XML Attributes
+syn keyword htmlArg contained xml:lang xml:space xml:base xmlns
+" new features
+" <body>
+syn keyword htmlArg contained onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload 
+syn keyword htmlArg contained onmessage onoffline ononline onpopstate onredo onresize onstorage onundo onunload
+" <video>, <audio>, <source>, <track>
+syn keyword htmlArg contained autoplay preload controls loop poster media kind charset srclang track playsinline
+" <form>, <input>, <button>
+syn keyword htmlArg contained form autocomplete autofocus list min max step
+syn keyword htmlArg contained formaction autofocus formenctype formmethod formtarget formnovalidate
+syn keyword htmlArg contained required placeholder pattern
+" <command>, <details>, <time>
+syn keyword htmlArg contained label icon open datetime-local pubdate
+" <script>
+syn keyword htmlArg contained async
+" <content>
+syn keyword htmlArg contained select
+" <iframe>
+syn keyword htmlArg contained seamless srcdoc sandbox allowfullscreen allowusermedia allowpaymentrequest allowpresentation
+" <picture>
+syn keyword htmlArg contained srcset sizes
+" <a>
+syn keyword htmlArg contained download media
+" <script>, <style>
+syn keyword htmlArg contained nonce
+" <area>, <a>, <img>, <iframe>, <link>
+syn keyword htmlArg contained referrerpolicy
+" https://w3c.github.io/webappsec-subresource-integrity/#the-integrity-attribute
+syn keyword htmlArg contained integrity crossorigin
+" <link>
+syn keyword htmlArg contained prefetch 
+" syn keyword htmlArg contained preload
+" <img>
+syn keyword htmlArg contained decoding
+" https://w3c.github.io/selection-api/#extensions-to-globaleventhandlers
+syn keyword htmlArg contained onselectstart onselectionchange
+" https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/loading
+syn keyword htmlArg contained loading
+
+" Custom Data Attributes
+" http://w3c.github.io/html/single-page.html#embedding-custom-non-visible-data-with-the-data-attributes
+syn match   htmlArg "\<data[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Vendor Extension Attributes
+" http://w3c.github.io/html/single-page.html#conformance-requirements-extensibility
+syn match   htmlArg "\<x[-.0-9_a-z]*-[-.0-9_a-z]*\>" contained
+
+" Microdata
+" http://dev.w3.org/html5/md/
+syn keyword htmlArg contained itemid itemscope itemtype itemprop itemref
+
+" SVG
+" http://www.w3.org/TR/SVG/
+" Some common attributes from http://www.w3.org/TR/SVG/attindex.html
+syn keyword htmlArg contained accent-height accumulate additive alphabetic amplitude arabic-form ascent attributeName attributeType azimuth 
+syn keyword htmlArg contained baseFrequency baseProfile bbox begin bias by 
+syn keyword htmlArg contained calcMode cap-height class clipPathUnits contentScriptType contentStyleType cx cy 
+syn keyword htmlArg contained d descent diffuseConstant divisor dur dx dy 
+syn keyword htmlArg contained edgeMode elevation end exponent externalResourcesRequired 
+syn keyword htmlArg contained fill filterRes filterUnits font-family font-size font-stretch font-style font-variant font-weight format format from fx fy 
+syn keyword htmlArg contained g1 g2 glyph-name glyphRef gradientTransform gradientUnits 
+syn keyword htmlArg contained hanging height horiz-adv-x horiz-origin-x horiz-origin-y 
+syn keyword htmlArg contained id ideographic in in2 intercept 
+syn keyword htmlArg contained k k1 k2 k3 k4 kernelMatrix kernelUnitLength keyPoints keySplines keyTimes 
+syn keyword htmlArg contained lang lengthAdjust limitingConeAngle local 
+syn keyword htmlArg contained markerHeight markerUnits markerWidth maskContentUnits maskUnits mathematical max media method min mode name 
+syn keyword htmlArg contained numOctaves 
+syn keyword htmlArg contained offset onabort onactivate onbegin onclick onend onerror onfocusin onfocusout onload onmousedown onmousemove onmouseout onmouseover onmouseup onrepeat onresize onscroll onunload onzoom operator order orient orientation origin overline-position overline-thickness 
+syn keyword htmlArg contained panose-1 path pathLength patternContentUnits patternTransform patternUnits points pointsAtX pointsAtY pointsAtZ preserveAlpha preserveAspectRatio primitiveUnits 
+syn keyword htmlArg contained r radius refX refY rendering-intent repeatCount repeatDur requiredExtensions requiredFeatures restart result rotate rx ry 
+syn keyword htmlArg contained scale seed slope spacing specularConstant specularExponent spreadMethod startOffset stdDeviation stemh stemv stitchTiles strikethrough-position strikethrough-thickness string surfaceScale systemLanguage 
+syn keyword htmlArg contained tableValues target targetX targetY textLength title to transform type
+syn keyword htmlArg contained u1 u2 underline-position underline-thickness unicode unicode-range units-per-em 
+syn keyword htmlArg contained v-alphabetic v-hanging v-ideographic v-mathematical values version vert-adv-y vert-origin-x vert-origin-y viewBox viewTarget 
+syn keyword htmlArg contained width widths 
+syn keyword htmlArg contained x x-height x1 x2 xChannelSelector xlink:actuate xlink:actuate xlink:arcrole xlink:href xlink:role xlink:show xlink:title xlink:type xml:base xml:lang xml:space 
+syn keyword htmlArg contained y y1 y2 yChannelSelector 
+syn keyword htmlArg contained z zoomAndPan 
+syn keyword htmlArg contained alignment-baseline baseline-shift clip-path clip-rule clip color-interpolation-filters color-interpolation color-profile color-rendering color cursor direction display dominant-baseline enable-background fill-opacity fill-rule fill filter flood-color flood-opacity font-family font-size-adjust font-size font-stretch font-style font-variant font-weight glyph-orientation-horizontal glyph-orientation-vertical image-rendering kerning letter-spacing lighting-color marker-end marker-mid marker-start mask opacity overflow pointer-events shape-rendering stop-color stop-opacity stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width stroke text-anchor text-decoration text-rendering unicode-bidi visibility word-spacing writing-mode
+
+" MathML attributes
+" https://www.w3.org/TR/MathML3/chapter2.html#interf.toplevel.atts
+syn keyword htmlArg contained accent accentunder actiontype align alignmentscope altimg altimg-height altimg-valign altimg-width alttext
+syn keyword htmlArg contained annotation-xml background base baseline bevelled cd cdgroup charalign charspacing close
+syn keyword htmlArg contained closure color columnalign columnalignment columnlines columnspacing columnspan columnwidth crossout decimalpoint
+syn keyword htmlArg contained definitionURL denomalign depth display displaystyle edge encoding equalcolumns equalrows fence
+syn keyword htmlArg contained fontfamily fontsize fontstyle fontweight form frame framespacing groupalign height indentalign
+syn keyword htmlArg contained indentalignfirst indentalignlast indentshift indentshiftfirst indentshiftlast indenttarget index infixlinebreakstyle integer largeop
+syn keyword htmlArg contained leftoverhang length linebreak linebreakmultchar linebreakstyle lineleading linethickness location longdivstyle lquote
+syn keyword htmlArg contained lspace ltr macros math mathbackground mathcolor mathsize mathvariant maxsize maxwidth
+syn keyword htmlArg contained mediummathspace menclose minlabelspacing minsize mode movablelimits msgroup mslinethickness name nargs
+syn keyword htmlArg contained newline notation numalign number occurrence open order other overflow position
+syn keyword htmlArg contained rightoverhang role rowalign rowlines rowspacing rowspan rquote rspace schemaLocation scope
+syn keyword htmlArg contained scriptlevel scriptminsize scriptsize scriptsizemultiplier selection separator separators shift side stackalign
+syn keyword htmlArg contained stretchy subscriptshift superscriptshift symmetric thickmathspace thinmathspace type valign verythickmathspace verythinmathspace
+syn keyword htmlArg contained veryverythickmathspace veryverythinmathspace voffset width xref
+
+
+endif

syntax/htmldjango.vim

@@ -0,0 +1,30 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'htmldjango') == -1
+
+" Vim syntax file
+" Language:	Django HTML template
+" Maintainer:	Dave Hodder <dmh@dmh.org.uk>
+" Last Change:	2014 Jul 13
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+if !exists("main_syntax")
+  let main_syntax = 'html'
+endif
+
+runtime! syntax/django.vim
+runtime! syntax/html.vim
+unlet b:current_syntax
+
+syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoComBlock
+
+syn region djangoTagBlock start="{%" end="%}" contains=djangoStatement,djangoFilter,djangoArgument,djangoTagError display containedin=ALLBUT,@djangoBlocks
+syn region djangoVarBlock start="{{" end="}}" contains=djangoFilter,djangoArgument,djangoVarError display containedin=ALLBUT,@djangoBlocks
+syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomment\s*%}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
+syn region djangoComBlock start="{#" end="#}" contains=djangoTodo containedin=ALLBUT,@djangoBlocks
+
+let b:current_syntax = "htmldjango"
+
+endif

syntax/jinja.vim

@@ -1,90 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jinja') == -1
-
-" jinja syntax file
-" Language: Jinja HTML template
-" Maintainer: Hsiaoming Yang <lepture@me.com>
-" Last Change: Sep 13, 2012
-
-" only support 6.x+
-
-if exists("b:current_syntax")
-  finish
-endif
-
-if !exists("main_syntax")
-  let main_syntax = 'html'
-endif
-
-runtime! syntax/html.vim
-unlet b:current_syntax
-
-syntax case match
-
-" jinja template built-in tags and parameters
-" 'comment' doesn't appear here because it gets special treatment
-syn keyword jinjaStatement contained if else elif endif is not
-syn keyword jinjaStatement contained for in recursive endfor
-syn keyword jinjaStatement contained raw endraw
-syn keyword jinjaStatement contained block endblock extends super scoped
-syn keyword jinjaStatement contained macro endmacro call endcall
-syn keyword jinjaStatement contained from import as do continue break
-syn keyword jinjaStatement contained filter endfilter set
-syn keyword jinjaStatement contained include ignore missing
-syn keyword jinjaStatement contained with without context endwith
-syn keyword jinjaStatement contained trans endtrans pluralize
-syn keyword jinjaStatement contained autoescape endautoescape
-
-" jinja templete built-in filters
-syn keyword jinjaFilter contained abs attr batch capitalize center default
-syn keyword jinjaFilter contained dictsort escape filesizeformat first
-syn keyword jinjaFilter contained float forceescape format groupby indent
-syn keyword jinjaFilter contained int join last length list lower pprint
-syn keyword jinjaFilter contained random replace reverse round safe slice
-syn keyword jinjaFilter contained sort string striptags sum
-syn keyword jinjaFilter contained title trim truncate upper urlize
-syn keyword jinjaFilter contained wordcount wordwrap
-
-" jinja template built-in tests
-syn keyword jinjaTest contained callable defined divisibleby escaped
-syn keyword jinjaTest contained even iterable lower mapping none number
-syn keyword jinjaTest contained odd sameas sequence string undefined upper
-
-syn keyword jinjaFunction contained range lipsum dict cycler joiner
-
-
-" Keywords to highlight within comments
-syn keyword jinjaTodo contained TODO FIXME XXX
-
-" jinja template constants (always surrounded by double quotes)
-syn region jinjaArgument contained start=/"/ skip=/\\"/ end=/"/
-syn region jinjaArgument contained start=/'/ skip=/\\'/ end=/'/
-syn keyword jinjaArgument contained true false
-
-" Mark illegal characters within tag and variables blocks
-syn match jinjaTagError contained "#}\|{{\|[^%]}}\|[&#]"
-syn match jinjaVarError contained "#}\|{%\|%}\|[<>!&#%]"
-syn cluster jinjaBlocks add=jinjaTagBlock,jinjaVarBlock,jinjaComBlock,jinjaComment
-
-" jinja template tag and variable blocks
-syn region jinjaTagBlock start="{%" end="%}" contains=jinjaStatement,jinjaFilter,jinjaArgument,jinjaFilter,jinjaTest,jinjaTagError display containedin=ALLBUT,@jinjaBlocks
-syn region jinjaVarBlock start="{{" end="}}" contains=jinjaFilter,jinjaArgument,jinjaVarError display containedin=ALLBUT,@jinjaBlocks
-syn region jinjaComBlock start="{#" end="#}" contains=jinjaTodo containedin=ALLBUT,@jinjaBlocks
-
-
-hi def link jinjaTagBlock PreProc
-hi def link jinjaVarBlock PreProc
-hi def link jinjaStatement Statement
-hi def link jinjaFunction Function
-hi def link jinjaTest Type
-hi def link jinjaFilter Identifier
-hi def link jinjaArgument Constant
-hi def link jinjaTagError Error
-hi def link jinjaVarError Error
-hi def link jinjaError Error
-hi def link jinjaComment Comment
-hi def link jinjaComBlock Comment
-hi def link jinjaTodo Todo
-
-let b:current_syntax = "jinja"
-
-endif

syntax/mustache.vim

@@ -1,110 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'handlebars') == -1
 
-" Mustache & Handlebars syntax
-" Language:	Mustache, Handlebars
-" Maintainer:	Juvenn Woo <machese@gmail.com>
-" Screenshot:   http://imgur.com/6F408
-" Version:	6
-" Last Change:  Jul 16 2019
-" Remark:
-"   It lexically hilights embedded mustaches (exclusively) in html file.
-"   While it was written for Ruby-based Mustache template system, it should
-"   work for Google's C-based *ctemplate* as well as Erlang-based *et*. All
-"   of them are, AFAIK, based on the idea of ctemplate.
-" References:
-"   [Mustache](http://github.com/defunkt/mustache)
-"   [Handlebars](https://github.com/wycats/handlebars.js)
-"   [ctemplate](http://code.google.com/p/google-ctemplate/)
-"   [ctemplate doc](http://google-ctemplate.googlecode.com/svn/trunk/doc/howto.html)
-"   [et](http://www.ivan.fomichev.name/2008/05/erlang-template-engine-prototype.html)
-" TODO: Feedback is welcomed.
-
-
-" Read the HTML syntax to start with
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" Standard HiLink will not work with included syntax files
-if version < 508
-  command! -nargs=+ HtmlHiLink hi link <args>
-else
-  command! -nargs=+ HtmlHiLink hi def link <args>
-endif
-
-syntax match mustacheError '}}}\?'
-syntax match mustacheInsideError '{{[{$#<>=!\/]\?'
-
-" Ember angle bracket syntax syntax starts with a capital letter:
-" https://github.com/emberjs/rfcs/blob/master/text/0311-angle-bracket-invocation.md
-syntax case match
-syntax region mustacheAngleComponent start=/<\/\?[[:upper:]]/ end=/>/ keepend containedin=TOP,@htmlMustacheContainer
-syntax case ignore
-syntax match mustacheAngleBrackets '</\?\|/\?>' contained containedin=mustacheAngleComponent
-syntax match mustacheAngleComponentName '</[[:alnum:]]\+'hs=s+2 contained containedin=mustacheAngleBrackets
-syntax match mustacheAngleComponentName '<[[:alnum:]]\+'hs=s+1 contained containedin=mustacheAngleBrackets
-
-syntax region mustacheHbsComponent start=/{{[^!][$#^/]\?/ end=/}}}\?/ keepend containedin=TOP,@htmlMustacheContainer
-
-syntax cluster mustacheInside add=mustacheHbsComponent,mustacheAngleComponent
-
-syntax match mustacheOperators '=\|\.\|/^>' contained containedin=@mustacheInside,mustacheParam
-syntax region mustacheHtmlValue start=/={{[^!][$#^/]\?/rs=s+1,hs=s+1 end=/}}/ oneline keepend contained containedin=htmlTag contains=@mustacheInside
-syntax region mustachePartial start=/{{[<>]/lc=2 end=/}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
-syntax region mustacheMarkerSet start=/{{=/lc=2 end=/=}}/me=e-2 contained containedin=@mustacheInside,@htmlMustacheContainer
-syntax match mustacheHandlebars '{{\|}}' contained containedin=@mustacheInside
-syntax match mustacheUnescape '{{{\|}}}' contained containedin=@mustacheInside
-syntax match mustacheConditionals '\([/#]\?\<\(if\|unless\)\|\<else\)\>' contained containedin=@mustacheInside
-syntax match mustacheHelpers '[/#]\?\<\(with\|link\-to\|each\(\-in\)\?\|let\)\>' contained containedin=@mustacheInside
-syntax match mustacheHelpers 'else \(if\|unless\|with\|link\-to\|each\(\-in\)\?\)' contained containedin=@mustacheInside
-syntax match mustacheParam /[a-z@_-]\+=/he=e-1 contained containedin=@mustacheInside
-syntax region mustacheComment      start=/{{!/rs=s+2   skip=/{{.\{-}}}/ end=/}}/re=e-2   contains=Todo contained containedin=TOP,@mustacheInside,@htmlMustacheContainer
-syntax region mustacheBlockComment start=/{{!--/rs=s+2 skip=/{{.\{-}}}/ end=/--}}/re=e-2 contains=Todo contained extend containedin=TOP,@mustacheInside,@htmlMustacheContainer
-syntax region mustacheQString start=/'/ skip=/\\'/ end=/'/ contained containedin=@mustacheInside
-syntax region mustacheDQString start=/"/ skip=/\\"/ end=/"/ contained containedin=@mustacheInside
-
-" Clustering
-syntax cluster htmlMustacheContainer add=htmlHead,htmlTitle,htmlString,htmlH1,htmlH2,htmlH3,htmlH4,htmlH5,htmlH6,htmlLink,htmlBold,htmlUnderline,htmlItalic,htmlValue
-
-
-" Hilighting
-" mustacheInside hilighted as Number, which is rarely used in html
-" you might like change it to Function or Identifier
-HtmlHiLink mustacheVariable Number
-HtmlHiLink mustacheVariableUnescape Number
-HtmlHiLink mustachePartial Number
-HtmlHiLink mustacheMarkerSet Number
-HtmlHiLink mustacheParam htmlArg
-HtmlHiLink mustacheAngleComponentName htmlTag
-
-HtmlHiLink mustacheComment Comment
-HtmlHiLink mustacheBlockComment Comment
-HtmlHiLink mustacheError Error
-HtmlHiLink mustacheInsideError Error
-
-HtmlHiLink mustacheHandlebars Special
-HtmlHiLink mustacheAngleBrackets htmlTagName
-HtmlHiLink mustacheUnescape Identifier
-HtmlHiLink mustacheOperators Operator
-HtmlHiLink mustacheConditionals Conditional
-HtmlHiLink mustacheHelpers Repeat
-HtmlHiLink mustacheQString String
-HtmlHiLink mustacheDQString String
-
-syn region mustacheScriptTemplate start=+<script [^>]*type *=[^>]*text/\(mustache\|x-handlebars-template\)[^>]*>+
-\                       end=+</script>+me=s-1 keepend
-\                       contains=mustacheInside,@htmlMustacheContainer,htmlTag,htmlEndTag,htmlTagName,htmlSpecialChar
-
-let b:current_syntax = "mustache"
-delcommand HtmlHiLink
+runtime! syntax/handlebars.vim
 
 endif

syntax/odin.vim

@@ -0,0 +1,178 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'odin') == -1
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syntax keyword odinUsing using
+syntax keyword odinTransmute transmute
+syntax keyword odinDistinct distinct
+syntax keyword odinOpaque opaque
+
+syntax keyword odinStruct struct
+syntax keyword odinEnum enum
+syntax keyword odinUnion union
+syntax keyword odinBitField bit_field
+syntax keyword odinBitSet bit_set
+
+syntax keyword odinIf if
+syntax keyword odinWhen when
+syntax keyword odinElse else
+syntax keyword odinDo do
+syntax keyword odinFor for
+syntax keyword odinSwitch switch
+syntax keyword odinCase case
+syntax keyword odinContinue continue
+syntax keyword odinBreak break
+syntax keyword odinSizeOf size_of
+syntax keyword odinTypeInfoOf type_info_of
+syntax keyword odinTypeIdOf typeid_of
+syntax keyword odinTypeOf type_of
+syntax keyword odinAlignOf align_of
+
+syntax keyword odinInline inline
+syntax keyword odinNoInline no_inline
+
+syntax match odinTodo "TODO"
+syntax match odinNote "NOTE"
+syntax match odinXXX "XXX"
+syntax match odinFixMe "FIXME"
+syntax match odinNoCheckin "NOCHECKIN"
+syntax match odinHack "HACK"
+
+syntax keyword odinDataType string cstring bool b8 b16 b32 b64 rune any rawptr f32 f64 f32le f32be f64le f64be u8 u16 u32 u64 u128 u16le u32le u64le u128le u16be u32be u64be u128be uint uintptr i8 i16 i32 i64 i128 i16le i32le i64le i128le i16be i32be i64be i128be int
+syntax keyword odinBool true false
+syntax keyword odinNull nil
+syntax keyword odinDynamic dynamic
+syntax keyword odinProc proc
+syntax keyword odinIn in
+syntax keyword odinNotIn notin
+syntax keyword odinNotIn not_in
+syntax keyword odinImport import
+syntax keyword odinExport export
+syntax keyword odinForeign foreign
+syntax keyword odinConst const
+syntax match odinNoinit "---"
+syntax keyword odinPackage package
+
+syntax keyword odinReturn return
+syntax keyword odinDefer defer
+
+syntax region odinChar start=/\v'/ skip=/\v\\./ end=/\v'/
+syntax region odinString start=/\v"/ skip=/\v\\./ end=/\v"/
+
+syntax match odinFunction "\v<\w*>(\s*::\s*)@="
+syntax match odinDynamicFunction "\v<\w*(\s*:\=\s*\(.*\))@="
+
+syntax match odinTagNote "@\<\w\+\>" display
+
+syntax match odinClass "\v<[A-Z]\w+>" display
+syntax match odinConstant "\v<[A-Z0-9,_]+>" display
+syntax match odinRange "\.\." display
+syntax match odinHalfRange "\.\.\<" display
+syntax match odinTernaryQMark "?" display
+syntax match odinDeclaration "\:\:\?" display
+syntax match odinDeclAssign ":=" display
+syntax match odinReturnOp "->" display
+
+syntax match odinInteger "\-\?\<\d\+\>" display
+syntax match odinFloat "\-\?\<[0-9][0-9_]*\%(\.[0-9][0-9_]*\)\%([eE][+-]\=[0-9_]\+\)\=" display
+syntax match odinHex "\-\?\<0x[0-9A-Fa-f]\+\>" display
+syntax match odinAddressOf "&" display
+syntax match odinDeref "\^" display
+
+syntax match odinMacro "#\<\w\+\>" display
+
+syntax match odinTemplate "$\<\w\+\>"
+
+syntax match odinCommentNote "@\<\w\+\>" contained display
+syntax region odinLineComment start=/\/\// end=/$/  contains=odinLineComment, odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
+syntax region odinBlockComment start=/\v\/\*/ end=/\v\*\// contains=odinBlockComment, odinCommentNote, odinTodo, odinNote, odinXXX, odinFixMe, odinNoCheckin, odinHack
+
+highlight link odinUsing Keyword
+highlight link odinTransmute Keyword
+highlight link odinDistinct Keyword
+highlight link odinOpaque Keyword
+highlight link odinReturn Keyword
+highlight link odinSwitch Keyword
+highlight link odinCase Keyword
+highlight link odinProc Keyword
+highlight link odinIn Keyword
+highlight link odinNotIn Keyword
+highlight link odinContinue Keyword
+highlight link odinBreak Keyword
+highlight link odinSizeOf Keyword
+highlight link odinTypeOf Keyword
+highlight link odinTypeInfoOf Keyword
+highlight link odinTypeIdOf Keyword
+highlight link odinAlignOf Keyword
+highlight link odinPackage Keyword
+
+highlight link odinInline Keyword
+highlight link odinNoInline Keyword
+
+highlight link odinImport Keyword
+highlight link odinExport Keyword
+highlight link odinForeign Keyword
+highlight link odinNoinit Keyword
+highlight link odinDo Keyword
+
+highlight link odinDefer Operator
+highlight link odinDynamic Operator
+highlight link odinRange Operator
+highlight link odinHalfRange Operator
+highlight link odinAssign Operator
+highlight link odinAddressOf Operator
+highlight link odinDeref Operator
+
+highlight link odinDeclaration Operator
+highlight link odinDeclAssign Operator
+highlight link odinAssign Operator
+highlight link odinTernaryQMark Operator
+highlight link odinReturnOp Operator
+
+highlight link odinString String
+highlight link odinChar String
+
+highlight link odinStruct Structure
+highlight link odinEnum Structure
+highlight link odinUnion Structure
+highlight link odinBitField Structure
+highlight link odinBitSet Structure
+
+highlight link odinFunction Function
+highlight link odinDynamicFunction Function
+
+highlight link odinMacro Macro
+highlight link odinIf Conditional
+highlight link odinWhen Conditional
+highlight link odinElse Conditional
+highlight link odinFor Repeat
+
+highlight link odinLineComment Comment
+highlight link odinBlockComment Comment
+highlight link odinCommentNote Todo
+
+highlight link odinTodo Todo
+highlight link odinNote Todo
+highlight link odinXXX Todo
+highlight link odinFixMe Todo
+highlight link odinNoCheckin Todo
+highlight link odinHack Todo
+
+highlight link odinClass Type
+
+highlight link odinTemplate Constant
+
+highlight link odinTagNote Identifier
+highlight link odinDataType Type
+highlight link odinBool Boolean
+highlight link odinConstant Constant
+highlight link odinNull Type
+highlight link odinInteger Number
+highlight link odinFloat Float
+highlight link odinHex Number
+
+let b:current_syntax = "odin"
+
+endif

syntax/prolog.vim

@@ -0,0 +1,122 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'prolog') == -1
+
+" Vim syntax file
+" Language:    PROLOG
+" Maintainer:  Anton Kochkov <anton.kochkov@gmail.com>
+" Last Change: 2019 Aug 29
+
+" There are two sets of highlighting in here:
+" If the "prolog_highlighting_clean" variable exists, it is rather sparse.
+" Otherwise you get more highlighting.
+"
+" You can also set the "prolog_highlighting_no_keyword" variable. If set,
+" keywords will not be highlighted.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" Prolog is case sensitive.
+syn case match
+
+" Very simple highlighting for comments, clause heads and
+" character codes.  It respects prolog strings and atoms.
+
+syn region   prologCComment start=+/\*+ end=+\*/+
+syn match    prologComment  +%.*+
+
+if !exists("prolog_highlighting_no_keyword")
+  syn keyword  prologKeyword  module meta_predicate multifile dynamic
+endif
+syn match    prologCharCode +0'\\\=.+
+syn region   prologString   start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn region   prologAtom     start=+'+ skip=+\\\\\|\\'+ end=+'+
+syn region   prologClause   matchgroup=prologClauseHead start=+^\s*[a-z]\w*+ matchgroup=Normal end=+\.\s\|\.$+ contains=ALLBUT,prologClause
+
+if !exists("prolog_highlighting_clean")
+
+  " some keywords
+  " some common predicates are also highlighted as keywords
+  " is there a better solution?
+  if !exists("prolog_highlighting_no_keyword")
+    syn keyword prologKeyword   abolish current_output  peek_code
+    syn keyword prologKeyword   append  current_predicate       put_byte
+    syn keyword prologKeyword   arg     current_prolog_flag     put_char
+    syn keyword prologKeyword   asserta fail    put_code
+    syn keyword prologKeyword   assertz findall read
+    syn keyword prologKeyword   at_end_of_stream        float   read_term
+    syn keyword prologKeyword   atom    flush_output    repeat
+    syn keyword prologKeyword   atom_chars      functor retract
+    syn keyword prologKeyword   atom_codes      get_byte        set_input
+    syn keyword prologKeyword   atom_concat     get_char        set_output
+    syn keyword prologKeyword   atom_length     get_code        set_prolog_flag
+    syn keyword prologKeyword   atomic  halt    set_stream_position
+    syn keyword prologKeyword   bagof   integer setof
+    syn keyword prologKeyword   call    is      stream_property
+    syn keyword prologKeyword   catch   nl      sub_atom
+    syn keyword prologKeyword   char_code       nonvar  throw
+    syn keyword prologKeyword   char_conversion number  true
+    syn keyword prologKeyword   clause  number_chars    unify_with_occurs_check
+    syn keyword prologKeyword   close   number_codes    var
+    syn keyword prologKeyword   compound        once    write
+    syn keyword prologKeyword   copy_term       op      write_canonical
+    syn keyword prologKeyword   current_char_conversion open    write_term
+    syn keyword prologKeyword   current_input   peek_byte       writeq
+    syn keyword prologKeyword   current_op      peek_char
+  endif
+
+  syn match   prologOperator "=\\=\|=:=\|\\==\|=<\|==\|>=\|\\=\|\\+\|=\.\.\|<\|>\|="
+  syn match   prologAsIs     "===\|\\===\|<=\|=>"
+
+  syn match   prologNumber            "\<\d*\>'\@!"
+  syn match   prologNumber            "\<0[xX]\x*\>'\@!"
+  syn match   prologCommentError      "\*/"
+  syn match   prologSpecialCharacter  ";"
+  syn match   prologSpecialCharacter  "!"
+  syn match   prologSpecialCharacter  ":-"
+  syn match   prologSpecialCharacter  "-->"
+  syn match   prologQuestion          "?-.*\."  contains=prologNumber
+
+
+endif
+
+syn sync maxlines=50
+
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default highlighting.
+hi def link prologComment          Comment
+hi def link prologCComment         Comment
+hi def link prologCharCode         Special
+
+if exists ("prolog_highlighting_clean")
+
+hi def link prologKeyword        Statement
+hi def link prologClauseHead     Statement
+hi def link prologClause Normal
+
+else
+
+hi def link prologKeyword        Keyword
+hi def link prologClauseHead     Constant
+hi def link prologClause Normal
+hi def link prologQuestion       PreProc
+hi def link prologSpecialCharacter Special
+hi def link prologNumber         Number
+hi def link prologAsIs           Normal
+hi def link prologCommentError   Error
+hi def link prologAtom           String
+hi def link prologString         String
+hi def link prologOperator       Operator
+
+endif
+
+
+let b:current_syntax = "prolog"
+
+" vim: ts=8
+
+endif

syntax/rust.vim

@@ -231,7 +231,7 @@ syn region rustCommentBlockDocNestError matchgroup=rustCommentBlockDocError star
 " then you must deal with cases like ``/*/**/*/``. And don't try making it
 " worse with ``\%(/\@<!\*\)\@<!``, either...
 
-syn keyword rustTodo contained TODO FIXME XXX NB NOTE
+syn keyword rustTodo contained TODO FIXME XXX NB NOTE SAFETY
 
 " asm! macro {{{2
 syn region rustAsmMacro matchgroup=rustMacro start="\<asm!\s*(" end=")" contains=rustAsmDirSpec,rustAsmSym,rustAsmConst,rustAsmOptionsGroup,rustComment.*,rustString.*

syntax/tads.vim

@@ -0,0 +1,175 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'tads') == -1
+
+" Vim syntax file
+" Language:	TADS
+" Maintainer:	Amir Karger <karger@post.harvard.edu>
+" $Date: 2004/06/13 19:28:45 $
+" $Revision: 1.1 $
+" Stolen from: Bram Moolenaar's C language file
+" Newest version at: http://www.hec.utah.edu/~karger/vim/syntax/tads.vim
+" History info at the bottom of the file
+
+" TODO lots more keywords
+" global, self, etc. are special *objects*, not functions. They should
+" probably be a different color than the special functions
+" Actually, should cvtstr etc. be functions?! (change tadsFunction)
+" Make global etc. into Identifiers, since we don't have regular variables?
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+" A bunch of useful keywords
+syn keyword tadsStatement	goto break return continue pass
+syn keyword tadsLabel		case default
+syn keyword tadsConditional	if else switch
+syn keyword tadsRepeat		while for do
+syn keyword tadsStorageClass	local compoundWord formatstring specialWords
+syn keyword tadsBoolean		nil true
+
+" TADS keywords
+syn keyword tadsKeyword		replace modify
+syn keyword tadsKeyword		global self inherited
+" builtin functions
+syn keyword tadsKeyword		cvtstr cvtnum caps lower upper substr
+syn keyword tadsKeyword		say length
+syn keyword tadsKeyword		setit setscore
+syn keyword tadsKeyword		datatype proptype
+syn keyword tadsKeyword		car cdr
+syn keyword tadsKeyword		defined isclass
+syn keyword tadsKeyword		find firstobj nextobj
+syn keyword tadsKeyword		getarg argcount
+syn keyword tadsKeyword		input yorn askfile
+syn keyword tadsKeyword		rand randomize
+syn keyword tadsKeyword		restart restore quit save undo
+syn keyword tadsException	abort exit exitobj
+
+syn keyword tadsTodo contained	TODO FIXME XXX
+
+" String and Character constants
+" Highlight special characters (those which have a backslash) differently
+syn match tadsSpecial contained	"\\."
+syn region tadsDoubleString		start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=tadsSpecial,tadsEmbedded
+syn region tadsSingleString		start=+'+ skip=+\\\\\|\\'+ end=+'+ contains=tadsSpecial
+" Embedded expressions in strings
+syn region tadsEmbedded contained       start="<<" end=">>" contains=tadsKeyword
+
+" TADS doesn't have \xxx, right?
+"syn match cSpecial contained	"\\[0-7][0-7][0-7]\=\|\\."
+"syn match cSpecialCharacter	"'\\[0-7][0-7]'"
+"syn match cSpecialCharacter	"'\\[0-7][0-7][0-7]'"
+
+"catch errors caused by wrong parenthesis
+"syn region cParen		transparent start='(' end=')' contains=ALLBUT,cParenError,cIncluded,cSpecial,cTodo,cUserCont,cUserLabel
+"syn match cParenError		")"
+"syn match cInParen contained	"[{}]"
+syn region tadsBrace		transparent start='{' end='}' contains=ALLBUT,tadsBraceError,tadsIncluded,tadsSpecial,tadsTodo
+syn match tadsBraceError		"}"
+
+"integer number (TADS has no floating point numbers)
+syn case ignore
+syn match tadsNumber		"\<[0-9]\+\>"
+"hex number
+syn match tadsNumber		"\<0x[0-9a-f]\+\>"
+syn match tadsIdentifier	"\<[a-z][a-z0-9_$]*\>"
+syn case match
+" flag an octal number with wrong digits
+syn match tadsOctalError		"\<0[0-7]*[89]"
+
+" Removed complicated c_comment_strings
+syn region tadsComment		start="/\*" end="\*/" contains=tadsTodo
+syn match tadsComment		"//.*" contains=tadsTodo
+syntax match tadsCommentError	"\*/"
+
+syn region tadsPreCondit	start="^\s*#\s*\(if\>\|ifdef\>\|ifndef\>\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=tadsComment,tadsString,tadsNumber,tadsCommentError
+syn region tadsIncluded contained start=+"+ skip=+\\\\\|\\"+ end=+"+
+syn match tadsIncluded contained "<[^>]*>"
+syn match tadsInclude		"^\s*#\s*include\>\s*["<]" contains=tadsIncluded
+syn region tadsDefine		start="^\s*#\s*\(define\>\|undef\>\)" skip="\\$" end="$" contains=ALLBUT,tadsPreCondit,tadsIncluded,tadsInclude,tadsDefine,tadsInBrace,tadsIdentifier
+
+syn region tadsPreProc start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" contains=ALLBUT,tadsPreCondit,tadsIncluded,tadsInclude,tadsDefine,tadsInParen,tadsIdentifier
+
+" Highlight User Labels
+" TODO labels for gotos?
+"syn region	cMulti		transparent start='?' end=':' contains=ALLBUT,cIncluded,cSpecial,cTodo,cUserCont,cUserLabel,cBitField
+" Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
+"syn match	cUserCont	"^\s*\I\i*\s*:$" contains=cUserLabel
+"syn match	cUserCont	";\s*\I\i*\s*:$" contains=cUserLabel
+"syn match	cUserCont	"^\s*\I\i*\s*:[^:]" contains=cUserLabel
+"syn match	cUserCont	";\s*\I\i*\s*:[^:]" contains=cUserLabel
+
+"syn match	cUserLabel	"\I\i*" contained
+
+" identifier: class-name [, class-name [...]] [property-list] ;
+" Don't highlight comment in class def
+syn match tadsClassDef		"\<class\>[^/]*" contains=tadsObjectDef,tadsClass
+syn match tadsClass contained   "\<class\>"
+syn match tadsObjectDef "\<[a-zA-Z][a-zA-Z0-9_$]*\s*:\s*[a-zA-Z0-9_$]\+\(\s*,\s*[a-zA-Z][a-zA-Z0-9_$]*\)*\(\s*;\)\="
+syn keyword tadsFunction contained function
+syn match tadsFunctionDef	 "\<[a-zA-Z][a-zA-Z0-9_$]*\s*:\s*function[^{]*" contains=tadsFunction
+"syn region tadsObject		  transparent start = '[a-zA-Z][\i$]\s*:\s*' end=";" contains=tadsBrace,tadsObjectDef
+
+" How far back do we go to find matching groups
+if !exists("tads_minlines")
+  let tads_minlines = 15
+endif
+exec "syn sync ccomment tadsComment minlines=" . tads_minlines
+if !exists("tads_sync_dist")
+  let tads_sync_dist = 100
+endif
+execute "syn sync maxlines=" . tads_sync_dist
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+" The default methods for highlighting.  Can be overridden later
+hi def link tadsFunctionDef Function
+hi def link tadsFunction  Structure
+hi def link tadsClass     Structure
+hi def link tadsClassDef  Identifier
+hi def link tadsObjectDef Identifier
+" no highlight for tadsEmbedded, so it prints as normal text w/in the string
+
+hi def link tadsOperator	Operator
+hi def link tadsStructure	Structure
+hi def link tadsTodo	Todo
+hi def link tadsLabel	Label
+hi def link tadsConditional	Conditional
+hi def link tadsRepeat	Repeat
+hi def link tadsException	Exception
+hi def link tadsStatement	Statement
+hi def link tadsStorageClass	StorageClass
+hi def link tadsKeyWord   Keyword
+hi def link tadsSpecial	SpecialChar
+hi def link tadsNumber	Number
+hi def link tadsBoolean	Boolean
+hi def link tadsDoubleString	tadsString
+hi def link tadsSingleString	tadsString
+
+hi def link tadsOctalError	tadsError
+hi def link tadsCommentError	tadsError
+hi def link tadsBraceError	tadsError
+hi def link tadsInBrace	tadsError
+hi def link tadsError	Error
+
+hi def link tadsInclude	Include
+hi def link tadsPreProc	PreProc
+hi def link tadsDefine	Macro
+hi def link tadsIncluded	tadsString
+hi def link tadsPreCondit	PreCondit
+
+hi def link tadsString	String
+hi def link tadsComment	Comment
+
+
+
+let b:current_syntax = "tads"
+
+" Changes:
+" 11/18/99 Added a bunch of TADS functions, tadsException
+" 10/22/99 Misspelled Moolenaar (sorry!), c_minlines to tads_minlines
+"
+" vim: ts=8
+
+endif

syntax/unison.vim

@@ -97,6 +97,7 @@ endif
 syn match   uLineComment      "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$"
 syn region  uBlockComment     start="{-"  end="-}" contains=uBlockComment
 syn region  uPragma	       start="{-#" end="#-}"
+syn region  uBelowFold	       start="^---" skip="." end="." contains=uBelowFold
 
 " Docs
 syn region  uDocBlock         start="\[:" end=":]" contains=uLink,uDocDirective
@@ -134,6 +135,7 @@ if version >= 508 || !exists("did_u_syntax_inits")
   HiLink uBlockComment		  uComment
   HiLink uLineComment			  uComment
   HiLink uComment			  Comment
+  HiLink uBelowFold			  Comment
   HiLink uDocBlock                String
   HiLink uLink                    uType
   HiLink uDocDirective            uImport
@@ -148,6 +150,7 @@ if version >= 508 || !exists("did_u_syntax_inits")
   delcommand HiLink
 endif
 
+
 let b:current_syntax = "unison"
 
 " Options for vi: ts=8 sw=2 sts=2 nowrap noexpandtab ft=vim

syntax/zig.vim

@@ -60,7 +60,7 @@ syn match zigCharacter /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{6}\)\)'/ contain
 syn region zigBlock start="{" end="}" transparent fold
 
 syn region zigCommentLine start="//" end="$" contains=zigTodo,@Spell
-syn region zigCommentLineDoc start="////\@!" end="$" contains=zigTodo,@Spell
+syn region zigCommentLineDoc start="//[/!]/\@!" end="$" contains=zigTodo,@Spell
 
 " TODO: match only the first '\\' within the zigMultilineString as zigMultilineStringPrefix
 syn match zigMultilineStringPrefix display contained /c\?\\\\/

tests/extensions.vim

@@ -1,12 +1,14 @@
 function! TestExtension(filetype, filename, content)
+  call Log('Detecting ' . a:filetype . ' filetype (' . a:filename . ')...')
+
   try
     let g:message = ""
     exec "noautocmd n " . a:filename
-    put =a:content
+    silent put =a:content
     1delete _
     filetype detect
     exec "if &filetype != '" . a:filetype . "' \nthrow &filetype\nendif"
-    exec ":q!"
+    exec ":bw!"
   catch
     echo g:message
     echo "Filename '" . a:filename  . "' does not resolve to extension '" . a:filetype . "'"
@@ -15,6 +17,12 @@ function! TestExtension(filetype, filename, content)
   endtry
 endfunction
 
+" make sure native vim scripts.vim is respected
+call TestExtension("rib", "renderman", "##RenderMan")
+
+" make sure case of file does matter when recognizing file
+call TestExtension("ruby", "scripts/build", "#!/usr/bin/env ruby")
+
 call TestExtension("sh", "bash1", "#!/bin/bash")
 call TestExtension("sh", "bash2", "#! /bin/bash")
 call TestExtension("sh", "bash3", "#! /bin/bash2.3")
@@ -193,6 +201,13 @@ call TestExtension("cpp", "foobar.moc", "")
 call TestExtension("cpp", "foobar.tcc", "")
 call TestExtension("cpp", "foobar.inl", "")
 
+" Django
+
+call TestExtension("htmldjango", "foobar.j2", "")
+call TestExtension("htmldjango", "foobar.jinja", "")
+call TestExtension("htmldjango", "foobar.jinja2", "")
+call TestExtension("htmldjango", "foobar.njk", "")
+
 " vim-polyglot only
 call TestExtension("blade", "test.blade.php", "")
 call TestExtension("yaml.ansible", "playbook.yml", "")
@@ -279,3 +294,80 @@ call TestExtension("c", "foo.h", "")
 unlet g:c_syntax_for_h
 let g:ch_syntax_for_h = 1
 call TestExtension("ch", "foo.h", "")
+
+" perl
+call TestExtension("perl", "empty.plx", "")
+call TestExtension("perl", "empty.al", "")
+call TestExtension("perl", "empty.psgi", "")
+call TestExtension("pod", "empty.pod", "")
+
+" raku
+call TestExtension("raku", "empty.p6", "")
+call TestExtension("raku", "empty.pm6", "")
+call TestExtension("raku", "empty.pl6", "")
+call TestExtension("raku", "empty.raku", "")
+call TestExtension("raku", "empty.rakumod", "")
+call TestExtension("raku", "empty.pod6", "")
+call TestExtension("raku", "empty.rakudoc", "")
+call TestExtension("raku", "empty.rakutest", "")
+call TestExtension("raku", "empty.t6", "")
+
+
+" .pm extension
+call TestExtension("perl", "empty.pm", "")
+call TestExtension("perl", "strict.pm", " use strict hello;")
+call TestExtension("perl", "use5.pm", " use 5;")
+call TestExtension("perl", "usev5.pm", " use v5;")
+call TestExtension("raku", "script.pm", "#!/usr/bin/env perl6\nprint('Hello world')")
+call TestExtension("raku", "class.pm", " class Class {}")
+call TestExtension("raku", "module.pm", " module foobar")
+call TestExtension("xpm", "xpm.pm", "/* XPM */")
+call TestExtension("xpm2", "xpm2.pm", "/* XPM2 */")
+let g:filetype_pm = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.pm", "")
+
+" .pl extension
+call TestExtension("perl", "empty.pl", "")
+call TestExtension("prolog", "comment.pl", "% hello world")
+call TestExtension("prolog", "comment2.pl", "/* hello world */")
+call TestExtension("prolog", "statement.pl", "happy(vincent). ")
+call TestExtension("prolog", "statement2.pl", "nearbychk(X,Y) :- Y is X-1.")
+call TestExtension("perl", "strict.pl", " use strict hello;")
+call TestExtension("perl", "use5.pl", " use 5;")
+call TestExtension("perl", "usev5.pl", " use v5;")
+call TestExtension("raku", "script.pl", "#!/usr/bin/env perl6\nprint('Hello world')")
+call TestExtension("raku", "class.pl", " class Class {}")
+call TestExtension("raku", "module.pl", " module foobar")
+let g:filetype_pl = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.pl", "")
+
+" .t extension
+call TestExtension("perl", "empty.t", "")
+call TestExtension("perl", "strict.t", " use strict hello;")
+call TestExtension("perl", "use5.t", " use 5;")
+call TestExtension("perl", "usev5.t", " use v5;")
+call TestExtension("raku", "script.t", "#!/usr/bin/env perl6\nprint('Hello world')")
+call TestExtension("raku", "class.t", " class Class {}")
+call TestExtension("raku", "module.t", " module foobar")
+call TestExtension("nroff", "module.t", ".nf\n101 Main Street")
+let g:filetype_t = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.t", "")
+
+" .tt2 extension
+call TestExtension("tt2", "empty.tt2", "")
+call TestExtension("tt2html", "doctype.tt2", "<!DOCTYPE HTML>")
+call TestExtension("tt2html", "percent.tt2", "<%filter>")
+call TestExtension("tt2html", "html.tt2", "<html>")
+
+" .html extension
+call TestExtension("html", "empty.html", "")
+call TestExtension("mason", "mason1.html", "% my $planet = 42;")
+call TestExtension("mason", "mason2.html", "<%filter></%filter>")
+call TestExtension("htmldjango", "jinja1.html", "{{ item.href }}")
+call TestExtension("htmldjango", "jinja2.html", "{% for item in navigation %}{% endfor %}")
+call TestExtension("htmldjango", "jinja3.html", "{% block head %}")
+call TestExtension("htmldjango", "jinja4.html", "{# some comment #}")
+call TestExtension("xhtml", "xhtml.html", "<DTD   XHTML ")
+
+" .gitignore
+call TestExtension("gitignore", ".gitignore", "")

tests/filetypes.vim

@@ -1,16 +1,12 @@
 function! TestFiletype(filetype)
-  try
-    enew
-    exec 'set ft=' . a:filetype
-  catch
-    echo 'Error loading filetype ' . a:filetype  . ':'
-    echo v:exception
-    echo v:throwpoint
-    exec ':cq!'
-  endtry
+  call Log('Loading ' . a:filetype . ' filetype...')
+
+  enew
+  exec 'set ft=' . a:filetype
 endfunction
 
 call TestFiletype('8th')
+call TestFiletype('haproxy')
 call TestFiletype('a2ps')
 call TestFiletype('a65')
 call TestFiletype('aap')
@@ -26,16 +22,20 @@ call TestFiletype('aidl')
 call TestFiletype('alsaconf')
 call TestFiletype('aml')
 call TestFiletype('ampl')
+call TestFiletype('xml')
 call TestFiletype('ant')
 call TestFiletype('apache')
 call TestFiletype('apiblueprint')
 call TestFiletype('applescript')
 call TestFiletype('aptconf')
 call TestFiletype('arch')
+call TestFiletype('cpp')
+call TestFiletype('c')
 call TestFiletype('arduino')
 call TestFiletype('art')
 call TestFiletype('asciidoc')
 call TestFiletype('autohotkey')
+call TestFiletype('elf')
 call TestFiletype('automake')
 call TestFiletype('asn')
 call TestFiletype('aspvbs')
@@ -44,9 +44,6 @@ call TestFiletype('atlas')
 call TestFiletype('autoit')
 call TestFiletype('ave')
 call TestFiletype('awk')
-call TestFiletype('reason')
-call TestFiletype('cpp')
-call TestFiletype('c')
 call TestFiletype('caddyfile')
 call TestFiletype('carp')
 call TestFiletype('clojure')
@@ -61,7 +58,6 @@ call TestFiletype('cucumber')
 call TestFiletype('cuesheet')
 call TestFiletype('dart')
 call TestFiletype('dhall')
-call TestFiletype('grub')
 call TestFiletype('d')
 call TestFiletype('dcov')
 call TestFiletype('dd')
@@ -69,7 +65,6 @@ call TestFiletype('ddoc')
 call TestFiletype('dsdl')
 call TestFiletype('Dockerfile')
 call TestFiletype('yaml.docker-compose')
-call TestFiletype('elf')
 call TestFiletype('elixir')
 call TestFiletype('eelixir')
 call TestFiletype('elm')
@@ -81,23 +76,27 @@ call TestFiletype('ferm')
 call TestFiletype('fish')
 call TestFiletype('fbs')
 call TestFiletype('forth')
+call TestFiletype('glsl')
 call TestFiletype('fsharp')
 call TestFiletype('gdscript3')
 call TestFiletype('gitconfig')
 call TestFiletype('gitrebase')
 call TestFiletype('gitsendemail')
 call TestFiletype('gitcommit')
-call TestFiletype('glsl')
 call TestFiletype('gmpl')
 call TestFiletype('gnuplot')
 call TestFiletype('go')
 call TestFiletype('gomod')
 call TestFiletype('gohtmltmpl')
+call TestFiletype('javascript')
+call TestFiletype('flow')
+call TestFiletype('javascriptreact')
 call TestFiletype('graphql')
 call TestFiletype('groovy')
+call TestFiletype('grub')
 call TestFiletype('haml')
-call TestFiletype('mustache')
-call TestFiletype('haproxy')
+call TestFiletype('html.mustache')
+call TestFiletype('html.handlebars')
 call TestFiletype('haskell')
 call TestFiletype('haxe')
 call TestFiletype('hcl')
@@ -109,11 +108,8 @@ call TestFiletype('idris')
 call TestFiletype('idris2')
 call TestFiletype('lidris2')
 call TestFiletype('ion')
-call TestFiletype('javascriptreact')
-call TestFiletype('javascript')
-call TestFiletype('flow')
 call TestFiletype('Jenkinsfile')
-call TestFiletype('jinja.html')
+call TestFiletype('htmldjango')
 call TestFiletype('jq')
 call TestFiletype('json5')
 call TestFiletype('json')
@@ -131,7 +127,6 @@ call TestFiletype('log')
 call TestFiletype('lua')
 call TestFiletype('m4')
 call TestFiletype('mako')
-call TestFiletype('octave')
 call TestFiletype('mma')
 call TestFiletype('markdown')
 call TestFiletype('markdown.mdx')
@@ -152,12 +147,18 @@ call TestFiletype('ocamlbuild_tags')
 call TestFiletype('ocpbuild')
 call TestFiletype('ocpbuildroot')
 call TestFiletype('sexplib')
+call TestFiletype('octave')
 call TestFiletype('opencl')
 call TestFiletype('perl')
+call TestFiletype('pod')
+call TestFiletype('mason')
+call TestFiletype('tt2')
+call TestFiletype('tt2html')
+call TestFiletype('xs')
 call TestFiletype('sql')
 call TestFiletype('cql')
-call TestFiletype('blade')
 call TestFiletype('php')
+call TestFiletype('blade')
 call TestFiletype('plantuml')
 call TestFiletype('pony')
 call TestFiletype('ps1')
@@ -178,6 +179,7 @@ call TestFiletype('ragel')
 call TestFiletype('raku')
 call TestFiletype('raml')
 call TestFiletype('razor')
+call TestFiletype('reason')
 call TestFiletype('rst')
 call TestFiletype('ruby')
 call TestFiletype('eruby')
@@ -218,10 +220,9 @@ call TestFiletype('velocity')
 call TestFiletype('vmasm')
 call TestFiletype('vue')
 call TestFiletype('xdc')
-call TestFiletype('xml')
 call TestFiletype('xsl')
-call TestFiletype('yaml.ansible')
 call TestFiletype('yaml')
+call TestFiletype('yaml.ansible')
 call TestFiletype('helm')
 call TestFiletype('help')
 call TestFiletype('zephir')
@@ -231,3 +232,8 @@ call TestFiletype('trasys')
 call TestFiletype('basic')
 call TestFiletype('vb')
 call TestFiletype('dosini')
+call TestFiletype('odin')
+call TestFiletype('bzl')
+call TestFiletype('prolog')
+call TestFiletype('tads')
+call TestFiletype('gitignore')

tests/indent/2.1/test.js

@@ -0,0 +1,10 @@
+// File with 2-spaces indentation
+function foobar() {
+  foo = bar
+  while (true) {
+    fizfuz()
+    fizfuz()
+    fizfuz()
+    fizfuz()
+  }
+}

tests/indent/4.1/test.js

@@ -0,0 +1,10 @@
+// File with 4-spaces indentation
+function foobar() {
+    foo = bar
+    while (true) {
+        fizfuz()
+        fizfuz()
+        fizfuz()
+        fizfuz()
+    }
+}