Update

README.md

@@ -1,4 +1,4 @@
-# vim-polyglot [![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg?maxAge=2592000)]()
+# vim-polyglot [![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2016.svg?maxAge=2592000)]()
 
 [travis-img-url]: https://travis-ci.org/sheerun/vim-polyglot.svg
 [travis-url]: https://travis-ci.org/sheerun/vim-polyglot
@@ -8,13 +8,13 @@ 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 100+ times faster** than 100+ packages it consists of.
-- Solid syntax and indentation support (other features skipped). Only the best language packs.
+- It **installs and updates 70+ times faster** than 70+ packages it consist of.
+- Solid syntax and indentation support. Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
 - No support for esoteric languages, only most popular ones (modern too, like `slim`).
 - Each build is tested by automated vimrunner script on CI. See `spec` directory.
 
-\*To be completely honest, concatenated `ftdetect` script takes up to `17ms` to load.
+\*To be completely honest, concatenated `ftdetect` script takes around `3ms` to load.
 
 ## Installation
 
@@ -23,127 +23,94 @@ A collection of language packs for Vim.
 
 Optionally download one of the [releases](https://github.com/sheerun/vim-polyglot/releases) and unpack it directly under `~/.vim` directory.
 
-You can also use Vim 8 built-in package manager:
-
-```
-mkdir -p ~/.vim/pack/default/start
-git clone https://github.com/sheerun/vim-polyglot ~/.vim/pack/default/start/vim-polyglot
-```
-
-NOTE: Not all features of listed language packs are available. We strip them from functionality slowing vim startup in general (for example we ignore `plugins` folder that is loaded regardless of file type, use `ftplugin` instead).
-
-If you need full functionality of any plugin, please use it directly with your plugin manager.
-
 ## Language packs
 
-- [ansible](https://github.com/pearofducks/ansible-vim) (syntax, indent, ftplugin)
-- [apiblueprint](https://github.com/sheerun/apiblueprint.vim) (syntax)
 - [applescript](https://github.com/vim-scripts/applescript.vim) (syntax)
-- [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, indent)
-- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (syntax)
-- [autohotkey](https://github.com/hnamikaw/vim-autohotkey) (indent)
-- [blade](https://github.com/jwalton512/vim-blade) (syntax, indent, ftplugin)
+- [ansible](https://github.com/pearofducks/ansible-vim) (syntax, indent, ftplugin, ftdetect)
+- [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, indent, ftdetect)
+- [blade](https://github.com/jwalton512/vim-blade) (syntax, indent, ftplugin, ftdetect)
 - [c++11](https://github.com/octol/vim-cpp-enhanced-highlight) (syntax)
 - [c/c++](https://github.com/vim-jp/vim-cpp) (syntax)
-- [caddyfile](https://github.com/isobit/vim-caddyfile) (syntax, indent, ftplugin)
-- [carp](https://github.com/hellerve/carp-vim) (syntax)
-- [cjsx](https://github.com/mtscout6/vim-cjsx) (syntax, ftplugin)
-- [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin)
-- [cmake](https://github.com/pboettch/vim-cmake-syntax) (syntax, indent)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin)
-- [cql](https://github.com/elubow/cql-vim) (syntax)
-- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (syntax, compiler, ftplugin)
-- [crystal](https://github.com/rhysd/vim-crystal) (syntax, indent, autoload, ftplugin)
-- [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin)
-- [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin)
-- [dockerfile](https://github.com/docker/docker) (syntax)
-- [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, autoload, ftplugin)
-- [elm](https://github.com/ElmCast/elm-vim) (syntax, indent, autoload, ftplugin)
-- [emberscript](https://github.com/yalesov/vim-ember-script) (syntax, indent, ftplugin)
-- [emblem](https://github.com/yalesov/vim-emblem) (syntax, indent, ftplugin)
-- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (syntax, indent)
-- [fish](https://github.com/dag/vim-fish) (syntax, indent, compiler, autoload, ftplugin)
-- [fsharp](https://github.com/fsharp/vim-fsharp) (syntax, indent)
-- [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin)
-- [glsl](https://github.com/tikhomirov/vim-glsl) (syntax, indent)
-- [gmpl](https://github.com/maelvalais/gmpl.vim) (syntax)
-- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (syntax)
-- [go](https://github.com/fatih/vim-go) (syntax, compiler, indent)
+- [cjsx](https://github.com/mtscout6/vim-cjsx) (ftdetect, syntax, ftplugin)
+- [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin, ftdetect)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (syntax, compiler, ftplugin, ftdetect)
+- [crystal](https://github.com/rhysd/vim-crystal) (syntax, indent, autoload, ftplugin, ftdetect)
+- [cql](https://github.com/elubow/cql-vim) (syntax, ftdetect)
+- [css](https://github.com/JulesWang/css.vim) (syntax)
+- [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin, ftdetect)
+- [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin, ftdetect)
+- [dockerfile](https://github.com/honza/dockerfile.vim) (syntax, ftdetect)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, ftplugin, ftdetect)
+- [elm](https://github.com/lambdatoast/elm.vim) (syntax, indent, autoload, ftplugin, ftdetect)
+- [emberscript](https://github.com/yalesov/vim-ember-script) (syntax, indent, ftplugin, ftdetect)
+- [emblem](https://github.com/yalesov/vim-emblem) (syntax, indent, ftplugin, ftdetect)
+- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (syntax, indent, ftdetect)
+- [fish](https://github.com/dag/vim-fish) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin, ftdetect)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (syntax, indent, ftdetect)
+- [go](https://github.com/fatih/vim-go) (syntax, compiler, indent, ftdetect)
 - [groovy](https://github.com/vim-scripts/groovy.vim) (syntax)
-- [haml](https://github.com/sheerun/vim-haml) (syntax, indent, compiler, ftplugin)
-- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (syntax, indent, ftplugin)
-- [haskell](https://github.com/neovimhaskell/haskell-vim) (syntax, indent, ftplugin)
-- [haxe](https://github.com/yaymukund/vim-haxe) (syntax)
+- [haml](https://github.com/tpope/vim-haml) (syntax, indent, compiler, ftplugin, ftdetect)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (syntax, indent, ftplugin, ftdetect)
+- [haskell](https://github.com/neovimhaskell/haskell-vim) (syntax, indent, ftplugin, ftdetect)
+- [haxe](https://github.com/yaymukund/vim-haxe) (syntax, ftdetect)
 - [html5](https://github.com/othree/html5.vim) (syntax, indent, autoload, ftplugin)
-- [i3](https://github.com/PotatoesMaster/i3-vim-syntax) (syntax, ftplugin)
-- [jasmine](https://github.com/glanotte/vim-jasmine) (syntax)
-- [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, compiler, ftplugin, extras)
-- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (syntax, indent)
-- [json5](https://github.com/GutenYe/json5.vim) (syntax)
-- [json](https://github.com/elzr/vim-json) (syntax, indent, ftplugin)
-- [jst](https://github.com/briancollins/vim-jst) (syntax, indent)
-- [jsx](https://github.com/mxw/vim-jsx) (after)
-- [julia](https://github.com/JuliaEditorSupport/julia-vim) (syntax, indent, autoload, ftplugin)
-- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent)
+- [jasmine](https://github.com/glanotte/vim-jasmine) (syntax, ftdetect)
+- [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, ftdetect, ftplugin, extras)
+- [json](https://github.com/elzr/vim-json) (syntax, indent, ftplugin, ftdetect)
+- [jst](https://github.com/briancollins/vim-jst) (syntax, indent, ftdetect)
+- [jsx](https://github.com/mxw/vim-jsx) (ftdetect, after)
+- [julia](https://github.com/dcjones/julia-minimalist-vim) (syntax, indent, ftdetect)
+- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent, ftdetect)
 - [latex](https://github.com/LaTeX-Box-Team/LaTeX-Box) (syntax, indent, ftplugin)
-- [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin)
-- [liquid](https://github.com/tpope/vim-liquid) (syntax, indent, ftplugin)
-- [livescript](https://github.com/gkz/vim-ls) (syntax, indent, compiler, ftplugin)
+- [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin, ftdetect)
+- [liquid](https://github.com/tpope/vim-liquid) (syntax, indent, ftplugin, ftdetect)
+- [livescript](https://github.com/gkz/vim-ls) (syntax, indent, compiler, ftplugin, ftdetect)
 - [lua](https://github.com/tbastos/vim-lua) (syntax, indent)
-- [mako](https://github.com/sophacles/vim-bundle-mako) (syntax, indent, ftplugin)
-- [markdown](https://github.com/plasticboy/vim-markdown) (syntax)
-- [mathematica](https://github.com/rsmenon/vim-mathematica) (syntax, ftplugin)
-- [nginx](https://github.com/chr4/nginx.vim) (syntax, indent, ftplugin)
-- [nim](https://github.com/zah/nim.vim) (syntax, compiler, indent)
-- [nix](https://github.com/LnL7/vim-nix) (syntax, indent, ftplugin)
+- [mako](https://github.com/sophacles/vim-bundle-mako) (syntax, indent, ftplugin, ftdetect)
+- [markdown](https://github.com/plasticboy/vim-markdown) (syntax, ftdetect)
+- [nginx](https://github.com/othree/nginx-contrib-vim) (syntax, indent, ftdetect)
+- [nim](https://github.com/zah/nim.vim) (syntax, compiler, indent, ftdetect)
+- [nix](https://github.com/spwhitt/vim-nix) (syntax, ftplugin, ftdetect)
 - [objc](https://github.com/b4winckler/vim-objc) (ftplugin, syntax, indent)
 - [ocaml](https://github.com/jrk/vim-ocaml) (syntax, indent, ftplugin)
 - [octave](https://github.com/vim-scripts/octave.vim--) (syntax)
-- [opencl](https://github.com/petRUShka/vim-opencl) (syntax, indent, ftplugin)
-- [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin)
-- [pgsql](https://github.com/exu/pgsql.vim) (syntax)
+- [opencl](https://github.com/petRUShka/vim-opencl) (syntax, indent, ftplugin, ftdetect)
+- [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin, ftdetect)
+- [pgsql](https://github.com/exu/pgsql.vim) (syntax, ftdetect)
 - [php](https://github.com/StanAngeloff/php.vim) (syntax)
-- [plantuml](https://github.com/aklt/plantuml-syntax) (syntax, indent, ftplugin)
-- [powershell](https://github.com/PProvost/vim-ps1) (syntax, indent, ftplugin)
-- [protobuf](https://github.com/uarun/vim-protobuf) (syntax, indent)
-- [pug](https://github.com/digitaltoad/vim-pug) (syntax, indent, ftplugin)
-- [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin)
-- [purescript](https://github.com/purescript-contrib/purescript-vim) (syntax, indent, ftplugin)
-- [python-compiler](https://github.com/aliev/vim-compiler-python) (compiler, autoload)
-- [python-ident](https://github.com/Vimjas/vim-python-pep8-indent) (indent)
-- [python](https://github.com/vim-python/python-syntax) (syntax)
-- [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin)
+- [plantuml](https://github.com/aklt/plantuml-syntax) (syntax, ftplugin, ftdetect)
+- [powershell](https://github.com/Persistent13/vim-ps1) (syntax, indent, ftplugin, ftdetect)
+- [protobuf](https://github.com/uarun/vim-protobuf) (syntax, indent, ftdetect)
+- [pug](https://github.com/digitaltoad/vim-pug) (syntax, indent, ftplugin, ftdetect)
+- [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin, ftdetect)
+- [purescript](https://github.com/raichoo/purescript-vim) (syntax, indent, ftdetect)
+- [python](https://github.com/mitsuhiko/vim-python-combined) (syntax, indent)
+- [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin, ftdetect)
 - [r-lang](https://github.com/vim-scripts/R.vim) (syntax, ftplugin)
-- [racket](https://github.com/wlangstroth/vim-racket) (syntax, indent, autoload, ftplugin)
 - [ragel](https://github.com/jneen/ragel.vim) (syntax)
-- [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin)
-- [rspec](https://github.com/sheerun/rspec.vim) (syntax)
-- [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin)
-- [rust](https://github.com/rust-lang/rust.vim) (syntax, indent, compiler, autoload, ftplugin)
-- [sbt](https://github.com/derekwyatt/vim-sbt) (syntax)
-- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin)
-- [scss](https://github.com/cakebaker/scss-syntax.vim) (syntax, autoload, ftplugin)
-- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin)
-- [slime](https://github.com/slime-lang/vim-slime-syntax) (syntax, indent)
-- [solidity](https://github.com/tomlion/vim-solidity) (syntax, indent, ftplugin)
-- [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin)
-- [swift](https://github.com/keith/swift.vim) (syntax, indent, ftplugin)
-- [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (syntax)
-- [systemd](https://github.com/kurayama/systemd-vim-syntax) (syntax)
-- [terraform](https://github.com/hashivim/vim-terraform) (syntax, indent, ftplugin)
-- [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin)
-- [thrift](https://github.com/solarnz/thrift.vim) (syntax)
-- [tmux](https://github.com/keith/tmux.vim) (syntax, ftplugin)
+- [rspec](https://github.com/sheerun/rspec.vim) (syntax, ftdetect)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [rust](https://github.com/rust-lang/rust.vim) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [sbt](https://github.com/derekwyatt/vim-sbt) (syntax, ftdetect)
+- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin, ftdetect)
+- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin, ftdetect)
+- [solidity](https://github.com/ethereum/vim-solidity) (syntax, indent, ftdetect)
+- [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin, ftdetect)
+- [swift](https://github.com/keith/swift.vim) (syntax, indent, ftplugin, ftdetect)
+- [systemd](https://github.com/kurayama/systemd-vim-syntax) (syntax, ftdetect)
+- [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin, ftdetect)
+- [thrift](https://github.com/solarnz/thrift.vim) (syntax, ftdetect)
+- [tmux](https://github.com/keith/tmux.vim) (syntax, ftplugin, ftdetect)
 - [tomdoc](https://github.com/wellbredgrapefruit/tomdoc.vim) (syntax)
-- [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin)
-- [twig](https://github.com/lumiliet/vim-twig) (syntax, indent, ftplugin)
-- [typescript](https://github.com/leafgarland/typescript-vim) (syntax, indent, compiler, ftplugin)
-- [vala](https://github.com/arrufat/vala.vim) (syntax, indent)
+- [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin, ftdetect)
+- [twig](https://github.com/evidens/vim-twig) (syntax, ftplugin)
+- [typescript](https://github.com/leafgarland/typescript-vim) (syntax, indent, compiler, ftplugin, ftdetect)
+- [vala](https://github.com/tkztmk/vim-vala) (syntax, indent, ftdetect)
 - [vbnet](https://github.com/vim-scripts/vbnet.vim) (syntax)
-- [vcl](https://github.com/smerrill/vcl-vim-plugin) (syntax)
-- [vifm](https://github.com/vifm/vifm.vim) (syntax, autoload, ftplugin)
-- [vm](https://github.com/lepture/vim-velocity) (syntax, indent)
-- [vue](https://github.com/posva/vim-vue) (syntax, indent, ftplugin)
+- [vcl](https://github.com/smerrill/vcl-vim-plugin) (syntax, ftdetect)
+- [vm](https://github.com/lepture/vim-velocity) (syntax, indent, ftdetect)
 - [xls](https://github.com/vim-scripts/XSLT-syntax) (syntax)
 - [yaml](https://github.com/stephpy/vim-yaml) (syntax, ftplugin)
 - [yard](https://github.com/sheerun/vim-yardoc) (syntax)

after/ftplugin/javascript.vim

@@ -7,10 +7,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') ==
 
 setlocal iskeyword+=$ suffixesadd+=.js
 
-if exists('b:undo_ftplugin')
-  let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
-else
-  let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
-endif
+let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
 
 endif

after/ftplugin/jsx.vim

@@ -12,7 +12,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
+        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
 endif
 
 setlocal suffixesadd+=.jsx

after/ftplugin/terraform.vim

@@ -1,78 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-  
-if !exists('g:terraform_align')
-  let g:terraform_align = 0
-endif
-
-if !exists('g:terraform_remap_spacebar')
-  let g:terraform_remap_spacebar = 0
-endif
-
-if !exists('g:terraform_fold_sections')
-  let g:terraform_fold_sections = 0
-endif
-
-if g:terraform_align && exists(':Tabularize')
-  inoremap <buffer> <silent> = =<Esc>:call <SID>terraformalign()<CR>a
-  function! s:terraformalign()
-    let p = '^.*=[^>]*$'
-    if exists(':Tabularize') && getline('.') =~# '^.*=' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
-      let column = strlen(substitute(getline('.')[0:col('.')],'[^=]','','g'))
-      let position = strlen(matchstr(getline('.')[0:col('.')],'.*=\s*\zs.*'))
-      Tabularize/=/l1
-      normal! 0
-      call search(repeat('[^=]*=',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
-    endif
-  endfunction
-endif
-
-if g:terraform_fold_sections
-  function! TerraformFolds()
-    let thisline = getline(v:lnum)
-    if match(thisline, '^resource') >= 0
-      return ">1"
-    elseif match(thisline, '^provider') >= 0
-      return ">1"
-    elseif match(thisline, '^module') >= 0
-      return ">1"
-    elseif match(thisline, '^variable') >= 0
-      return ">1"
-    elseif match(thisline, '^output') >= 0
-      return ">1"
-    elseif match(thisline, '^data') >= 0
-      return ">1"
-    elseif match(thisline, '^terraform') >= 0
-      return ">1"
-    elseif match(thisline, '^locals') >= 0
-      return ">1"
-    else
-      return "="
-    endif
-  endfunction
-  setlocal foldmethod=expr
-  setlocal foldexpr=TerraformFolds()
-  setlocal foldlevel=1
-
-  function! TerraformFoldText()
-    let foldsize = (v:foldend-v:foldstart)
-    return getline(v:foldstart).' ('.foldsize.' lines)'
-  endfunction
-  setlocal foldtext=TerraformFoldText()
-endif
-
-" Re-map the space bar to fold and unfold
-if get(g:, "terraform_remap_spacebar", 1)
-  "inoremap <space> <C-O>za
-  nnoremap <space> za
-  onoremap <space> <C-C>za
-  vnoremap <space> zf
-endif
-
-" Match the identation put in place by Hashicorp and :TerraformFmt, https://github.com/hashivim/vim-terraform/issues/21
-if get(g:, "terraform_align", 1)
-  setlocal tabstop=2
-  setlocal softtabstop=2
-  setlocal shiftwidth=2
-endif
-
-endif

after/indent/html.vim

@@ -20,7 +20,7 @@ setlocal indentexpr=GetCoffeeHtmlIndent(v:lnum)
 
 function! GetCoffeeHtmlIndent(curlinenum)
   " See if we're inside a coffeescript block.
-  let scriptlnum = searchpair('<script [^>]*type=[''"]\?text/coffeescript[''"]\?[^>]*>', '',
+  let scriptlnum = searchpair('<script [^>]*type="text/coffeescript"[^>]*>', '',
   \                           '</script>', 'bWn')
   let prevlnum = prevnonblank(a:curlinenum)
 

after/syntax/c.vim

@@ -20,21 +20,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
 " -----------------------------------------------------------------------------
 "  Highlight function names.
 " -----------------------------------------------------------------------------
-if !exists('g:cpp_no_function_highlight')
-    syn match    cCustomParen    "(" contains=cParen contains=cCppParen
-    syn match    cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
-    hi def link cCustomFunc  Function
-endif
-
-" -----------------------------------------------------------------------------
-"  Highlight member variable names.
-" -----------------------------------------------------------------------------
-if exists('g:cpp_member_variable_highlight') && g:cpp_member_variable_highlight
-    syn match   cCustomDot    "\." contained
-    syn match   cCustomPtr    "->" contained
-    syn match   cCustomMemVar "\(\.\|->\)\w\+" contains=cCustomDot,cCustomPtr
-    hi def link cCustomMemVar Function
-endif
+syn match    cCustomParen    "(" contains=cParen contains=cCppParen
+syn match    cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
+hi def link cCustomFunc  Function
 
 " -----------------------------------------------------------------------------
 "  Source: aftersyntaxc.vim

after/syntax/haml.vim

@@ -5,11 +5,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script')
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
-
-if exists('b:current_syntax')
-  let s:current_syntax_save = b:current_syntax
-endif
-
 " Inherit coffee from html so coffeeComment isn't redefined and given higher
 " priority than hamlInterpolation.
 syn cluster hamlCoffeescript contains=@htmlCoffeeScript
@@ -19,9 +14,4 @@ syn region  hamlCoffeescriptFilter matchgroup=hamlFilter
 \                                  contains=@hamlCoffeeScript,hamlInterpolation
 \                                  keepend
 
-if exists('s:current_syntax_save')
-  let b:current_syntax = s:current_syntax_save
-  unlet s:current_syntax_save
-endif
-
 endif

after/syntax/html.vim

@@ -5,22 +5,13 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script')
 " URL:         http://github.com/kchmck/vim-coffee-script
 " License:     WTFPL
 
-if exists('b:current_syntax')
-  let s:current_syntax_save = b:current_syntax
-endif
-
 " Syntax highlighting for text/coffeescript script tags
 syn include @htmlCoffeeScript syntax/coffee.vim
-syn region coffeeScript start=#<script [^>]*type=['"]\?text/coffeescript['"]\?[^>]*>#
+syn region coffeeScript start=#<script [^>]*type="text/coffeescript"[^>]*>#
 \                       end=#</script>#me=s-1 keepend
 \                       contains=@htmlCoffeeScript,htmlScriptTag,@htmlPreproc
 \                       containedin=htmlHead
 
-if exists('s:current_syntax_save')
-  let b:current_syntax = s:current_syntax_save
-  unlet s:current_syntax_save
-endif
-
 endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
   
@@ -34,22 +25,6 @@ syn region ShaderScript
       \ end="</script>"me=s-1
       \ contains=@GLSL,htmlScriptTag,@htmlPreproc
 
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
-  
-" Vim syntax file
-" Language:     HTML (version 5.1)
-" Last Change:  2017 Feb 15
-" License:      Public domain
-"               (but let me know if you like :) )
-"
-" Maintainer:   Kao, Wei-Ko(othree) ( othree AT gmail DOT com )
-
-" Comment
-" https://github.com/w3c/html/issues/694
-syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
-syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
-
 endif
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
   

after/syntax/jsx.vim

@@ -49,7 +49,7 @@ syn region jsxChild contained start=+{+ end=++ contains=jsBlock,javascriptBlock
 " and generic Flow type annotations (http://flowtype.org/).
 syn region jsxRegion
   \ contains=@Spell,@XMLSyntax,jsxRegion,jsxChild,jsBlock,javascriptBlock
-  \ start=+\%(<\|\w\)\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\>[:,]\@!\)\([^>]*>(\)\@!+
+  \ start=+\%(<\|\w\)\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\)+
   \ skip=+<!--\_.\{-}-->+
   \ end=+</\z1\_\s\{-}>+
   \ end=+/>+

after/syntax/mma.vim

@@ -1,107 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
-  
-"Vim conceal file
-" Language: Mathematica
-" Maintainer: R. Menon <rsmenon@icloud.com>
-" Last Change: Feb 25, 2013
-
-if (exists('g:mma_candy') && g:mma_candy == 0) || !has('conceal') || &enc != 'utf-8'
-    finish
-endif
-
-"These are fairly safe and straightforward conceals
-if exists('g:mma_candy') && g:mma_candy > 0
-	"Rules
-	syntax match mmaOperator "->" conceal cchar=→ "Rule
-	syntax match mmaOperator ":>" conceal cchar=⧴ "RuleDelayed
-
-	"Logicals
-	syntax match mmaOperator "===" conceal cchar=≡ "SameQ
-	syntax match mmaOperator "=!=" conceal cchar=≢ "UnsameQ
-	syntax match mmaOperator "!=" conceal cchar=≠ "NotEqual
-	syntax match mmaOperator "<=" conceal cchar=≤ "LessEqual
-	syntax match mmaOperator ">=" conceal cchar=≥ "GreaterEqual
-
-	"Constants
-	syntax keyword mmaSystemSymbol Pi conceal cchar=π
-	syntax keyword mmaSystemSymbol Infinity conceal cchar=∞
-	syntax keyword mmaSystemSymbol Degree conceal cchar=°
-
-	"Domains
-	syntax keyword mmaSystemSymbol Reals conceal cchar=ℝ
-	syntax keyword mmaSystemSymbol Integers conceal cchar=ℤ
-	syntax keyword mmaSystemSymbol Complexes conceal cchar=ℂ
-	syntax keyword mmaSystemSymbol Rationals conceal cchar=ℚ
-
-	"Greek
-	syntax match mmaSymbol "\\\[CapitalAlpha\]" conceal cchar=Α
-	syntax match mmaSymbol "\\\[CapitalBeta\]" conceal cchar=Β
-	syntax match mmaSymbol "\\\[CapitalGamma\]" conceal cchar=Γ
-	syntax match mmaSymbol "\\\[CapitalDelta\]" conceal cchar=Δ
-	syntax match mmaSymbol "\\\[CapitalEpsilon\]" conceal cchar=Ε
-	syntax match mmaSymbol "\\\[CapitalZeta\]" conceal cchar=Ζ
-	syntax match mmaSymbol "\\\[CapitalEta\]" conceal cchar=Η
-	syntax match mmaSymbol "\\\[CapitalTheta\]" conceal cchar=Θ
-	syntax match mmaSymbol "\\\[CapitalIota\]" conceal cchar=Ι
-	syntax match mmaSymbol "\\\[CapitalKappa\]" conceal cchar=Κ
-	syntax match mmaSymbol "\\\[CapitalLambda\]" conceal cchar=Λ
-	syntax match mmaSymbol "\\\[CapitalMu\]" conceal cchar=Μ
-	syntax match mmaSymbol "\\\[CapitalNu\]" conceal cchar=Ν
-	syntax match mmaSymbol "\\\[CapitalXi\]" conceal cchar=Ξ
-	syntax match mmaSymbol "\\\[CapitalOmicron\]" conceal cchar=Ο
-	syntax match mmaSymbol "\\\[CapitalPi\]" conceal cchar=Π
-	syntax match mmaSymbol "\\\[CapitalRho\]" conceal cchar=Ρ
-	syntax match mmaSymbol "\\\[CapitalSigma\]" conceal cchar=Σ
-	syntax match mmaSymbol "\\\[CapitalTau\]" conceal cchar=Τ
-	syntax match mmaSymbol "\\\[CapitalUpsilon\]" conceal cchar=Υ
-	syntax match mmaSymbol "\\\[CapitalPhi\]" conceal cchar=Φ
-	syntax match mmaSymbol "\\\[CapitalChi\]" conceal cchar=Χ
-	syntax match mmaSymbol "\\\[CapitalPsi\]" conceal cchar=Ψ
-	syntax match mmaSymbol "\\\[CapitalOmega\]" conceal cchar=Ω
-	syntax match mmaSymbol "\\\[Alpha\]" conceal cchar=α
-	syntax match mmaSymbol "\\\[Beta\]" conceal cchar=β
-	syntax match mmaSymbol "\\\[Gamma\]" conceal cchar=γ
-	syntax match mmaSymbol "\\\[Delta\]" conceal cchar=δ
-	syntax match mmaSymbol "\\\[Epsilon\]" conceal cchar=ε
-	syntax match mmaSymbol "\\\[Zeta\]" conceal cchar=ζ
-	syntax match mmaSymbol "\\\[Eta\]" conceal cchar=η
-	syntax match mmaSymbol "\\\[Theta\]" conceal cchar=θ
-	syntax match mmaSymbol "\\\[Iota\]" conceal cchar=ι
-	syntax match mmaSymbol "\\\[Kappa\]" conceal cchar=κ
-	syntax match mmaSymbol "\\\[Lambda\]" conceal cchar=λ
-	syntax match mmaSymbol "\\\[Mu\]" conceal cchar=μ
-	syntax match mmaSymbol "\\\[Nu\]" conceal cchar=ν
-	syntax match mmaSymbol "\\\[Xi\]" conceal cchar=ξ
-	syntax match mmaSymbol "\\\[Omicron\]" conceal cchar=ο
-	syntax match mmaSymbol "\\\[Pi\]" conceal cchar=π
-	syntax match mmaSymbol "\\\[Rho\]" conceal cchar=ρ
-	syntax match mmaSymbol "\\\[Sigma\]" conceal cchar=σ
-	syntax match mmaSymbol "\\\[Tau\]" conceal cchar=τ
-	syntax match mmaSymbol "\\\[Upsilon\]" conceal cchar=υ
-	syntax match mmaSymbol "\\\[Phi\]" conceal cchar=φ
-	syntax match mmaSymbol "\\\[Chi\]" conceal cchar=χ
-	syntax match mmaSymbol "\\\[Psi\]" conceal cchar=ψ
-	syntax match mmaSymbol "\\\[Omega\]" conceal cchar=ω
-endif
-
-"These might be troublesome if the appropriate fonts are missing. Also, they don't
-"look quite as good as the earlier ones, so enable only if the user chooses to
-if exists('g:mma_candy') && g:mma_candy == 2
-	"Constants
-	syntax keyword mmaSystemSymbol I conceal cchar=ⅈ
-	syntax keyword mmaSystemSymbol E conceal cchar=ⅇ
-
-	"Functions
-	syntax keyword mmaSystemSymbol Sum conceal cchar=∑
-	syntax keyword mmaSystemSymbol Product conceal cchar=∏
-	syntax keyword mmaSystemSymbol Sqrt conceal cchar=√
-
-	"Misc
-	syntax match mmaOperator ">>" conceal cchar=» "Put
-	syntax match mmaOperator "<<" conceal cchar=« "Get
-endif
-
-hi! link Conceal Normal
-setlocal conceallevel=2
-
-endif

after/syntax/yaml.vim

@@ -21,12 +21,14 @@ if version < 600
 endif
 syntax clear
 
+syn match yamlDelimiter	"[:,-]"
 syn match yamlBlock "[\[\]\{\}\|\>]"
+syn match yamlOperator "[?^+-]\|=>"
 
 syn region yamlComment	start="\#" end="$"
 syn match yamlIndicator	"#YAML:\S\+"
 
-syn region yamlString	start="\%(^\| \)\zs'" end="'\ze\%( \|$\)" skip="\\'"
+syn region yamlString	start="'" end="'" skip="\\'"
 syn region yamlString	start='"' end='"' skip='\\"' contains=yamlEscape
 syn match  yamlEscape	+\\[abfnrtv'"\\]+ contained
 syn match  yamlEscape	"\\\o\o\=\o\=" contained
@@ -38,12 +40,11 @@ syn keyword yamlConstant NULL Null null NONE None none NIL Nil nil
 syn keyword yamlConstant TRUE True true YES Yes yes ON On on
 syn keyword yamlConstant FALSE False false NO No no OFF Off off
 
-syn match  yamlKey	"^\s*\zs[^ \t\"]\+\ze\s*:"
-syn match  yamlKey	"^\s*-\s*\zs[^ \t\"\']\+\ze\s*:"
+syn match  yamlKey	"\w\+\ze\s*:"
 syn match  yamlAnchor	"&\S\+"
 syn match  yamlAlias	"*\S\+"
 
-" Setup the highlighting links
+" Setupt the hilighting links
 
 hi link yamlConstant Keyword
 hi link yamlIndicator PreCondit
@@ -54,7 +55,10 @@ hi link yamlType	Type
 
 hi link yamlComment	Comment
 hi link yamlBlock	Operator
+hi link yamlOperator	Operator
+hi link yamlDelimiter	Delimiter
 hi link yamlString	String
 hi link yamlEscape	Special
 
+
 endif

autoload/LaTeXtoUnicode.vim

@@ -1,625 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Support for LaTex-to-Unicode conversion as in the Julia REPL "
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-function! s:L2U_Setup()
-
-  call s:L2U_SetupGlobal()
-
-  " Keep track of whether LaTeX-to-Unicode is activated
-  " (used when filetype changes)
-  if !has_key(b:, "l2u_enabled")
-    let b:l2u_enabled = 0
-  endif
-
-  " Did we install the L2U tab mappings?
-  if !has_key(b:, "l2u_tab_set")
-    let b:l2u_tab_set = 0
-  endif
-  if !has_key(b:, "l2u_cmdtab_set")
-    let b:l2u_cmdtab_set = 0
-  endif
-
-  " Did we activate the L2U as-you-type substitutions?
-  if !has_key(b:, "l2u_autosub_set")
-    let b:l2u_autosub_set = 0
-  endif
-
-  " Following are some flags used to pass information between the function which
-  " attempts the LaTeX-to-Unicode completion and the fallback function
-
-  " Was a (possibly partial) completion found?
-  let b:l2u_found_completion = 0
-  " Is the cursor just after a single backslash
-  let b:l2u_singlebslash = 0
-  " Backup value of the completeopt settings
-  " (since we temporarily add the 'longest' setting while
-  "  attempting LaTeX-to-Unicode)
-  let b:l2u_backup_commpleteopt = &completeopt
-  " Are we in the middle of a L2U tab completion?
-  let b:l2u_tab_completing = 0
-  " Are we calling the tab fallback?
-  let b:l2u_in_fallback = 0
-
-endfunction
-
-function! s:L2U_SetupGlobal()
-
-  " Initialization of global and script-local variables
-  " is only performed once
-  if get(g:, "l2u_did_global_setup", 0)
-    return
-  endif
-
-  let g:l2u_did_global_setup = 1
-
-  let g:l2u_symbols_dict = julia_latex_symbols#get_dict()
-
-  call s:L2U_deprecated_options()
-
-  if v:version < 704
-      let g:latex_to_unicode_tab = 0
-      let g:latex_to_unicode_auto = 0
-  endif
-
-  " YouCompleteMe and neocomplcache/neocomplete/deoplete plug-ins do not work well
-  " with LaTeX symbols suggestions
-  if exists("g:loaded_youcompleteme") ||
-        \ exists("g:loaded_neocomplcache") ||
-        \ exists("g:loaded_neocomplete") ||
-        \ exists("g:loaded_deoplete")
-    let g:latex_to_unicode_suggestions = 0
-  endif
-
-  " A hack to forcibly get out of completion mode: feed
-  " this string with feedkeys()
-  if has("win32") || has("win64")
-    if has("gui_running")
-      let s:l2u_esc_sequence = "\u0006"
-    else
-      let s:l2u_esc_sequence = "\u0006\b"
-    endif
-  else
-    let s:l2u_esc_sequence = "\u0091\b"
-  end
-
-  " Trigger for the previous mapping of <Tab>
-  let s:l2u_fallback_trigger = "\u0091L2UFallbackTab"
-
-endfunction
-
-" Each time the filetype changes, we may need to enable or
-" disable the LaTeX-to-Unicode functionality
-function! LaTeXtoUnicode#Refresh()
-
-  call s:L2U_Setup()
-
-  " by default, LaTeX-to-Unicode is only active on julia files
-  let file_types = s:L2U_file_type_regex(get(g:, "latex_to_unicode_file_types", "julia"))
-  let file_types_blacklist = s:L2U_file_type_regex(get(g:, "latex_to_unicode_file_types_blacklist", "$^"))
-
-  if match(&filetype, file_types) < 0 || match(&filetype, file_types_blacklist) >= 0
-    if b:l2u_enabled
-      call LaTeXtoUnicode#Disable()
-    else
-      return
-    endif
-  elseif !b:l2u_enabled
-    call LaTeXtoUnicode#Enable()
-  endif
-
-endfunction
-
-function! LaTeXtoUnicode#Enable()
-
-  if b:l2u_enabled
-    return
-  end
-
-  call s:L2U_ResetLastCompletionInfo()
-
-  let b:l2u_enabled = 1
-
-  " If we're editing the first file upon opening vim, this will only init the
-  " command line mode mapping, and the full initialization will be performed by
-  " the autocmd triggered by InsertEnter, defined in /ftdetect.vim.
-  " Otherwise, if we're opening a file from within a running vim session, this
-  " will actually initialize all the LaTeX-to-Unicode substitutions.
-  call LaTeXtoUnicode#Init()
-
-  return
-
-endfunction
-
-function! LaTeXtoUnicode#Disable()
-  if !b:l2u_enabled
-    return
-  endif
-  let b:l2u_enabled = 0
-  call LaTeXtoUnicode#Init()
-  return
-endfunction
-
-" Translate old options to their new equivalents
-function! s:L2U_deprecated_options()
-  for [new, old] in [["latex_to_unicode_tab",         "julia_latex_to_unicode"],
-                 \   ["latex_to_unicode_auto",        "julia_auto_latex_to_unicode"],
-                 \   ["latex_to_unicode_suggestions", "julia_latex_suggestions_enabled"],
-                 \   ["latex_to_unicode_eager",       "julia_latex_to_unicode_eager"]]
-    if !has_key(g:, new) && has_key(g:, old)
-      exec "let g:" . new . " = g:" . old
-    endif
-  endfor
-endfunction
-
-function! s:L2U_file_type_regex(ft)
-  if type(a:ft) == 3
-    let file_types = "\\%(" . join(a:ft, "\\|") . "\\)"
-  elseif type(a:ft) == 1
-    let file_types = a:ft
-  else
-    echoerr "invalid file_type specification"
-  endif
-  return "^" . file_types . "$"
-endfunction
-
-" Some data used to keep track of the previous completion attempt.
-" Used to detect
-" 1) if we just attempted the same completion, or
-" 2) if backspace was just pressed while completing
-" This function initializes and resets the required info
-
-function! s:L2U_ResetLastCompletionInfo()
-  let b:l2u_completed_once = 0
-  let b:l2u_bs_while_completing = 0
-  let b:l2u_last_compl = {
-        \ 'line': '',
-        \ 'col0': -1,
-        \ 'col1': -1,
-        \ }
-endfunction
-
-" This function only detects whether an exact match is found for a LaTeX
-" symbol in front of the cursor
-function! s:L2U_ismatch()
-  let col1 = col('.')
-  let l = getline('.')
-  let col0 = match(l[0:col1-2], '\\[^[:space:]\\]\+$')
-  if col0 == -1
-    return 0
-  endif
-  let base = l[col0 : col1-1]
-  return has_key(g:l2u_symbols_dict, base)
-endfunction
-
-" Helper function to sort suggestion entries
-function! s:L2U_partmatches_sort(p1, p2)
-  return a:p1.word > a:p2.word ? 1 : a:p1.word < a:p2.word ? -1 : 0
-endfunction
-
-" Helper function to fix display of Unicode compose characters
-" in the suggestions menu (they are displayed on top of '◌')
-function! s:L2U_fix_compose_chars(uni)
-  let u = matchstr(a:uni, '^.')
-  let isc = ("\u0300" <= u && u <= "\u036F") ||
-          \ ("\u1DC0" <= u && u <= "\u1DFF") ||
-          \ ("\u20D0" <= u && u <= "\u20FF") ||
-          \ ("\uFE20" <= u && u <= "\uFE2F")
-  return isc ? "\u25CC" . a:uni : a:uni
-endfunction
-
-" Helper function to find the longest common prefix among
-" partial completion matches (used when suggestions are disabled
-" and in command line mode)
-function! s:L2U_longest_common_prefix(partmatches)
-  let common = a:partmatches[0]
-  for i in range(1, len(a:partmatches)-1)
-    let p = a:partmatches[i]
-    if len(p) < len(common)
-      let common = common[0 : len(p)-1]
-    endif
-    for j in range(1, len(common)-1)
-      if p[j] != common[j]
-        let common = common[0 : j-1]
-        break
-      endif
-    endfor
-  endfor
-  return common
-endfunction
-
-" Omnicompletion function. Besides the usual two-stage omnifunc behaviour,
-" it has the following peculiar features:
-"  *) keeps track of the previous completion attempt
-"  *) sets some info to be used by the fallback function
-"  *) either returns a list of completions if a partial match is found, or a
-"     Unicode char if an exact match is found
-"  *) forces its way out of completion mode through a hack in some cases
-function! LaTeXtoUnicode#omnifunc(findstart, base)
-  if a:findstart
-    " first stage
-    " avoid infinite loop if the fallback happens to call omnicompletion
-    if b:l2u_in_fallback
-      let b:l2u_in_fallback = 0
-      return -3
-    endif
-    let b:l2u_in_fallback = 0
-    " set info for the callback
-    let b:l2u_tab_completing = 1
-    let b:l2u_found_completion = 1
-    " analyse current line
-    let col1 = col('.')
-    let l = getline('.')
-    let col0 = match(l[0:col1-2], '\\[^[:space:]\\]\+$')
-    " compare with previous completion attempt
-    let b:l2u_bs_while_completing = 0
-    let b:l2u_completed_once = 0
-    if col0 == b:l2u_last_compl['col0']
-      let prevl = b:l2u_last_compl['line']
-      if col1 == b:l2u_last_compl['col1'] && l ==# prevl
-        let b:l2u_completed_once = 1
-      elseif col1 == b:l2u_last_compl['col1'] - 1 && l ==# prevl[0 : col1-2] . prevl[col1 : -1]
-        let b:l2u_bs_while_completing = 1
-      endif
-    endif
-    " store completion info for next attempt
-    let b:l2u_last_compl['col0'] = col0
-    let b:l2u_last_compl['col1'] = col1
-    let b:l2u_last_compl['line'] = l
-    " is the cursor right after a backslash?
-    let b:l2u_singlebslash = (match(l[0:col1-2], '\\$') >= 0)
-    " completion not found
-    if col0 == -1
-      let b:l2u_found_completion = 0
-      call feedkeys(s:l2u_esc_sequence, 'n')
-      let col0 = -2
-    endif
-    return col0
-  else
-    " read settings (eager mode is implicit when suggestions are disabled)
-    let suggestions = get(g:, "latex_to_unicode_suggestions", 1)
-    let eager = get(g:, "latex_to_unicode_eager", 1) || !suggestions
-    " search for matches
-    let partmatches = []
-    let exact_match = 0
-    for k in keys(g:l2u_symbols_dict)
-      if k ==# a:base
-        let exact_match = 1
-      endif
-      if len(k) >= len(a:base) && k[0 : len(a:base)-1] ==# a:base
-        let menu = s:L2U_fix_compose_chars(g:l2u_symbols_dict[k])
-        if suggestions
-          call add(partmatches, {'word': k, 'menu': menu})
-        else
-          call add(partmatches, k)
-        endif
-      endif
-    endfor
-    " exact matches are replaced with Unicode
-    " exceptions:
-    "  *) we reached an exact match by pressing backspace while completing
-    "  *) the exact match is one among many, and the eager setting is
-    "     disabled, and it's the first time this completion is attempted
-    if exact_match && !b:l2u_bs_while_completing && (len(partmatches) == 1 || eager || b:l2u_completed_once)
-      " the completion is successful: reset the last completion info...
-      call s:L2U_ResetLastCompletionInfo()
-      " ...force our way out of completion mode...
-      call feedkeys(s:l2u_esc_sequence, 'n')
-      " ...return the Unicode symbol
-      return [g:l2u_symbols_dict[a:base]]
-    endif
-    if !empty(partmatches)
-      " here, only partial matches were found; either keep just the longest
-      " common prefix, or pass them on
-      if !suggestions
-        let partmatches = [s:L2U_longest_common_prefix(partmatches)]
-      else
-        call sort(partmatches, "s:L2U_partmatches_sort")
-      endif
-    endif
-    if empty(partmatches)
-      call feedkeys(s:l2u_esc_sequence, 'n')
-      let b:l2u_found_completion = 0
-    endif
-    return partmatches
-  endif
-endfunction
-
-function! LaTeXtoUnicode#PutLiteral(k)
-  call feedkeys(a:k, 'ni')
-  return ''
-endfunction
-
-" Function which saves the current insert-mode mapping of a key sequence `s`
-" and associates it with another key sequence `k` (e.g. stores the current
-" <Tab> mapping into the Fallback trigger)
-function! s:L2U_SetFallbackMapping(s, k)
-  let mmdict = maparg(a:s, 'i', 0, 1)
-  if empty(mmdict)
-    exe 'inoremap <buffer> ' . a:k . ' ' . a:s
-    return
-  endif
-  let rhs = mmdict["rhs"]
-  if rhs =~# '^<Plug>L2U'
-    return
-  endif
-  let pre = '<buffer>'
-  if mmdict["silent"]
-    let pre = pre . '<silent>'
-  endif
-  if mmdict["expr"]
-    let pre = pre . '<expr>'
-  endif
-  if mmdict["noremap"]
-    let cmd = 'inoremap '
-  else
-    let cmd = 'imap '
-    " This is a nasty hack used to prevent infinite recursion. It's not a
-    " general solution.
-    if mmdict["expr"]
-      let rhs = substitute(rhs, '\c' . a:s, "\<C-R>=LaTeXtoUnicode#PutLiteral('" . a:s . "')\<CR>", 'g')
-    endif
-  endif
-  exe cmd . pre . ' ' . a:k . ' ' . rhs
-endfunction
-
-" This is the function which is mapped to <Tab>
-function! LaTeXtoUnicode#Tab()
-  " the <Tab> is passed through to the fallback mapping if the completion
-  " menu is present, and it hasn't been raised by the L2U tab, and there
-  " isn't an exact match before the cursor when suggestions are disabled
-  if pumvisible() && !b:l2u_tab_completing && (get(g:, "latex_to_unicode_suggestions", 1) || !s:L2U_ismatch())
-    call feedkeys(s:l2u_fallback_trigger)
-    return ''
-  endif
-  " reset the in_fallback info
-  let b:l2u_in_fallback = 0
-  " temporary change to completeopt to use the `longest` setting, which is
-  " probably the only one which makes sense given that the goal of the
-  " completion is to substitute the final string
-  let b:l2u_backup_commpleteopt = &completeopt
-  set completeopt+=longest
-  set completeopt-=noinsert
-  " invoke omnicompletion; failure to perform LaTeX-to-Unicode completion is
-  " handled by the CompleteDone autocommand.
-  return "\<C-X>\<C-O>"
-endfunction
-
-" This function is called at every CompleteDone event, and is meant to handle
-" the failures of LaTeX-to-Unicode completion by calling a fallback
-function! LaTeXtoUnicode#FallbackCallback()
-  if !b:l2u_tab_completing
-    " completion was not initiated by L2U, nothing to do
-    return
-  else
-    " completion was initiated by L2U, restore completeopt
-    let &completeopt = b:l2u_backup_commpleteopt
-  endif
-  " at this point L2U tab completion is over
-  let b:l2u_tab_completing = 0
-  " if the completion was successful do nothing
-  if b:l2u_found_completion == 1 || b:l2u_singlebslash == 1
-    return
-  endif
-  " fallback
-  let b:l2u_in_fallback = 1
-  call feedkeys(s:l2u_fallback_trigger)
-  return
-endfunction
-
-" This is the function which is mapped to <S-Tab> in command-line mode
-function! LaTeXtoUnicode#CmdTab()
-  " first stage
-  " analyse command line
-  let col1 = getcmdpos() - 1
-  let l = getcmdline()
-  let col0 = match(l[0:col1-1], '\\[^[:space:]\\]\+$')
-  let b:l2u_singlebslash = (match(l[0:col1-1], '\\$') >= 0)
-  " completion not found
-  if col0 == -1
-    return l
-  endif
-  let base = l[col0 : col1-1]
-  " search for matches
-  let partmatches = []
-  let exact_match = 0
-  for k in keys(g:l2u_symbols_dict)
-    if k ==# base
-      let exact_match = 1
-    endif
-    if len(k) >= len(base) && k[0 : len(base)-1] ==# base
-      call add(partmatches, k)
-    endif
-  endfor
-  if len(partmatches) == 0
-    return l
-  endif
-  " exact matches are replaced with Unicode
-  if exact_match
-    let unicode = g:l2u_symbols_dict[base]
-    if col0 > 0
-      let pre = l[0 : col0 - 1]
-    else
-      let pre = ''
-    endif
-    let posdiff = col1-col0 - len(unicode)
-    call setcmdpos(col1 - posdiff + 1)
-    return pre . unicode . l[col1 : -1]
-  endif
-  " no exact match: complete with the longest common prefix
-  let common = s:L2U_longest_common_prefix(partmatches)
-  if col0 > 0
-    let pre = l[0 : col0 - 1]
-  else
-    let pre = ''
-  endif
-  let posdiff = col1-col0 - len(common)
-  call setcmdpos(col1 - posdiff + 1)
-  return pre . common . l[col1 : -1]
-endfunction
-
-" Setup the L2U tab mapping
-function! s:L2U_SetTab(wait_insert_enter)
-  if !b:l2u_cmdtab_set && get(g:, "latex_to_unicode_tab", 1) && b:l2u_enabled
-    cmap <buffer> <S-Tab> <Plug>L2UCmdTab
-    cnoremap <buffer> <Plug>L2UCmdTab <C-\>eLaTeXtoUnicode#CmdTab()<CR>
-    let b:l2u_cmdtab_set = 1
-  endif
-  if b:l2u_tab_set
-    return
-  endif
-  " g:did_insert_enter is set from an autocommand in ftdetect
-  if a:wait_insert_enter && !get(g:, "did_insert_enter", 0)
-    return
-  endif
-  if !get(g:, "latex_to_unicode_tab", 1) || !b:l2u_enabled
-    return
-  endif
-
-  " Backup the previous omnifunc (the check is probably not really needed)
-  if get(b:, "prev_omnifunc", "") != "LaTeXtoUnicode#omnifunc"
-    let b:prev_omnifunc = &omnifunc
-  endif
-  setlocal omnifunc=LaTeXtoUnicode#omnifunc
-
-  call s:L2U_SetFallbackMapping('<Tab>', s:l2u_fallback_trigger)
-  imap <buffer> <Tab> <Plug>L2UTab
-  inoremap <buffer><expr> <Plug>L2UTab LaTeXtoUnicode#Tab()
-
-  augroup L2UTab
-    autocmd! * <buffer>
-    " Every time a completion finishes, the fallback may be invoked
-    autocmd CompleteDone <buffer> call LaTeXtoUnicode#FallbackCallback()
-  augroup END
-
-  let b:l2u_tab_set = 1
-endfunction
-
-" Revert the LaTeX-to-Unicode tab mapping settings
-function! s:L2U_UnsetTab()
-  if b:l2u_cmdtab_set
-    cunmap <buffer> <S-Tab>
-    let b:l2u_cmdtab_set = 0
-  endif
-  if !b:l2u_tab_set
-    return
-  endif
-  exec "setlocal omnifunc=" . get(b:, "prev_omnifunc", "")
-  iunmap <buffer> <Tab>
-  if empty(maparg("<Tab>", "i"))
-    call s:L2U_SetFallbackMapping(s:l2u_fallback_trigger, '<Tab>')
-  endif
-  iunmap <buffer> <Plug>L2UTab
-  exe 'iunmap <buffer> ' . s:l2u_fallback_trigger
-  augroup L2UTab
-    autocmd! * <buffer>
-  augroup END
-  let b:l2u_tab_set = 0
-endfunction
-
-" Function which looks for viable LaTeX-to-Unicode supstitutions as you type
-function! LaTeXtoUnicode#AutoSub(...)
-  let vc = a:0 == 0 ? v:char : a:1
-  let col1 = col('.')
-  let lnum = line('.')
-  if col1 == 1
-    if a:0 > 1
-      call feedkeys(a:2, 'n')
-    endif
-    return ''
-  endif
-  let bs = (vc != "\n")
-  let l = getline(lnum)[0 : col1-1-bs] . v:char
-  let col0 = match(l, '\\\%([_^]\?[A-Za-z]\+\%' . col1 . 'c\%([^A-Za-z]\|$\)\|[_^]\%([0-9()=+-]\)\%' . col1 .'c\%(.\|$\)\)')
-  if col0 == -1
-    if a:0 > 1
-      call feedkeys(a:2, 'n')
-    endif
-    return ''
-  endif
-  let base = l[col0 : -1-bs]
-  let unicode = get(g:l2u_symbols_dict, base, '')
-  if empty(unicode)
-    if a:0 > 1
-      call feedkeys(a:2, 'n')
-    endif
-    return ''
-  endif
-  call feedkeys("\<C-G>u", 'n')
-  call feedkeys(repeat("\b", len(base) + bs) . unicode . vc . s:l2u_esc_sequence, 'nt')
-  call feedkeys("\<C-G>u", 'n')
-  return ''
-endfunction
-
-" Setup the auto as-you-type LaTeX-to-Unicode substitution
-function! s:L2U_SetAutoSub(wait_insert_enter)
-  if b:l2u_autosub_set
-    return
-  endif
-  " g:did_insert_enter is set from an autocommand in ftdetect
-  if a:wait_insert_enter && !get(g:, "did_insert_enter", 0)
-    return
-  endif
-  if !get(g:, "latex_to_unicode_auto", 0) || !b:l2u_enabled
-    return
-  endif
-  " Viable substitutions are searched at every character insertion via the
-  " autocmd InsertCharPre. The <Enter> key does not seem to be catched in
-  " this way though, so we use a mapping for that case.
-  imap <buffer> <CR> <Plug>L2UAutoSub
-  inoremap <buffer><expr> <Plug>L2UAutoSub LaTeXtoUnicode#AutoSub("\n", "\<CR>")
-
-  augroup L2UAutoSub
-    autocmd! * <buffer>
-    autocmd InsertCharPre <buffer> call LaTeXtoUnicode#AutoSub()
-  augroup END
-
-  let b:l2u_autosub_set = 1
-endfunction
-
-" Revert the auto LaTeX-to-Unicode settings
-function! s:L2U_UnsetAutoSub()
-  if !b:l2u_autosub_set
-    return
-  endif
-
-  iunmap <buffer> <CR>
-  iunmap <buffer> <Plug>L2UAutoSub
-  augroup L2UAutoSub
-    autocmd! * <buffer>
-  augroup END
-  let b:l2u_autosub_set = 0
-endfunction
-
-" Initialization. Can be used to re-init when global settings have changed.
-function! LaTeXtoUnicode#Init(...)
-  let wait_insert_enter = a:0 > 0 ? a:1 : 1
-
-  if !wait_insert_enter
-    augroup L2UInit
-      autocmd!
-    augroup END
-  endif
-
-  call s:L2U_UnsetTab()
-  call s:L2U_UnsetAutoSub()
-
-  call s:L2U_SetTab(wait_insert_enter)
-  call s:L2U_SetAutoSub(wait_insert_enter)
-endfunction
-
-function! LaTeXtoUnicode#Toggle()
-  call s:L2U_Setup()
-  if b:l2u_enabled
-    call LaTeXtoUnicode#Disable()
-    echo "LaTeX-to-Unicode disabled"
-  else
-    call LaTeXtoUnicode#Enable()
-    echo "LaTeX-to-Unicode enabled"
-  endif
-  return
-endfunction
-
-endif

autoload/crystal_lang.vim

@@ -310,7 +310,7 @@ function! crystal_lang#format(option_str) abort
 
     try
         call setreg('g', formatted, 'v')
-        silent normal! gg0vG$"gp
+        silent normal! ggvG$"gp
     finally
         call setreg('g', save_g_reg, save_g_regtype)
         let &l:selection = sel_save

autoload/dart.vim

@@ -20,22 +20,18 @@ endfunction
 
 function! dart#fmt(q_args) abort
   if executable('dartfmt')
-    let buffer_content = join(getline(1, '$'), "\n")
-    let joined_lines = system(printf('dartfmt %s', a:q_args), buffer_content)
-    if 0 == v:shell_error
-      let win_view = winsaveview()
-      let lines = split(joined_lines, "\n")
-      silent keepjumps call setline(1, lines)
-      if line('$') > len(lines)
-        silent keepjumps execute string(len(lines)+1).',$ delete'
+    let path = expand('%:p:gs:\:/:')
+    if filereadable(path)
+      let joined_lines = system(printf('dartfmt %s %s', a:q_args, shellescape(path)))
+      if 0 == v:shell_error
+        silent % delete _
+        silent put=joined_lines
+        silent 1 delete _
+      else
+        call s:cexpr('line %l\, column %c of %f: %m', joined_lines)
       endif
-      call winrestview(win_view)
     else
-      let errors = split(joined_lines, "\n")[2:]
-      let file_path = expand('%')
-      call map(errors, 'file_path.":".v:val')
-      let error_format = '%A%f:line %l\, column %c of stdin: %m,%C%.%#'
-      call s:cexpr(error_format, join(errors, "\n"))
+      call s:error(printf('cannot read a file: "%s"', path))
     endif
   else
     call s:error('cannot execute binary file: dartfmt')
@@ -70,95 +66,5 @@ function! dart#tojs(q_args) abort
   endif
 endfunction
 
-" Finds the path to `uri`.
-"
-" If the file is a package: uri, looks for a .packages file to resolve the path.
-" If the path cannot be resolved, or is not a package: uri, returns the
-" original.
-function! dart#resolveUri(uri) abort
-  if a:uri !~ 'package:'
-    return a:uri
-  endif
-  let package_name = substitute(a:uri, 'package:\(\w\+\)\/.*', '\1', '')
-  let [found, package_map] = s:PackageMap()
-  if !found
-    call s:error('cannot find .packages file')
-    return a:uri
-  endif
-  if !has_key(package_map, package_name)
-    call s:error('no package mapping for '.package_name)
-    return a:uri
-  endif
-  let package_lib = package_map[package_name]
-  return substitute(a:uri,
-      \ 'package:'.package_name,
-      \ escape(package_map[package_name], '\'),
-      \ '')
-endfunction
-
-" A map from package name to lib directory parse from a '.packages' file.
-"
-" Returns [found, package_map]
-function! s:PackageMap() abort
-  let [found, dot_packages] = s:DotPackagesFile()
-  if !found
-    return [v:false, {}]
-  endif
-  let dot_packages_dir = fnamemodify(dot_packages, ':p:h')
-  let lines = readfile(dot_packages)
-  let map = {}
-  for line in lines
-    if line =~ '\s*#'
-      continue
-    endif
-    let package = substitute(line, ':.*$', '', '')
-    let lib_dir = substitute(line, '^[^:]*:', '', '')
-    if lib_dir =~ 'file:/'
-      let lib_dir = substitute(lib_dir, 'file://', '', '')
-      if lib_dir =~ '/[A-Z]:/'
-        let lib_dir = lib_dir[1:]
-      endif
-    else
-      let lib_dir = resolve(dot_packages_dir.'/'.lib_dir)
-    endif
-    if lib_dir =~ '/$'
-      let lib_dir = lib_dir[:len(lib_dir) - 2]
-    endif
-    let map[package] = lib_dir
-  endfor
-  return [v:true, map]
-endfunction
-
-" Finds a file name '.packages' in the cwd, or in any directory above the open
-" file.
-"
-" Returns [found, file].
-function! s:DotPackagesFile() abort
-  if filereadable('.packages')
-    return [v:true, '.packages']
-  endif
-  let dir_path = expand('%:p:h')
-  while v:true
-    let file_path = dir_path.'/.packages'
-    if filereadable(file_path)
-      return [v:true, file_path]
-    endif
-    let parent = fnamemodify(dir_path, ':h')
-    if dir_path == parent
-      break
-    endif
-    let dir_path = parent
-  endwhile
-  return [v:false, '']
-endfunction
-
-" Prevent writes to files in the pub cache.
-function! dart#setModifiable() abort
-  let full_path = expand('%:p')
-  if full_path =~# '.pub-cache' ||
-      \ full_path =~# 'Pub\Cache'
-    setlocal nomodifiable
-  endif
-endfunction
 
 endif

autoload/elixir/indent.vim

@@ -1,453 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
-if !exists("g:elixir_indent_max_lookbehind")
-  let g:elixir_indent_max_lookbehind = 30
-endif
-
-" Return the effective value of 'shiftwidth'
-function! s:sw()
-  return &shiftwidth == 0 ? &tabstop : &shiftwidth
-endfunction
-
-function! elixir#indent#indent(lnum)
-  let lnum = a:lnum
-  let text = getline(lnum)
-  let prev_nb_lnum = prevnonblank(lnum-1)
-  let prev_nb_text = getline(prev_nb_lnum)
-
-  call s:debug("==> Indenting line " . lnum)
-  call s:debug("text = '" . text . "'")
-
-  let handlers = [
-        \'top_of_file',
-        \'starts_with_end',
-        \'starts_with_mid_or_end_block_keyword',
-        \'following_trailing_do',
-        \'following_trailing_binary_operator',
-        \'starts_with_pipe',
-        \'starts_with_close_bracket',
-        \'starts_with_binary_operator',
-        \'inside_nested_construct',
-        \'starts_with_comment',
-        \'inside_generic_block',
-        \'follow_prev_nb'
-        \]
-  for handler in handlers
-    call s:debug('testing handler elixir#indent#handle_'.handler)
-    let indent = function('elixir#indent#handle_'.handler)(lnum, text, prev_nb_lnum, prev_nb_text)
-    if indent != -1
-      call s:debug('line '.lnum.': elixir#indent#handle_'.handler.' returned '.indent)
-      return indent
-    endif
-  endfor
-
-  call s:debug("defaulting")
-  return 0
-endfunction
-
-function! s:debug(str)
-  if exists("g:elixir_indent_debug") && g:elixir_indent_debug
-    echom a:str
-  endif
-endfunction
-
-" Returns 0 or 1 based on whether or not the text starts with the given
-" expression and is not a string or comment
-function! s:starts_with(text, expr, lnum)
-  let pos = match(a:text, '^\s*'.a:expr)
-  if pos == -1
-    return 0
-  else
-    " NOTE: @jbodah 2017-02-24: pos is the index of the match which is
-    " zero-indexed. Add one to make it the column number
-    if s:is_string_or_comment(a:lnum, pos + 1)
-      return 0
-    else
-      return 1
-    end
-  end
-endfunction
-
-" Returns 0 or 1 based on whether or not the text ends with the given
-" expression and is not a string or comment
-function! s:ends_with(text, expr, lnum)
-  let pos = match(a:text, a:expr.'\s*$')
-  if pos == -1
-    return 0
-  else
-    if s:is_string_or_comment(a:lnum, pos)
-      return 0
-    else
-      return 1
-    end
-  end
-endfunction
-
-" Returns 0 or 1 based on whether or not the given line number and column
-" number pair is a string or comment
-function! s:is_string_or_comment(line, col)
-  return synIDattr(synID(a:line, a:col, 1), "name") =~ '\%(String\|Comment\)'
-endfunction
-
-" Skip expression for searchpair. Returns 0 or 1 based on whether the value
-" under the cursor is a string or comment
-function! elixir#indent#searchpair_back_skip()
-  " NOTE: @jbodah 2017-02-27: for some reason this function gets called with
-  " and index that doesn't exist in the line sometimes. Detect and account for
-  " that situation
-  let curr_col = col('.')
-  if getline('.')[curr_col-1] == ''
-    let curr_col = curr_col-1
-  endif
-  return s:is_string_or_comment(line('.'), curr_col)
-endfunction
-
-" DRY up regex for keywords that 1) makes sure we only look at complete words
-" and 2) ignores atoms
-function! s:keyword(expr)
-  return ':\@<!\<\C\%('.a:expr.'\)\>:\@!'
-endfunction
-
-" Start at the end of text and search backwards looking for a match. Also peek
-" ahead if we get a match to make sure we get a complete match. This means
-" that the result should be the position of the start of the right-most match
-function! s:find_last_pos(lnum, text, match)
-  let last = len(a:text) - 1
-  let c = last
-
-  while c >= 0
-    let substr = strpart(a:text, c, last)
-    let peek = strpart(a:text, c - 1, last)
-    let ss_match = match(substr, a:match)
-    if ss_match != -1
-      let peek_match = match(peek, a:match)
-      if peek_match == ss_match + 1
-        let syng = synIDattr(synID(a:lnum, c + ss_match, 1), 'name')
-        if syng !~ '\%(String\|Comment\)'
-          return c + ss_match
-        end
-      end
-    end
-    let c -= 1
-  endwhile
-
-  return -1
-endfunction
-
-function! elixir#indent#handle_top_of_file(_lnum, _text, prev_nb_lnum, _prev_nb_text)
-  if a:prev_nb_lnum == 0
-    return 0
-  else
-    return -1
-  end
-endfunction
-
-function! elixir#indent#handle_follow_prev_nb(_lnum, _text, prev_nb_lnum, prev_nb_text)
-  return s:get_base_indent(a:prev_nb_lnum, a:prev_nb_text)
-endfunction
-
-" Given the line at `lnum`, returns the indent of the line that acts as the 'base indent'
-" for this line. In particular it traverses backwards up things like pipelines
-" to find the beginning of the expression
-function! s:get_base_indent(lnum, text)
-  let prev_nb_lnum = prevnonblank(a:lnum - 1)
-  let prev_nb_text = getline(prev_nb_lnum)
-
-  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
-  let data_structure_close = '\%(\]\|}\|)\)'
-  let pipe = '|>'
-
-  if s:starts_with(a:text, binary_operator, a:lnum)
-    return s:get_base_indent(prev_nb_lnum, prev_nb_text)
-  elseif s:starts_with(a:text, pipe, a:lnum)
-    return s:get_base_indent(prev_nb_lnum, prev_nb_text)
-  elseif s:ends_with(prev_nb_text, binary_operator, prev_nb_lnum)
-    return s:get_base_indent(prev_nb_lnum, prev_nb_text)
-  elseif s:ends_with(a:text, data_structure_close, a:lnum)
-    let data_structure_open = '\%(\[\|{\|(\)'
-    let close_match_idx = match(a:text, data_structure_close . '\s*$')
-    let _move = cursor(a:lnum, close_match_idx + 1)
-    let [open_match_lnum, open_match_col] = searchpairpos(data_structure_open, '', data_structure_close, 'bnW')
-    let open_match_text = getline(open_match_lnum)
-    return s:get_base_indent(open_match_lnum, open_match_text)
-  else
-    return indent(a:lnum)
-  endif
-endfunction
-
-" TODO: @jbodah 2017-03-31: remove
-function! elixir#indent#handle_following_trailing_do(lnum, text, prev_nb_lnum, prev_nb_text)
-  if s:ends_with(a:prev_nb_text, s:keyword('do'), a:prev_nb_lnum)
-    if s:starts_with(a:text, s:keyword('end'), a:lnum)
-      return indent(a:prev_nb_lnum)
-    else
-      return indent(a:prev_nb_lnum) + s:sw()
-    end
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_following_trailing_binary_operator(lnum, text, prev_nb_lnum, prev_nb_text)
-  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
-
-  if s:ends_with(a:prev_nb_text, binary_operator, a:prev_nb_lnum)
-    return indent(a:prev_nb_lnum) + s:sw()
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_following_prev_end(_lnum, _text, prev_nb_lnum, prev_nb_text)
-  if s:ends_with(a:prev_nb_text, s:keyword('end'), a:prev_nb_lnum)
-    return indent(a:prev_nb_lnum)
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_pipe(lnum, text, prev_nb_lnum, prev_nb_text)
-  if s:starts_with(a:text, '|>', a:lnum)
-    let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'
-    let pos = s:find_last_pos(a:prev_nb_lnum, a:prev_nb_text, match_operator)
-    if pos == -1
-      return indent(a:prev_nb_lnum)
-    else
-      let next_word_pos = match(strpart(a:prev_nb_text, pos+1, len(a:prev_nb_text)-1), '\S')
-      if next_word_pos == -1
-        return indent(a:prev_nb_lnum) + s:sw()
-      else
-        return pos + 1 + next_word_pos
-      end
-    end
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_comment(_lnum, text, prev_nb_lnum, _prev_nb_text)
-  if match(a:text, '^\s*#') != -1
-    return indent(a:prev_nb_lnum)
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_end(lnum, text, _prev_nb_lnum, _prev_nb_text)
-  if s:starts_with(a:text, s:keyword('end'), a:lnum)
-    let pair_lnum = searchpair(s:keyword('do\|fn'), '', s:keyword('end').'\zs', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()")
-    return indent(pair_lnum)
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_mid_or_end_block_keyword(lnum, text, _prev_nb_lnum, _prev_nb_text)
-  if s:starts_with(a:text, s:keyword('catch\|rescue\|after\|else'), a:lnum)
-    let pair_lnum = searchpair(s:keyword('with\|receive\|try\|if\|fn'), s:keyword('catch\|rescue\|after\|else').'\zs', s:keyword('end'), 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()")
-    return indent(pair_lnum)
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_close_bracket(lnum, text, _prev_nb_lnum, _prev_nb_text)
-  if s:starts_with(a:text, '\%(\]\|}\|)\)', a:lnum)
-    let pair_lnum = searchpair('\%(\[\|{\|(\)', '', '\%(\]\|}\|)\)', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()")
-    return indent(pair_lnum)
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_binary_operator(lnum, text, prev_nb_lnum, prev_nb_text)
-  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
-
-  if s:starts_with(a:text, binary_operator, a:lnum)
-    let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'
-    let pos = s:find_last_pos(a:prev_nb_lnum, a:prev_nb_text, match_operator)
-    if pos == -1
-      return indent(a:prev_nb_lnum)
-    else
-      let next_word_pos = match(strpart(a:prev_nb_text, pos+1, len(a:prev_nb_text)-1), '\S')
-      if next_word_pos == -1
-        return indent(a:prev_nb_lnum) + s:sw()
-      else
-        return pos + 1 + next_word_pos
-      end
-    end
-  else
-    return -1
-  endif
-endfunction
-
-" To handle nested structures properly we need to find the innermost
-" nested structure. For example, we might be in a function in a map in a
-" function, etc... so we need to first figure out what the innermost structure
-" is then forward execution to the proper handler
-function! elixir#indent#handle_inside_nested_construct(lnum, text, prev_nb_lnum, prev_nb_text)
-  let start_pattern = '\C\%(\<with\>\|\<if\>\|\<case\>\|\<cond\>\|\<try\>\|\<receive\>\|\<fn\>\|{\|\[\|(\)'
-  let end_pattern = '\C\%(\<end\>\|\]\|}\|)\)'
-  let pair_info = searchpairpos(start_pattern, '', end_pattern, 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", max([0, a:lnum - g:elixir_indent_max_lookbehind]))
-  let pair_lnum = pair_info[0]
-  let pair_col = pair_info[1]
-  if pair_lnum != 0 || pair_col != 0
-    let pair_text = getline(pair_lnum)
-    let pair_char = pair_text[pair_col - 1]
-    if pair_char == 'f'
-      call s:debug("testing s:do_handle_inside_fn")
-      return s:do_handle_inside_fn(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    elseif pair_char == '['
-      call s:debug("testing s:do_handle_inside_square_brace")
-      return s:do_handle_inside_square_brace(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    elseif pair_char == '{'
-      call s:debug("testing s:do_handle_inside_curly_brace")
-      return s:do_handle_inside_curly_brace(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    elseif pair_char == '('
-      call s:debug("testing s:do_handle_inside_parens")
-      return s:do_handle_inside_parens(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    elseif pair_char == 'w'
-      call s:debug("testing s:do_handle_inside_with")
-      return s:do_handle_inside_with(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    else
-      call s:debug("testing s:do_handle_inside_keyword_block")
-      return s:do_handle_inside_keyword_block(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    end
-  else
-    return -1
-  end
-endfunction
-
-function! s:do_handle_inside_with(pair_lnum, pair_col, lnum, text, prev_nb_lnum, prev_nb_text)
-  if a:pair_lnum == a:lnum
-    " This is the `with` line or an inline `with`/`do`
-    call s:debug("current line is `with`")
-    return -1
-  else
-    " Determine if in with/do, do/else|end, or else/end
-    let start_pattern = '\C\%(\<with\>\|\<else\>\|\<do\>\)'
-    let end_pattern = '\C\%(\<end\>\)'
-    let pair_info = searchpairpos(start_pattern, '', end_pattern, 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()")
-    let pair_lnum = pair_info[0]
-    let pair_col = pair_info[1]
-
-    let pair_text = getline(pair_lnum)
-    let pair_char = pair_text[pair_col - 1]
-
-    if s:starts_with(a:text, '\Cdo:', a:lnum)
-      call s:debug("current line is do:")
-      return pair_col - 1 + s:sw()
-    elseif s:starts_with(a:text, '\Celse:', a:lnum)
-      call s:debug("current line is else:")
-      return pair_col - 1
-    elseif s:starts_with(a:text, '\C\(\<do\>\|\<else\>\)', a:lnum)
-      call s:debug("current line is do/else")
-      return pair_col - 1
-    elseif s:starts_with(pair_text, '\C\(do\|else\):', pair_lnum)
-      call s:debug("inside do:/else:")
-      return pair_col - 1 + s:sw()
-    elseif pair_char == 'w'
-      call s:debug("inside with/do")
-      return pair_col + 4
-    elseif pair_char == 'd'
-      call s:debug("inside do/else|end")
-      return pair_col - 1 + s:sw()
-    else
-      call s:debug("inside else/end")
-      return s:do_handle_inside_pattern_match_block(pair_lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    end
-  end
-endfunction
-
-function! s:do_handle_inside_keyword_block(pair_lnum, _pair_col, _lnum, text, prev_nb_lnum, prev_nb_text)
-  let keyword_pattern = '\C\%(\<case\>\|\<cond\>\|\<try\>\|\<receive\>\|\<after\>\|\<catch\>\|\<rescue\>\|\<else\>\)'
-  if a:pair_lnum
-    " last line is a "receive" or something
-    if s:starts_with(a:prev_nb_text, keyword_pattern, a:prev_nb_lnum)
-      call s:debug("prev nb line is keyword")
-      return indent(a:prev_nb_lnum) + s:sw()
-    else
-      return s:do_handle_inside_pattern_match_block(a:pair_lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-    end
-  else
-    return -1
-  endif
-endfunction
-
-" Implements indent for pattern-matching blocks (e.g. case, fn, with/else)
-function! s:do_handle_inside_pattern_match_block(block_start_lnum, text, prev_nb_lnum, prev_nb_text)
-  if a:text =~ '->'
-    call s:debug("current line contains ->")
-    return indent(a:block_start_lnum) + s:sw()
-  elseif a:prev_nb_text =~ '->'
-    call s:debug("prev nb line contains ->")
-    return indent(a:prev_nb_lnum) + s:sw()
-  else
-    return indent(a:prev_nb_lnum)
-  end
-endfunction
-
-function! s:do_handle_inside_fn(pair_lnum, _pair_col, lnum, text, prev_nb_lnum, prev_nb_text)
-  if a:pair_lnum && a:pair_lnum != a:lnum
-    return s:do_handle_inside_pattern_match_block(a:pair_lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
-  else
-    return -1
-  endif
-endfunction
-
-function! s:do_handle_inside_square_brace(pair_lnum, pair_col, _lnum, _text, _prev_nb_lnum, _prev_nb_text)
-  " If in list...
-  if a:pair_lnum != 0 || a:pair_col != 0
-    let pair_text = getline(a:pair_lnum)
-    let substr = strpart(pair_text, a:pair_col, len(pair_text)-1)
-    let indent_pos = match(substr, '\S')
-    if indent_pos != -1
-      return indent_pos + a:pair_col
-    else
-      return indent(a:pair_lnum) + s:sw()
-    endif
-  else
-    return -1
-  end
-endfunction
-
-function! s:do_handle_inside_curly_brace(pair_lnum, _pair_col, _lnum, _text, _prev_nb_lnum, _prev_nb_text)
-  return indent(a:pair_lnum) + s:sw()
-endfunction
-
-function! s:do_handle_inside_parens(pair_lnum, pair_col, _lnum, _text, prev_nb_lnum, prev_nb_text)
-  if a:pair_lnum
-    if s:ends_with(a:prev_nb_text, '(', a:prev_nb_lnum)
-      return indent(a:prev_nb_lnum) + s:sw()
-    elseif a:pair_lnum == a:prev_nb_lnum
-      " Align indent (e.g. "def add(a,")
-      let pos = s:find_last_pos(a:prev_nb_lnum, a:prev_nb_text, '[^(]\+,')
-      if pos == -1
-        return 0
-      else
-        return pos
-      end
-    else
-      return indent(a:prev_nb_lnum)
-    end
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_inside_generic_block(lnum, _text, prev_nb_lnum, prev_nb_text)
-  let pair_lnum = searchpair(s:keyword('do\|fn'), '', s:keyword('end'), 'bW', "line('.') == ".a:lnum." || s:is_string_or_comment(line('.'), col('.'))", max([0, a:lnum - g:elixir_indent_max_lookbehind]))
-  if pair_lnum
-    " TODO: @jbodah 2017-03-29: this should probably be the case in *all*
-    " blocks
-    if s:ends_with(a:prev_nb_text, ',', a:prev_nb_lnum)
-      return indent(pair_lnum) + 2 * s:sw()
-    else
-      return indent(pair_lnum) + s:sw()
-    endif
-  else
-    return -1
-  endif
-endfunction
-
-endif

autoload/elixir/util.vim

@@ -1,28 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-  
-function! elixir#util#get_filename(word) abort
-  let word = a:word
-
-  " get first thing that starts uppercase, until the first space or end of line
-  let word = substitute(word,'^\s*\(\u[^ ]\+\).*$','\1','g')
-
-  " remove any trailing characters that don't look like a nested module
-  let word = substitute(word,'\.\U.*$','','g')
-
-  " replace module dots with slash
-  let word = substitute(word,'\.','/','g')
-
-  " remove any special chars
-  let word = substitute(word,'[^A-z0-9-_/]','','g')
-
-  " convert to snake_case
-  let word = substitute(word,'\(\u\+\)\(\u\l\)','\1_\2','g')
-  let word = substitute(word,'\(\u\+\)\(\u\l\)','\1_\2','g')
-  let word = substitute(word,'\(\l\|\d\)\(\u\)','\1_\2','g')
-  let word = substitute(word,'-','_','g')
-  let word = tolower(word)
-
-  return word
-endfunction
-
-endif

autoload/elm.vim

@@ -1,382 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
-let s:errors = []
-
-function! s:elmOracle(...) abort
-	let l:project = finddir('elm-stuff/..', '.;')
-	if len(l:project) == 0
-		echoerr '`elm-stuff` not found! run `elm-package install` for autocomplete.'
-		return []
-	endif
-
-	let l:filename = expand('%:p')
-
-	if a:0 == 0
-		let l:oldiskeyword = &iskeyword
-		" Some non obvious values used in 'iskeyword':
-		"    @     = all alpha
-		"    48-57 = numbers 0 to 9
-		"    @-@   = character @
-		"    124   = |
-		setlocal iskeyword=@,48-57,@-@,_,-,~,!,#,$,%,&,*,+,=,<,>,/,?,.,\\,124,^
-		let l:word = expand('<cword>')
-		let &iskeyword = l:oldiskeyword
-	else
-		let l:word = a:1
-	endif
-
-	let l:infos = elm#Oracle(l:filename, l:word)
-	if v:shell_error != 0
-		call elm#util#EchoError("elm-oracle failed:\n\n", l:infos)
-		return []
-	endif
-
-	let l:d = split(l:infos, '\n')
-	if len(l:d) > 0
-		return elm#util#DecodeJSON(l:d[0])
-	endif
-
-	return []
-endf
-
-" Vim command to format Elm files with elm-format
-function! elm#Format() abort
-	" check for elm-format
-	if elm#util#CheckBin('elm-format', 'https://github.com/avh4/elm-format') ==# ''
-		return
-	endif
-
-	" save cursor position, folds and many other things
-    let l:curw = {}
-    try
-      mkview!
-    catch
-      let l:curw = winsaveview()
-    endtry
-
-    " save our undo file to be restored after we are done.
-    let l:tmpundofile = tempname()
-    exe 'wundo! ' . l:tmpundofile
-
-	" write current unsaved buffer to a temporary file
-	let l:tmpname = tempname() . '.elm'
-	call writefile(getline(1, '$'), l:tmpname)
-
-	" call elm-format on the temporary file
-	let l:out = system('elm-format ' . l:tmpname . ' --output ' . l:tmpname)
-
-	" if there is no error
-	if v:shell_error == 0
-		try | silent undojoin | catch | endtry
-
-		" replace current file with temp file, then reload buffer
-		let l:old_fileformat = &fileformat
-		call rename(l:tmpname, expand('%'))
-		silent edit!
-		let &fileformat = l:old_fileformat
-		let &syntax = &syntax
-	elseif g:elm_format_fail_silently == 0
-		call elm#util#EchoLater('EchoError', 'elm-format:', l:out)
-	endif
-
-    " save our undo history
-    silent! exe 'rundo ' . l:tmpundofile
-    call delete(l:tmpundofile)
-
-	" restore our cursor/windows positions, folds, etc..
-    if empty(l:curw)
-      silent! loadview
-    else
-      call winrestview(l:curw)
-    endif
-endf
-
-" Query elm-oracle and echo the type and docs for the word under the cursor.
-function! elm#ShowDocs() abort
-	" check for the elm-oracle binary
-	if elm#util#CheckBin('elm-oracle', 'https://github.com/elmcast/elm-oracle') ==# ''
-		return
-	endif
-
-	let l:response = s:elmOracle()
-
-	if len(l:response) > 0
-		let l:info = l:response[0]
-		redraws! | echohl Identifier | echon l:info.fullName | echohl None | echon ' : ' | echohl Function | echon l:info.signature | echohl None | echon "\n\n" . l:info.comment
-	else
-		call elm#util#Echo('elm-oracle:', '...no match found')
-	endif
-endf
-
-" Query elm-oracle and open the docs for the word under the cursor.
-function! elm#BrowseDocs() abort
-	" check for the elm-oracle binary
-	if elm#util#CheckBin('elm-oracle', 'https://github.com/elmcast/elm-oracle') ==# ''
-		return
-	endif
-
-	let l:response = s:elmOracle()
-
-	if len(l:response) > 0
-		let l:info = l:response[0]
-		call elm#util#OpenBrowser(l:info.href)
-	else
-		call elm#util#Echo('elm-oracle:', '...no match found')
-	endif
-endf
-
-
-function! elm#Syntastic(input) abort
-	let l:fixes = []
-
-	let l:bin = 'elm-make'
-	let l:format = '--report=json'
-	let l:input = shellescape(a:input)
-	let l:output = '--output=' . shellescape(syntastic#util#DevNull())
-	let l:command = l:bin . ' ' . l:format  . ' ' . l:input . ' ' . l:output
-	let l:reports = s:ExecuteInRoot(l:command)
-
-	for l:report in split(l:reports, '\n')
-		if l:report[0] ==# '['
-            for l:error in elm#util#DecodeJSON(l:report)
-                if g:elm_syntastic_show_warnings == 0 && l:error.type ==? 'warning'
-                else
-                    if a:input == l:error.file
-                        call add(s:errors, l:error)
-                        call add(l:fixes, {'filename': l:error.file,
-                                    \'valid': 1,
-                                    \'bufnr': bufnr('%'),
-                                    \'type': (l:error.type ==? 'error') ? 'E' : 'W',
-                                    \'lnum': l:error.region.start.line,
-                                    \'col': l:error.region.start.column,
-                                    \'text': l:error.overview})
-                    endif
-                endif
-            endfor
-        endif
-	endfor
-
-	return l:fixes
-endf
-
-function! elm#Build(input, output, show_warnings) abort
-	let s:errors = []
-	let l:fixes = []
-	let l:rawlines = []
-
-	let l:bin = 'elm-make'
-	let l:format = '--report=json'
-	let l:input = shellescape(a:input)
-	let l:output = '--output=' . shellescape(a:output)
-	let l:command = l:bin . ' ' . l:format  . ' ' . l:input . ' ' . l:output
-	let l:reports = s:ExecuteInRoot(l:command)
-
-	for l:report in split(l:reports, '\n')
-		if l:report[0] ==# '['
-			for l:error in elm#util#DecodeJSON(l:report)
-				if a:show_warnings == 0 && l:error.type ==? 'warning'
-				else
-					call add(s:errors, l:error)
-					call add(l:fixes, {'filename': l:error.file,
-								\'valid': 1,
-								\'type': (l:error.type ==? 'error') ? 'E' : 'W',
-								\'lnum': l:error.region.start.line,
-								\'col': l:error.region.start.column,
-								\'text': l:error.overview})
-				endif
-			endfor
-		else
-			call add(l:rawlines, l:report)
-		endif
-	endfor
-
-	let l:details = join(l:rawlines, "\n")
-	let l:lines = split(l:details, "\n")
-	if !empty(l:lines)
-		let l:overview = l:lines[0]
-	else
-		let l:overview = ''
-	endif
-
-	if l:details ==# '' || l:details =~? '^Successfully.*'
-	else
-		call add(s:errors, {'overview': l:details, 'details': l:details})
-		call add(l:fixes, {'filename': expand('%', 1),
-					\'valid': 1,
-					\'type': 'E',
-					\'lnum': 0,
-					\'col': 0,
-					\'text': l:overview})
-	endif
-
-	return l:fixes
-endf
-
-" Make the given file, or the current file if none is given.
-function! elm#Make(...) abort
-	if elm#util#CheckBin('elm-make', 'http://elm-lang.org/install') ==# ''
-		return
-	endif
-
-	call elm#util#Echo('elm-make:', 'building...')
-
-	let l:input = (a:0 == 0) ? expand('%:p') : a:1
-	let l:fixes = elm#Build(l:input, g:elm_make_output_file, g:elm_make_show_warnings)
-
-	if len(l:fixes) > 0
-		call elm#util#EchoWarning('', 'found ' . len(l:fixes) . ' errors')
-
-		call setqflist(l:fixes, 'r')
-		cwindow
-
-		if get(g:, 'elm_jump_to_error', 1)
-			ll 1
-		endif
-	else
-		call elm#util#EchoSuccess('', 'Sucessfully compiled')
-
-		call setqflist([])
-		cwindow
-	endif
-endf
-
-" Show the detail of the current error in the quickfix window.
-function! elm#ErrorDetail() abort
-	if !empty(filter(tabpagebuflist(), 'getbufvar(v:val, "&buftype") ==? "quickfix"'))
-		exec ':copen'
-		let l:linenr = line('.')
-		exec ':wincmd p'
-		if len(s:errors) > 0
-			let l:detail = s:errors[l:linenr-1].details
-			if l:detail ==# ''
-				let l:detail = s:errors[l:linenr-1].overview
-			endif
-			echo l:detail
-		endif
-	endif
-endf
-
-" Open the elm repl in a subprocess.
-function! elm#Repl() abort
-	" check for the elm-repl binary
-	if elm#util#CheckBin('elm-repl', 'http://elm-lang.org/install') ==# ''
-		return
-	endif
-
-	if has('nvim')
-		term('elm-repl')
-	else
-		!elm-repl
-	endif
-endf
-
-function! elm#Oracle(filepath, word) abort
-	let l:bin = 'elm-oracle'
-	let l:filepath = shellescape(a:filepath)
-	let l:word = shellescape(a:word)
-	let l:command = l:bin . ' ' . l:filepath . ' ' . l:word
-	return s:ExecuteInRoot(l:command)
-endfunction
-
-let s:fullComplete = ''
-
-" Complete the current token using elm-oracle
-function! elm#Complete(findstart, base) abort
-" a:base is unused, but the callback function for completion expects 2 arguments
-	if a:findstart
-		let l:line = getline('.')
-
-		let l:idx = col('.') - 1
-		let l:start = 0
-		while l:idx > 0 && l:line[l:idx - 1] =~# '[a-zA-Z0-9_\.]'
-			if l:line[l:idx - 1] ==# '.' && l:start == 0
-				let l:start = l:idx
-			endif
-			let l:idx -= 1
-		endwhile
-
-		if l:start == 0
-			let l:start = l:idx
-		endif
-
-		let s:fullComplete = l:line[l:idx : col('.')-2]
-
-		return l:start
-	else
-		" check for the elm-oracle binary
-		if elm#util#CheckBin('elm-oracle', 'https://github.com/elmcast/elm-oracle') ==# ''
-			return []
-		endif
-
-		let l:res = []
-		let l:response = s:elmOracle(s:fullComplete)
-
-		let l:detailed = get(g:, 'elm_detailed_complete', 0)
-
-		for l:r in l:response
-			let l:menu = ''
-			if l:detailed
-				let l:menu = ': ' . l:r.signature
-			endif
-			call add(l:res, {'word': l:r.name, 'menu': l:menu})
-		endfor
-
-		return l:res
-	endif
-endf
-
-" If the current buffer contains a consoleRunner, run elm-test with it.
-" Otherwise run elm-test in the root of your project which deafults to
-" running 'elm-test tests/TestRunner'.
-function! elm#Test() abort
-	if elm#util#CheckBin('elm-test', 'https://github.com/rtfeldman/node-elm-test') ==# ''
-		return
-	endif
-
-	if match(getline(1, '$'), 'consoleRunner') < 0
-		let l:out = s:ExecuteInRoot('elm-test')
-		call elm#util#EchoSuccess('elm-test', l:out)
-	else
-		let l:filepath = shellescape(expand('%:p'))
-		let l:out = s:ExecuteInRoot('elm-test ' . l:filepath)
-		call elm#util#EchoSuccess('elm-test', l:out)
-	endif
-endf
-
-" Returns the closest parent with an elm-package.json file.
-function! elm#FindRootDirectory() abort
-	let l:elm_root = getbufvar('%', 'elmRoot')
-	if empty(l:elm_root)
-		let l:current_file = expand('%:p')
-		let l:dir_current_file = fnameescape(fnamemodify(l:current_file, ':h'))
-		let l:match = findfile('elm-package.json', l:dir_current_file . ';')
-		if empty(l:match)
-			let l:elm_root = ''
-		else
-			let l:elm_root = fnamemodify(l:match, ':p:h')
-		endif
-
-		if !empty(l:elm_root)
-			call setbufvar('%', 'elmRoot', l:elm_root)
-		endif
-	endif
-	return l:elm_root
-endfunction
-
-" Executes a command in the project directory.
-function! s:ExecuteInRoot(cmd) abort
-	let l:cd = exists('*haslocaldir') && haslocaldir() ? 'lcd ' : 'cd '
-	let l:current_dir = getcwd()
-	let l:root_dir = elm#FindRootDirectory()
-
-	try
-		execute l:cd . fnameescape(l:root_dir)
-		let l:out = system(a:cmd)
-	finally
-		execute l:cd . fnameescape(l:current_dir)
-	endtry
-
-	return l:out
-endfunction
-
-endif

autoload/elm/io.vim

@@ -0,0 +1,12 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
+  
+" System IO
+
+" Craft a system command and run it, returning the output.
+function! elm#io#system(program, args)
+  let cmd ="which " . a:program . " && " . a:program . " " . a:args
+  return system(cmd)
+endfunction
+
+
+endif

autoload/elm/util.vim

@@ -1,178 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
-" IsWin returns 1 if current OS is Windows or 0 otherwise
-fun! elm#util#IsWin() abort
-  let l:win = ['win16', 'win32', 'win32unix', 'win64', 'win95']
-  for l:w in l:win
-    if (has(l:w))
-      return 1
-    endif
-  endfor
-
-  return 0
-endf
-
-fun! elm#util#CheckBin(bin, url) abort
-  let l:binpath = substitute(a:bin, '^\s*\(.\{-}\)\s*$', '\1', '')
-
-  if executable(l:binpath)
-    return l:binpath
-  endif
-
-  call elm#util#EchoWarning('elm-vim:', 'could not find ' . l:binpath . ' [' . a:url . ']')
-
-  return ''
-endf
-
-" Determines the browser command to use
-fun! s:get_browser_command() abort
-  let l:elm_browser_command = get(g:, 'elm_browser_command', '')
-  if l:elm_browser_command ==? ''
-    if elm#util#IsWin()
-      let l:elm_browser_command = '!start rundll32 url.dll,FileProtocolHandler %URL%'
-    elseif has('mac') || has('macunix') || has('gui_macvim') || system('uname') =~? '^darwin'
-      let l:elm_browser_command = 'open %URL%'
-    elseif executable('xdg-open')
-      let l:elm_browser_command = 'xdg-open %URL%'
-    elseif executable('firefox')
-      let l:elm_browser_command = 'firefox %URL% &'
-    else
-      let l:elm_browser_command = ''
-    endif
-  endif
-  return l:elm_browser_command
-endf
-
-" OpenBrowser opens a url in the default browser
-fun! elm#util#OpenBrowser(url) abort
-  let l:cmd = s:get_browser_command()
-  if len(l:cmd) == 0
-    redraw
-    echohl WarningMsg
-    echo "It seems that you don't have general web browser. Open URL below."
-    echohl None
-    echo a:url
-    return
-  endif
-  if l:cmd =~? '^!'
-    let l:cmd = substitute(l:cmd, '%URL%', '\=shellescape(a:url)', 'g')
-    silent! exec l:cmd
-  elseif l:cmd =~# '^:[A-Z]'
-    let l:cmd = substitute(l:cmd, '%URL%', '\=a:url', 'g')
-    exec l:cmd
-  else
-    let l:cmd = substitute(l:cmd, '%URL%', '\=shellescape(a:url)', 'g')
-    call system(l:cmd)
-  endif
-endf
-
-" DecodeJSON decodes a string of json into a viml object
-fun! elm#util#DecodeJSON(s) abort
-  let l:true = 1
-  let l:false = 0
-  let l:null = 0
-  return eval(a:s)
-endf
-
-" Remove ANSI escape characters used for highlighting purposes
-fun! s:strip_color(msg) abort
-  return substitute(a:msg, '\e\[[0-9;]\+[mK]', '', 'g')
-endf
-
-" Print functions
-fun! elm#util#Echo(title, msg) abort
-  redraws! | echon a:title . ' ' | echohl Identifier | echon s:strip_color(a:msg) | echohl None
-endf
-
-fun! elm#util#EchoSuccess(title, msg) abort
-  redraws! | echon a:title . ' ' | echohl Function | echon s:strip_color(a:msg) | echohl None
-endf
-
-fun! elm#util#EchoWarning(title, msg) abort
-  redraws! | echon a:title . ' ' | echohl WarningMsg | echon s:strip_color(a:msg) | echohl None
-endf
-
-fun! elm#util#EchoError(title, msg) abort
-  redraws! | echon a:title . ' ' | echohl ErrorMsg | echon s:strip_color(a:msg) | echohl None
-endf
-
-fun! elm#util#EchoLater(func_name, title, msg) abort
-  let s:echo_func_name = a:func_name
-  let s:echo_title = a:title
-  let s:echo_msg = a:msg
-endf
-
-fun! elm#util#EchoStored() abort
-  if exists('s:echo_func_name') && exists('s:echo_title') && exists('s:echo_msg')
-    call elm#util#{s:echo_func_name}(s:echo_title, s:echo_msg)
-    unlet s:echo_func_name
-    unlet s:echo_title
-    unlet s:echo_msg
-  endif
-endf
-
-function! elm#util#GoToModule(name)
-  if empty(a:name) | return | endif
-  if empty(matchstr(a:name, '^Native\.'))
-    let l:extension = '.elm'
-  else
-    let l:extension = '.js'
-  endif
-  let l:rel_path = substitute(a:name, '\.', '/', 'g') . l:extension
-  let l:root = elm#FindRootDirectory()
-
-  let l:module_file = s:findLocalModule(l:rel_path, l:root)
-  if !filereadable(l:module_file)
-    let l:module_file = s:findDependencyModule(l:rel_path, l:root)
-  endif
-
-  if filereadable(l:module_file)
-    exec 'edit ' . fnameescape(l:module_file)
-  else
-    return s:error("Can't find module \"" . a:name . "\"")
-  endif
-endfunction
-
-function! s:findLocalModule(rel_path, root)
-  let l:package_json = a:root . '/elm-package.json'
-  if exists('*json_decode')
-    let l:package = json_decode(readfile(l:package_json))
-    let l:source_roots = l:package['source-directories']
-  else
-    " This is a fallback for vim's which do not support json_decode.
-    " It simply only looks in the 'src' subdirectory and fails otherwise.
-    let l:source_roots = ['src']
-  end
-  for l:source_root in l:source_roots
-    let l:file_path = a:root . '/' . l:source_root . '/' . a:rel_path
-    if !filereadable(l:file_path)
-      continue
-    endif
-    return l:file_path
-  endfor
-endfunction
-
-function! s:findDependencyModule(rel_path, root)
-  " If we are a dependency ourselves, we need to check our siblings.
-  " This is because elm package doesn't install dependencies recursively.
-  let l:root = substitute(a:root, '\/elm-stuff/packages.\+$', '', '')
-
-  " We naively craws the dependencies dir for any fitting module name.
-  " If it exists, we'll find it. If multiple filenames match,
-  " there's a chance we return the wrong one.
-  let l:module_paths = glob(l:root . '/elm-stuff/packages/**/' . a:rel_path, 0, 1)
-  if len(l:module_paths) > 0
-    return l:module_paths[0]
-  endif
-endfunction
-
-" Using the built-in :echoerr prints a stacktrace, which isn't that nice.
-" From: https://github.com/moll/vim-node/blob/master/autoload/node.vim
-function! s:error(msg)
-	echohl ErrorMsg
-	echomsg a:msg
-	echohl NONE
-	let v:errmsg = a:msg
-endfunction
-
-endif

autoload/fish.vim

@@ -1,7 +1,6 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
   
 function! fish#Indent()
-    let l:shiftwidth = shiftwidth()
     let l:prevlnum = prevnonblank(v:lnum - 1)
     if l:prevlnum ==# 0
         return 0
@@ -9,15 +8,15 @@ function! fish#Indent()
     let l:indent = 0
     let l:prevline = getline(l:prevlnum)
     if l:prevline =~# '\v^\s*switch>'
-        let l:indent = l:shiftwidth * 2
+        let l:indent = &shiftwidth * 2
     elseif l:prevline =~# '\v^\s*%(begin|if|else|while|for|function|case)>'
-        let l:indent = l:shiftwidth
+        let l:indent = &shiftwidth
     endif
     let l:line = getline(v:lnum)
     if l:line =~# '\v^\s*end>'
-        return indent(v:lnum) - (l:indent ==# 0 ? l:shiftwidth : l:indent)
+        return indent(v:lnum) - (l:indent ==# 0 ? &shiftwidth : l:indent)
     elseif l:line =~# '\v^\s*%(case|else)>'
-        return indent(v:lnum) - l:shiftwidth
+        return indent(v:lnum) - &shiftwidth
     endif
     return indent(l:prevlnum) + l:indent
 endfunction

autoload/julia.vim

@@ -1,188 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
-function! julia#set_syntax_version(jvers)
-  if &filetype != "julia"
-    echo "Not a Julia file"
-    return
-  endif
-  syntax clear
-  let b:julia_syntax_version = a:jvers
-  set filetype=julia
-endfunction
-
-function! julia#toggle_deprecated_syntax()
-  if &filetype != "julia"
-    echo "Not a Julia file"
-    return
-  endif
-  syntax clear
-  let hd = get(b:, "julia_syntax_highlight_deprecated",
-      \    get(g:, "julia_syntax_highlight_deprecated", 0))
-  let b:julia_syntax_highlight_deprecated = hd ? 0 : 1
-  set filetype=julia
-  if b:julia_syntax_highlight_deprecated
-    echo "Highlighting of deprecated syntax enabled"
-  else
-    echo "Highlighting of deprecated syntax disabled"
-  endif
-endfunction
-
-if exists("loaded_matchit")
-
-function! julia#toggle_function_blockassign()
-    let sav_pos = getcurpos()
-    let l = getline('.')
-    let c = match(l, '\C\m\<function\s\+.\+(')
-    if c != -1
-        return julia#function_block2assign()
-    endif
-    let c = match(l, '\C\m)\%(::\S\+\)\?\%(\s\+where\s\+.*\)\?\s*=\s*')
-    if c == -1
-        echohl WarningMsg | echo "Not on a function definition or assignment line" | echohl None
-        return
-    endif
-    return julia#function_assign2block()
-endfunction
-
-function! julia#function_block2assign()
-    let sav_pos = getcurpos()
-    let l = getline('.')
-    let c = match(l, '\C\m\<function\s\+.\+(')
-    if c == -1
-        echohl WarningMsg | echo "Not on a function definition line" | echohl None
-        return
-    endif
-    let fpos = copy(sav_pos)
-    let fpos[2] = c+1
-    call setpos('.', fpos)
-    normal %
-    if line('.') != fpos[1]+2 || match(getline('.'), '\C\m^\s*end\s*$') == -1
-        echohl WarningMsg | echo "Only works with 3-lines functions" | echohl None
-        call setpos('.', sav_pos)
-        return
-    endif
-    call setpos('.', fpos)
-    normal! f(
-    normal %
-    while line('.') == fpos[1] && match(l[col('.')-1:], '\C\m)(') == 0
-        normal! l
-        normal %
-    endwhile
-    if line('.') != fpos[1] || match(l[(col('.')-1):], '\C\m)\%(::\S\+\)\?\%(\s\+where\s\+.*\)\?\s*$') != 0
-        echohl WarningMsg | echo "Unrecognized function definition format" | echohl None
-        call setpos('.', sav_pos)
-        return
-    endif
-
-    call setpos('.', fpos)
-    normal! dwA = J
-    if match(getline('.')[(col('.')-1):], '\C\mreturn\>') == 0
-        normal! dw
-    endif
-    if match(getline('.')[(col('.')-1):], '\C\m\s*$') == 0
-        normal! F=C= nothing
-    endif
-    normal! jddk^
-    return
-endfunction
-
-function! julia#function_assign2block()
-    let sav_pos = getcurpos()
-    let l = getline('.')
-    let c = match(l, '\C\m)\%(::\S\+\)\?\%(\s\+where\s\+.*\)\?\s*=\s*')
-    if c == -1
-        echohl WarningMsg | echo "Not on a function assignment-definition line" | echohl None
-        return
-    endif
-    normal ^
-    while match(l[(col('.')-1):], '\%(\S\+\.\)*@') == 0
-        normal! W
-    endwhile
-    normal! ifunction 
-    let l = getline('.')
-    let c = match(l, '\C\m)\%(::\S\+\)\?\%(\s\+where\s\+.*\)\?\s*\zs=\s*')
-    let eqpos = copy(sav_pos)
-    let eqpos[2] = c+1
-    call setpos('.', eqpos)
-    normal! cw
-oend
-    normal %
-    s/\s*$// | noh
-    return
-endfunction
-
-
-let s:nonid_chars = "\U01-\U07" . "\U0E-\U1F" .
-      \             "\"#$'(,.:;=?@`\\U5B{" .
-      \             "\U80-\UA1" . "\UA7\UA8\UAB\UAD\UAF\UB4" . "\UB6-\UB8" . "\UBB\UBF"
-
-let s:nonidS_chars = "[:space:])\\U5D}" . s:nonid_chars
-
-" the following excludes '!' since it can be used as an identifier,
-" and '$' since it can be used in interpolations
-" note that \U2D is '-'
-let s:uniop_chars = "+\\U2D~¬√∛∜"
-
-let s:binop_chars = "=+\\U2D*/\\%÷^&|⊻<>≤≥≡≠≢∈∉⋅×∪∩⊆⊈⊂⊄⊊←→∋∌⊕⊖⊞⊟∘∧⊗⊘↑↓∨⊠±"
-
-" the following is a list of all remainig valid operator chars,
-" but it's more efficient when expressed with ranges (see below)
-" let s:binop_chars_extra = "↔↚↛↠↣↦↮⇎⇏⇒⇔⇴⇶⇷⇸⇹⇺⇻⇼⇽⇾⇿⟵⟶⟷⟷⟹⟺⟻⟼⟽⟾⟿⤀⤁⤂⤃⤄⤅⤆⤇⤌⤍⤎⤏⤐⤑⤔⤕⤖⤗⤘⤝⤞⤟⤠⥄⥅⥆⥇⥈⥊⥋⥎⥐⥒⥓⥖⥗⥚⥛⥞⥟⥢⥤⥦⥧⥨⥩⥪⥫⥬⥭⥰⧴⬱⬰⬲⬳⬴⬵⬶⬷⬸⬹⬺⬻⬼⬽⬾⬿⭀⭁⭂⭃⭄⭇⭈⭉⭊⭋⭌￩￫" .
-"       \                   "∝∊∍∥∦∷∺∻∽∾≁≃≄≅≆≇≈≉≊≋≌≍≎≐≑≒≓≔≕≖≗≘≙≚≛≜≝≞≟≣≦≧≨≩≪≫≬≭≮≯≰≱≲≳≴≵≶≷≸≹≺≻≼≽≾≿⊀⊁⊃⊅⊇⊉⊋⊏⊐⊑⊒⊜⊩⊬⊮⊰⊱⊲⊳⊴⊵⊶⊷⋍⋐⋑⋕⋖⋗⋘⋙⋚⋛⋜⋝⋞⋟⋠⋡⋢⋣⋤⋥⋦⋧⋨⋩⋪⋫⋬⋭⋲⋳⋴⋵⋶⋷⋸⋹⋺⋻⋼⋽⋾⋿⟈⟉⟒⦷⧀⧁⧡⧣⧤⧥⩦⩧⩪⩫⩬⩭⩮⩯⩰⩱⩲⩳⩴⩵⩶⩷⩸⩹⩺⩻⩼⩽⩾⩿⪀⪁⪂⪃⪄⪅⪆⪇⪈⪉⪊⪋⪌⪍⪎⪏⪐⪑⪒⪓⪔⪕⪖⪗⪘⪙⪚⪛⪜⪝⪞⪟⪠⪡⪢⪣⪤⪥⪦⪧⪨⪩⪪⪫⪬⪭⪮⪯⪰⪱⪲⪳⪴⪵⪶⪷⪸⪹⪺⪻⪼⪽⪾⪿⫀⫁⫂⫃⫄⫅⫆⫇⫈⫉⫊⫋⫌⫍⫎⫏⫐⫑⫒⫓⫔⫕⫖⫗⫘⫙⫷⫸⫹⫺⊢⊣" .
-"       \                   "⊔∓∔∸≂≏⊎⊽⋎⋓⧺⧻⨈⨢⨣⨤⨥⨦⨧⨨⨩⨪⨫⨬⨭⨮⨹⨺⩁⩂⩅⩊⩌⩏⩐⩒⩔⩖⩗⩛⩝⩡⩢⩣" .
-"       \                   "⊙⊚⊛⊡⊓∗∙∤⅋≀⊼⋄⋆⋇⋉⋊⋋⋌⋏⋒⟑⦸⦼⦾⦿⧶⧷⨇⨰⨱⨲⨳⨴⨵⨶⨷⨸⨻⨼⨽⩀⩃⩄⩋⩍⩎⩑⩓⩕⩘⩚⩜⩞⩟⩠⫛⊍▷⨝⟕⟖⟗" .
-"       \                   "⇵⟰⟱⤈⤉⤊⤋⤒⤓⥉⥌⥍⥏⥑⥔⥕⥘⥙⥜⥝⥠⥡⥣⥥⥮⥯￪￬"
-
-" same as above, but with character ranges, for performance
-let s:binop_chars_extra = "\\U214B\\U2190-\\U2194\\U219A\\U219B\\U21A0\\U21A3\\U21A6\\U21AE\\U21CE\\U21CF\\U21D2\\U21D4\\U21F4-\\U21FF\\U2208-\\U220D\\U2213\\U2214\\U2217-\\U2219\\U221D\\U2224-\\U222A\\U2237\\U2238\\U223A\\U223B\\U223D\\U223E\\U2240-\\U228B\\U228D-\\U229C\\U229E-\\U22A3\\U22A9\\U22AC\\U22AE\\U22B0-\\U22B7\\U22BB-\\U22BD\\U22C4-\\U22C7\\U22C9-\\U22D3\\U22D5-\\U22ED\\U22F2-\\U22FF\\U25B7\\U27C8\\U27C9\\U27D1\\U27D2\\U27D5-\\U27D7\\U27F0\\U27F1\\U27F5-\\U27F7\\U27F7\\U27F9-\\U27FF\\U2900-\\U2918\\U291D-\\U2920\\U2944-\\U2970\\U29B7\\U29B8\\U29BC\\U29BE-\\U29C1\\U29E1\\U29E3-\\U29E5\\U29F4\\U29F6\\U29F7\\U29FA\\U29FB\\U2A07\\U2A08\\U2A1D\\U2A22-\\U2A2E\\U2A30-\\U2A3D\\U2A40-\\U2A45\\U2A4A-\\U2A58\\U2A5A-\\U2A63\\U2A66\\U2A67\\U2A6A-\\U2AD9\\U2ADB\\U2AF7-\\U2AFA\\U2B30-\\U2B44\\U2B47-\\U2B4C\\UFFE9-\\UFFEC"
-
-" a Julia identifier, sort of
-let s:idregex = '[^' . s:nonidS_chars . '0-9!' . s:uniop_chars . s:binop_chars . '][^' . s:nonidS_chars . s:uniop_chars . s:binop_chars . s:binop_chars_extra . ']*'
-
-let s:operators = '\%(' . '\.\%([-+*/^÷%|&!]\|//\|\\\|<<\|>>>\?\)\?=' .
-      \           '\|'  . '[:$<>]=\|||\|&&\||>\|<|\|<:\|:>\|::\|<<\|>>>\?\|//\|[-=]>\|\.\{3\}' .
-      \           '\|'  . '[' . s:uniop_chars . '!$]' .
-      \           '\|'  . '\.\?[' . s:binop_chars . s:binop_chars_extra . ']' .
-      \           '\)'
-
-function! julia#idundercursor()
-    " TODO...
-    let w = expand('<cword>')
-    " let [l,c] = [line('.'),col('.')]
-    " let ll = getline(l)
-    return w
-endfunction
-
-function! julia#gotodefinition()
-    let w = julia#idundercursor()
-    if empty(w)
-        return ''
-    endif
-    let [l,c] = [line('.'),col('.')]
-    let st = map(synstack(l,c), 'synIDattr(v:val, "name")')
-    let n = len(st)
-    if n > 0 && st[-1] =~# '^julia\%(\%(Range\|Ternary\|CTrans\)\?Operator\|\%(Possible\)\?SymbolS\?\|\%(Bl\|Rep\)\?Keyword\|Conditional\|ParDelim\|Char\|Colon\|Typedef\|Number\|Float\|Const\%(Generic\|Bool\)\|ComplexUnit\|\%(Special\|\%(Octal\|Hex\)Escape\)Char\|UniChar\%(Small\|Large\)\|Comment[LM]\|Todo\|Semicolon\)$'
-        return ''
-    endif
-
-    let comprehension = 0
-    let indollar = 0
-    for i in range(n-1, 0, -1)
-        if st[i] =~# '^juliaDollar\%(Var\|Par\|SqBra\)$'
-            let indollar = 1
-        endif
-        if !indollar && st[i] =~# '^julia\%(\a*String\|QuotedParBlockS\?\)$'
-            return ''
-        endif
-        if st[i] =~# '^julia\%(ParBlock\%(InRange\)\?\|SqBraBlock\|\%(Dollar\|StringVars\)\%(Par\|SqBra\)\)$'
-            let comprehension = 1
-        endif
-    endfor
-
-    let s1 = search('\C\<' . w . '\s*=[^=]', 'bcWzs')
-
-    return
-endfunction
-
-endif
-

autoload/julia_blocks.vim

@@ -1,798 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
-" Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
-" (AKA a collection of horrible hacks)
-
-let s:default_mappings = {
-  \  "moveblock_n" : "]]",
-  \  "moveblock_N" : "][",
-  \  "moveblock_p" : "[[",
-  \  "moveblock_P" : "[]",
-  \
-  \  "move_n" : "]j",
-  \  "move_N" : "]J",
-  \  "move_p" : "[j",
-  \  "move_P" : "[J",
-  \
-  \  "select_a" : "aj",
-  \  "select_i" : "ij",
-  \
-  \  "whereami" : "",
-  \  }
-
-function! s:getmapchars(function)
-  if exists("g:julia_blocks_mappings") && has_key(g:julia_blocks_mappings, a:function)
-    return s:escape(g:julia_blocks_mappings[a:function])
-  else
-    return s:escape(s:default_mappings[a:function])
-  endif
-endfunction
-
-function! s:map_move(function, toend, backwards)
-  let chars = s:getmapchars(a:function)
-  if empty(chars)
-    return
-  endif
-  let fn = "julia_blocks#" . a:function
-  let lhs = "<buffer> <nowait> <silent> " . chars . " "
-  let cnt = ":<C-U>let b:jlblk_count=v:count1"
-  exe "nnoremap " . lhs . cnt
-    \ . " <Bar> call " . fn . "()<CR>"
-  exe "onoremap " . lhs . cnt
-    \ . "<CR><Esc>:call julia_blocks#owrapper_move(v:operator, \"" . fn . "\", " . a:toend . ", " . a:backwards . ")<CR>"
-  exe "xnoremap " . lhs . cnt
-    \ . "<CR>gv<Esc>:call julia_blocks#vwrapper_move(\"" . fn . "\")<CR>"
-  let b:jlblk_mapped[a:function] = 1
-endfunction
-
-function! julia_blocks#owrapper_move(oper, function, toend, backwards)
-  let F = function(a:function)
-
-  let save_redraw = &lazyredraw
-  let save_select = &selection
-
-  let restore_cmds = "\<Esc>"
-    \ . ":let &l:selection = \"" . save_select . "\"\<CR>"
-    \ . ":let &l:lazyredraw = " . save_redraw . "\<CR>"
-    \ . ":\<BS>"
-
-  setlocal lazyredraw
-
-  let start_pos = getpos('.')
-  let b:jlblk_abort_calls_esc = 0
-  call F()
-  let b:jlblk_abort_calls_esc = 1
-  let end_pos = getpos('.')
-  if start_pos == end_pos
-    call feedkeys(restore_cmds, 'n')
-  endif
-
-  let &l:selection = "inclusive"
-  if a:backwards || !a:toend
-    let &l:selection = "exclusive"
-  endif
-  if a:toend && a:backwards
-    let end_pos[2] += 1
-  endif
-
-  if s:compare_pos(start_pos, end_pos) > 0
-    let [start_pos, end_pos] = [end_pos, start_pos]
-  endif
-
-  call setpos("'<", start_pos)
-  call setpos("'>", end_pos)
-
-  " NOTE: the 'c' operator behaves differently, for mysterious reasons. We
-  "       simulate it with 'd' followed by 'i' instead
-  call feedkeys("gv" . (a:oper == "c" ? "d" : a:oper) . restore_cmds . (a:oper == "c" ? "i" : ""), 'n')
-endfunction
-
-function! julia_blocks#vwrapper_move(function)
-  let F = function(a:function)
-
-  let s = getpos('.')
-  let b1 = getpos("'<")
-  let b2 = getpos("'>")
-
-  let b = b1 == s ? b2 : b1
-  call setpos('.', s)
-  let b:jlblk_abort_calls_esc = 0
-  call F()
-  let b:jlblk_abort_calls_esc = 1
-  let e = getpos('.')
-  call setpos('.', b)
-  exe "normal " . visualmode()
-  call setpos('.', e)
-endfunction
-
-function! s:unmap(function)
-  if !get(b:jlblk_mapped, a:function, 0)
-    return
-  endif
-  let chars = s:getmapchars(a:function)
-  if empty(chars)
-    " shouldn't happen
-    return
-  endif
-  let mapids = a:function =~# "^move" ? ["n", "x", "o"] :
-	\      a:function =~# "^select" ? ["x", "o"] :
-	\      ["n"]
-  let fn = "julia_blocks#" . a:function
-  let cmd = "<buffer> " . chars
-  for m in mapids
-    exe m . "unmap " . cmd
-  endfor
-  let b:jlblk_mapped[a:function] = 0
-endfunction
-
-function! s:escape(chars)
-  let c = a:chars
-  let c = substitute(c, '|', '<Bar>', 'g')
-  return c
-endfunction
-
-function! s:map_select(function)
-  let chars = s:getmapchars(a:function)
-  if empty(chars)
-    return
-  endif
-  let fn = "julia_blocks#" . a:function
-  let lhs = "<buffer> <nowait> <silent> " . chars . " "
-  let cnt = ":<C-U>let b:jlblk_inwrapper=1<CR>:let b:jlblk_count=max([v:prevcount,1])<CR>"
-  exe "onoremap " . lhs . "<Esc>" . cnt
-    \ . ":call julia_blocks#owrapper_select(v:operator, \"" . fn . "\")<CR>"
-  exe "xnoremap " . lhs . cnt
-    \ . ":call julia_blocks#vwrapper_select(\"" . fn . "\")<CR>"
-  let b:jlblk_mapped[a:function] = 1
-endfunction
-
-function! julia_blocks#owrapper_select(oper, function) ", toend, backwards)
-  let F = function(a:function)
-
-  let save_redraw = &lazyredraw
-  let save_select = &selection
-
-  let restore_cmds = "\<Esc>"
-    \ . ":let &l:selection = \"" . save_select . "\"\<CR>"
-    \ . ":let &l:lazyredraw = " . save_redraw . "\<CR>"
-    \ . ":\<BS>"
-
-  setlocal lazyredraw
-
-  let b:jlblk_abort_calls_esc = 0
-  let retF = F()
-  let b:jlblk_abort_calls_esc = 1
-  if empty(retF)
-    let b:jlblk_inwrapper = 0
-    call feedkeys(restore_cmds, 'n')
-    return
-  end
-  let [start_pos, end_pos] = retF
-
-  if start_pos == end_pos
-    call feedkeys(restore_cmds, 'n')
-  endif
-
-  let &l:selection = "inclusive"
-
-  call setpos("'<", start_pos)
-  call setpos("'>", end_pos)
-
-  let b:jlblk_inwrapper = 0
-  " NOTE: the 'c' operator behaves differently, for mysterious reasons. We
-  "       simulate it with 'd' followed by 'i' instead
-  call feedkeys("gv" . (a:oper == "c" ? "d" : a:oper) . restore_cmds . (a:oper == "c" ? "i" : ""), 'n')
-endfunction
-
-function! julia_blocks#vwrapper_select(function)
-  let F = function(a:function)
-
-  let b:jlblk_abort_calls_esc = 0
-  let retF = F()
-  let b:jlblk_abort_calls_esc = 1
-  if empty(retF)
-    let b:jlblk_inwrapper = 0
-    return
-  end
-  let [start_pos, end_pos] = retF
-  call setpos("'<", start_pos)
-  call setpos("'>", end_pos)
-  normal! gv
-  let b:jlblk_inwrapper = 0
-endfunction
-
-function! s:map_aux(function)
-  let chars = s:getmapchars(a:function)
-  if empty(chars)
-    return
-  endif
-  let fn = "julia_blocks#" . a:function
-  let lhs = "<buffer> <nowait> <silent> " . chars . " "
-  exe "nnoremap " . lhs . ":<C-U>echo " . fn . "()<CR>"
-  let b:jlblk_mapped[a:function] = 1
-endfunction
-
-let s:julia_blocks_functions = {
-      \  "moveblock_N": [1, 0],
-      \  "moveblock_n": [0, 0],
-      \  "moveblock_p": [0, 1],
-      \  "moveblock_P": [1, 1],
-      \
-      \  "move_N": [1, 0],
-      \  "move_n": [0, 0],
-      \  "move_p": [0, 1],
-      \  "move_P": [1, 1],
-      \
-      \  "select_a": [],
-      \  "select_i": [],
-      \
-      \  "whereami": [],
-      \  }
-
-function! julia_blocks#init_mappings()
-  let b:jlblk_mapped = {}
-  for f in keys(s:julia_blocks_functions)
-    if f =~# "^move"
-      let [te, bw] = s:julia_blocks_functions[f]
-      call s:map_move(f, te, bw)
-    elseif f =~# "^select"
-      call s:map_select(f)
-    else
-      call s:map_aux(f)
-    endif
-  endfor
-  call julia_blocks#select_reset()
-  augroup JuliaBlocks
-    au!
-    au InsertEnter *.jl call julia_blocks#select_reset()
-    au CursorMoved *.jl call s:cursor_moved()
-  augroup END
-
-  " we would need some autocmd event associated with exiting from
-  " visual mode, but there isn't any, so we resort to this crude
-  " hack
-  " ACTUALLY this creates more problems than it solves, so the crude hack
-  " is just disabled
-  "vnoremap <buffer><silent><unique> <Esc> <Esc>:call julia_blocks#select_reset()<CR>
-endfunction
-
-function! julia_blocks#remove_mappings()
-  if exists("b:jlblk_mapped")
-    for f in keys(s:julia_blocks_functions)
-      call s:unmap(f)
-    endfor
-  endif
-  unlet! b:jlblk_save_pos b:jlblk_view b:jlblk_count b:jlblk_abort_calls_esc
-  unlet! b:jlblk_inwrapper b:jlblk_did_select b:jlblk_doing_select
-  unlet! b:jlblk_last_start_pos b:jlblk_last_end_pos b:jlblk_last_mode
-  augroup JuliaBlocks
-    au!
-  augroup END
-  augroup! JuliaBlocks
-  let md = maparg("<Esc>", "x", 0, 1)
-  if !empty(md) && md["buffer"]
-    vunmap <buffer> <Esc>
-  endif
-endfunction
-
-function! s:restore_view()
-  "redraw! " would ensure correct behaviour, but is annoying
-  let pos = getpos('.')
-  if pos == b:jlblk_save_pos
-    call winrestview(b:jlblk_view)
-    return
-  endif
-  let oldtopline = b:jlblk_view["topline"]
-  let newtopline = winsaveview()["topline"]
-  let l = pos[1]
-  if l >= oldtopline + &l:scrolloff && l <= oldtopline + winheight(0) - 1 - &l:scrolloff
-    if newtopline > oldtopline
-      exe ":normal! " . (newtopline - oldtopline) . "\<C-Y>"
-    elseif newtopline < oldtopline
-      exe ":normal! " . (oldtopline - newtopline) . "\<C-E>"
-    endif
-  " these reduce the scrolling to the minimum (which is maybe not
-  " standard ViM behaviour?)
-  elseif newtopline < oldtopline && (l - newtopline - &l:scrolloff) > 0
-    exe ":normal! " . (l - newtopline - &l:scrolloff) . "\<C-E>"
-  elseif newtopline > oldtopline && (newtopline + &l:scrolloff - l) > 0
-    exe ":normal! " . (l - newtopline - &l:scrolloff) . "\<C-E>"
-  endif
-  call setpos('.', pos) " make sure we didn't screw up
-                        " (since winsaveview may not be up to date)
-endfunction
-
-function! s:abort()
-  call setpos('.', b:jlblk_save_pos)
-  call s:restore_view()
-  if get(b:, "jlblk_abort_calls_esc", 1)
-    call feedkeys("\<Esc>", 'n')
-  endif
-  return 0
-endfunction
-
-function! s:set_mark_tick(...)
-  " This could be a one-liner:
-  "   call setpos("''", b:jlblk_save_pos)
-  " but we want to append to the jumplist,
-  " which setpos doesn't do
-  let p = getpos('.')
-  call setpos('.', b:jlblk_save_pos)
-  normal! m'
-  call setpos('.', p)
-endfunction
-
-function! s:get_save_pos(...)
-  if !exists("b:jlblk_save_pos") || (a:0 == 0) || (a:0 > 0 && a:1)
-    let b:jlblk_save_pos = getpos('.')
-  endif
-  let b:jlblk_view = winsaveview()
-endfunction
-
-function! s:on_end()
-  return getline('.')[col('.')-1] =~# '\k' && expand("<cword>") =~# b:julia_end_keywords
-endfunction
-
-function! s:on_begin()
-  let [l,c] = [line('.'), col('.')]
-  normal! ^
-  let patt = '\%<'.(c+1).'c\(' . b:julia_begin_keywordsm . '\)\%>'.(c-1).'c'
-  let n = search(patt, 'Wnc', l)
-  call cursor(l, c)
-  return n > 0
-endfunction
-
-function! s:matchit()
-  let lkj = exists(":lockjumps") == 2 ? "lockjumps " : ""
-  exe lkj . "normal %"
-endfunction
-
-function! s:move_before_begin()
-  call search(b:julia_begin_keywordsm, 'Wbc')
-  normal! h
-endfunction
-
-function! s:cycle_until_end()
-  let pos = getpos('.')
-  while !s:on_end()
-    call s:matchit()
-    let c = 0
-    if getpos('.') == pos || c > 1000
-      " shouldn't happen, but let's avoid infinite loops anyway
-      return 0
-    endif
-    let c += 1
-  endwhile
-  return 1
-endfunction
-
-function! s:moveto_block_delim(toend, backwards, ...)
-  let pattern = a:toend ? b:julia_end_keywords : b:julia_begin_keywordsm
-  let flags = a:backwards ? 'Wb' : 'W'
-  let cnt = a:0 > 0 ? a:1 : b:jlblk_count
-  if !a:toend && a:backwards && s:on_begin()
-    call s:move_before_begin()
-  endif
-  let ret = 0
-  for c in range(cnt)
-    if a:toend && a:backwards && s:on_end()
-      normal! l
-      normal! bh
-    endif
-    while 1
-      let searchret = search(pattern, flags)
-      if !searchret
-	return ret
-      endif
-      exe "let skip = " . b:match_skip
-      if !skip
-	let ret = 1
-	break
-      endif
-    endwhile
-  endfor
-  return ret
-endfunction
-
-function! s:compare_pos(pos1, pos2)
-  if a:pos1[1] < a:pos2[1]
-    return -1
-  elseif a:pos1[1] > a:pos2[1]
-    return 1
-  elseif a:pos1[2] < a:pos2[2]
-    return -1
-  elseif a:pos1[2] > a:pos2[2]
-    return 1
-  else
-    return 0
-  endif
-endfunction
-
-function! julia_blocks#move_N()
-  call s:get_save_pos()
-
-  let ret = s:moveto_block_delim(1, 0)
-  if !ret
-    return s:abort()
-  endif
-
-  normal! e
-  call s:set_mark_tick()
-
-  return 1
-endfunction
-
-function! julia_blocks#move_n()
-  call s:get_save_pos()
-
-  let ret = s:moveto_block_delim(0, 0)
-  if !ret
-    return s:abort()
-  endif
-
-  call s:set_mark_tick()
-
-  return 1
-endfunction
-
-function! julia_blocks#move_p()
-  call s:get_save_pos()
-
-  let ret = s:moveto_block_delim(0, 1)
-  if !ret
-    return s:abort()
-  endif
-
-  call s:set_mark_tick()
-
-  return 1
-endfunction
-
-function! julia_blocks#move_P()
-  call s:get_save_pos()
-
-  let ret = s:moveto_block_delim(1, 1)
-  if !ret
-    return s:abort()
-  endif
-
-  normal! e
-  call s:set_mark_tick()
-
-  return 1
-endfunction
-
-function! s:moveto_currentblock_end()
-  let flags = 'W'
-  if s:on_end()
-    let flags .= 'c'
-    " NOTE: using "normal! lb" fails at the end of the file (?!)
-    normal! l
-    normal! b
-  endif
-
-  let ret = searchpair(b:julia_begin_keywordsm, '', b:julia_end_keywords, flags, b:match_skip)
-  if ret <= 0
-    return s:abort()
-  endif
-
-  normal! e
-  return 1
-endfunction
-
-function! julia_blocks#moveblock_N()
-  call s:get_save_pos()
-
-  let ret = 0
-  for c in range(b:jlblk_count)
-    let last_seen_pos = getpos('.')
-    if s:on_end()
-      normal! hel
-      let save_pos = getpos('.')
-      let ret_start = s:moveto_block_delim(0, 0, 1)
-      let start1_pos = ret_start ? getpos('.') : [0,0,0,0]
-      call setpos('.', save_pos)
-      if s:on_end()
-	normal! h
-      endif
-      let ret_end = s:moveto_block_delim(1, 0, 1)
-      let end1_pos = ret_end ? getpos('.')  : [0,0,0,0]
-
-      if ret_start && (!ret_end || s:compare_pos(start1_pos, end1_pos) < 0)
-	call setpos('.', start1_pos)
-      else
-	call setpos('.', save_pos)
-      endif
-    endif
-
-    let moveret = s:moveto_currentblock_end()
-    if !moveret && c == 0
-      let moveret = s:moveto_block_delim(0, 0, 1) && s:cycle_until_end()
-      if moveret
-        normal! e
-      endif
-    endif
-    if !moveret
-      call setpos('.', last_seen_pos)
-      break
-    endif
-
-    let ret = 1
-  endfor
-  if !ret
-    return s:abort()
-  endif
-
-  call s:set_mark_tick()
-
-  return 1
-endfunction
-
-function! julia_blocks#moveblock_n()
-  call s:get_save_pos()
-
-  let ret = 0
-  for c in range(b:jlblk_count)
-    let last_seen_pos = getpos('.')
-
-    call s:moveto_currentblock_end()
-    if s:moveto_block_delim(0, 0, 1)
-      let ret = 1
-    else
-      call setpos('.', last_seen_pos)
-      break
-    endif
-  endfor
-
-  if !ret
-    return s:abort()
-  endif
-
-  call s:set_mark_tick()
-
-  return 1
-endfunction
-
-function! julia_blocks#moveblock_p()
-  call s:get_save_pos()
-
-  let ret = 0
-  for c in range(b:jlblk_count)
-    let last_seen_pos = getpos('.')
-    if s:on_begin()
-      call s:move_before_begin()
-      if s:on_end()
-	normal! l
-      endif
-      let save_pos = getpos('.')
-      let ret_start = s:moveto_block_delim(0, 1, 1)
-      let start1_pos = ret_start ? getpos('.') : [0,0,0,0]
-      call setpos('.', save_pos)
-      let ret_end = s:moveto_block_delim(1, 1, 1)
-      let end1_pos = ret_end ? getpos('.') : [0,0,0,0]
-
-      if ret_end && (!ret_start || s:compare_pos(start1_pos, end1_pos) < 0)
-	call setpos('.', end1_pos)
-      else
-	call setpos('.', save_pos)
-      endif
-    endif
-
-    let moveret = s:moveto_currentblock_end()
-    if !moveret && c == 0
-      let moveret = s:moveto_block_delim(1, 1, 1)
-    endif
-    if !moveret
-      call setpos('.', last_seen_pos)
-      break
-    endif
-
-    call s:matchit()
-    let ret = 1
-  endfor
-  if !ret
-    return s:abort()
-  endif
-
-  call s:set_mark_tick()
-  call s:restore_view()
-
-  return 1
-endfunction
-
-function! julia_blocks#moveblock_P()
-  call s:get_save_pos()
-
-  let ret = 0
-  for c in range(b:jlblk_count)
-    let last_seen_pos = getpos('.')
-
-    call s:moveto_currentblock_end()
-    if s:on_end()
-      call s:matchit()
-    endif
-
-    if s:moveto_block_delim(1, 1, 1)
-      " NOTE: normal! he does not work unless &whichwrap inlcudes h
-      normal! h
-      normal! e
-      let ret = 1
-    else
-      call setpos('.', last_seen_pos)
-    endif
-  endfor
-
-  if !ret
-    return s:abort()
-  endif
-
-  call s:set_mark_tick()
-  call s:restore_view()
-
-  return 1
-endfunction
-
-function! julia_blocks#whereami()
-  let b:jlblk_count = v:count1
-  let save_redraw = &lazyredraw
-  setlocal lazyredraw
-  let pos = getpos('.')
-  let ret = julia_blocks#select_a('w')
-  if empty(ret)
-    call setpos('.', pos)
-    let &l:lazyredraw = save_redraw
-    return ""
-  end
-  let [start_pos, end_pos] = ret
-  let m = getline(start_pos[1])[start_pos[2]-1:]
-
-  " If cursor_moved was not forced from select_a, we force it now
-  " (TODO: this is *really* ugly)
-  if end_pos != pos
-    call s:cursor_moved(1)
-  endif
-  call setpos('.', pos)
-  call s:restore_view()
-  let &l:lazyredraw = save_redraw
-  return m
-endfunction
-
-" Block text objects
-
-function! s:find_block(current_mode)
-
-  let flags = 'W'
-
-  if b:jlblk_did_select
-    call setpos('.', b:jlblk_last_start_pos)
-    if !s:cycle_until_end()
-      return s:abort()
-    endif
-    if !(a:current_mode[0] == 'a' && a:current_mode == b:jlblk_last_mode)
-      let flags .= 'c'
-    endif
-  elseif s:on_end()
-    let flags .= 'c'
-    " NOTE: using "normal! lb" fails at the end of the file (?!)
-    normal! l
-    normal! b
-  endif
-  let searchret = searchpair(b:julia_begin_keywordsm, '', b:julia_end_keywords, flags, b:match_skip)
-  if searchret <= 0
-    if !b:jlblk_did_select
-      return s:abort()
-    else
-     call setpos('.', b:jlblk_last_end_pos)
-    endif
-  endif
-
-  let end_pos = getpos('.')
-  " Jump to match
-  call s:matchit()
-  let start_pos = getpos('.')
-
-  let b:jlblk_last_start_pos = copy(start_pos)
-  let b:jlblk_last_end_pos = copy(end_pos)
-
-  return [start_pos, end_pos]
-endfunction
-
-function! s:repeated_find(ai_mode)
-  let repeat = b:jlblk_count + (a:ai_mode == 'i' && v:count1 > 1 ? 1 : 0)
-  for c in range(repeat)
-    let current_mode = (c < repeat - 1 ? 'a' : a:ai_mode)
-    let ret_find_block = s:find_block(current_mode)
-    if empty(ret_find_block)
-      return 0
-    endif
-    let [start_pos, end_pos] = ret_find_block
-    call setpos('.', end_pos)
-    let b:jlblk_last_mode = current_mode
-    if c < repeat - 1
-      let b:jlblk_doing_select = 0
-      let b:jlblk_did_select = 1
-    endif
-  endfor
-  return [start_pos, end_pos]
-endfunction
-
-function! julia_blocks#select_a(...)
-  let mode_flag = a:0 > 0 ? a:1 : ''
-  call s:get_save_pos(!b:jlblk_did_select)
-  let current_pos = getpos('.')
-  let ret_find_block = s:repeated_find('a' . mode_flag)
-  if empty(ret_find_block)
-    return 0
-  endif
-  let [start_pos, end_pos] = ret_find_block
-
-  call setpos('.', end_pos)
-  normal! e
-  let end_pos = getpos('.')
-
-  let b:jlblk_doing_select = 1
-
-  " CursorMove is only triggered if end_pos
-  " end_pos is different than the staring position;
-  " so when starting from the 'd' in 'end' we need to
-  " force it
-  if current_pos == end_pos
-    call s:cursor_moved(1)
-  endif
-
-  call s:set_mark_tick()
-  return [start_pos, end_pos]
-endfunction
-
-function! julia_blocks#select_i()
-  call s:get_save_pos(!b:jlblk_did_select)
-  let current_pos = getpos('.')
-  let ret_find_block = s:repeated_find('i')
-  if empty(ret_find_block)
-    return 0
-  endif
-  let [start_pos, end_pos] = ret_find_block
-
-  if end_pos[1] <= start_pos[1]+1
-    return s:abort()
-  endif
-
-  call setpos('.', end_pos)
-
-  let b:jlblk_doing_select = 1
-
-  let start_pos[1] += 1
-  call setpos('.', start_pos)
-  normal! ^
-  let start_pos = getpos('.')
-  let end_pos[1] -= 1
-  let end_pos[2] = len(getline(end_pos[1]))
-
-  " CursorMove is only triggered if end_pos
-  " end_pos is different than the staring position;
-  " so when starting from the 'd' in 'end' we need to
-  " force it
-  if current_pos == end_pos
-    call s:cursor_moved(1)
-  endif
-
-  call s:set_mark_tick()
-  return [start_pos, end_pos]
-endfunction
-
-function julia_blocks#select_reset()
-  let b:jlblk_did_select = 0
-  let b:jlblk_doing_select = 0
-  let b:jlblk_inwrapper = 0
-  let b:jlblk_last_mode = ""
-endfunction
-
-function! s:cursor_moved(...)
-  if b:jlblk_inwrapper && !(a:0 > 0 && a:1)
-    return
-  endif
-  let b:jlblk_did_select = b:jlblk_doing_select
-  let b:jlblk_doing_select = 0
-endfunction
-
-endif

autoload/python/utils.vim

@@ -1,21 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  
-" Sometimes Python issues debugging messages
-" which don't belong to a call stack context
-" this function filters these messages
-function! python#utils#fix_qflist() " {{{
-  let l:traceback = []
-  let l:qflist = getqflist()
-
-  for l:item in l:qflist
-    if !empty(l:item.type)
-      call add(l:traceback, l:item)
-    endif
-  endfor
-
-  if !empty(l:traceback)
-    call setqflist(l:traceback)
-  endif
-endfunction " }}}
-
-endif

autoload/racket.vim

@@ -1,7 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
-if !exists("g:raco_command")
-  let g:raco_command = system("which raco")
-endif
-
-endif

autoload/rubycomplete.vim

@@ -198,7 +198,7 @@ function! rubycomplete#Complete(findstart, base)
             if c =~ '\w'
                 continue
             elseif ! c =~ '\.'
-                let idx = -1
+                idx = -1
                 break
             else
                 break
@@ -589,13 +589,11 @@ class VimRubyCompletion
 # {{{ main completion code
   def self.preload_rails
     a = VimRubyCompletion.new
-    if VIM::evaluate("has('nvim')") == 0
-      require 'thread'
-      Thread.new(a) do |b|
-        begin
-        b.load_rails
-        rescue
-        end
+    require 'Thread'
+    Thread.new(a) do |b|
+      begin
+      b.load_rails
+      rescue
       end
     end
     a.load_rails

autoload/rust.vim

@@ -3,7 +3,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 " Jump {{{1
 
@@ -367,57 +366,53 @@ endfunction
 " gist.vim available under the BSD license, available at
 " http://github.com/mattn/gist-vim
 function! s:has_webapi()
-    if !exists("*webapi#http#post")
-	try
-	    call webapi#http#post()
-	catch
-	endtry
-    endif
-    return exists("*webapi#http#post")
+  if !exists("*webapi#http#post")
+    try
+      call webapi#http#post()
+    catch
+    endtry
+  endif
+  return exists("*webapi#http#post")
 endfunction
 
 function! rust#Play(count, line1, line2, ...) abort
-    redraw
+  redraw
 
-    let l:rust_playpen_url = get(g:, 'rust_playpen_url', 'https://play.rust-lang.org/')
-    let l:rust_shortener_url = get(g:, 'rust_shortener_url', 'https://is.gd/')
+  let l:rust_playpen_url = get(g:, 'rust_playpen_url', 'https://play.rust-lang.org/')
+  let l:rust_shortener_url = get(g:, 'rust_shortener_url', 'https://is.gd/')
 
-    if !s:has_webapi()
-	echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
-	return
-    endif
+  if !s:has_webapi()
+    echohl ErrorMsg | echomsg ':RustPlay depends on webapi.vim (https://github.com/mattn/webapi-vim)' | echohl None
+    return
+  endif
 
-    let bufname = bufname('%')
-    if a:count < 1
-	let content = join(getline(a:line1, a:line2), "\n")
-    else
-	let save_regcont = @"
-	let save_regtype = getregtype('"')
-	silent! normal! gvy
-	let content = @"
-	call setreg('"', save_regcont, save_regtype)
-    endif
+  let bufname = bufname('%')
+  if a:count < 1
+    let content = join(getline(a:line1, a:line2), "\n")
+  else
+    let save_regcont = @"
+    let save_regtype = getregtype('"')
+    silent! normal! gvy
+    let content = @"
+    call setreg('"', save_regcont, save_regtype)
+  endif
 
-    let body = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
+  let body = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
 
-    if strlen(body) > 5000
-	echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(body).')' | echohl None
-	return
-    endif
+  if strlen(body) > 5000
+    echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(body).')' | echohl None
+    return
+  endif
 
-    let payload = "format=simple&url=".webapi#http#encodeURI(body)
-    let res = webapi#http#post(l:rust_shortener_url.'create.php', payload, {})
-    let url = res.content
+  let payload = "format=simple&url=".webapi#http#encodeURI(body)
+  let res = webapi#http#post(l:rust_shortener_url.'create.php', payload, {})
+  let url = res.content
 
-    if exists('g:rust_clip_command')
-	call system(g:rust_clip_command, url)
-    endif
-
-    redraw | echomsg 'Done: '.url
+  redraw | echomsg 'Done: '.url
 endfunction
 
 " }}}1
 
-" vim: set noet sw=8 ts=8:
+" vim: set noet sw=4 ts=4:
 
 endif

autoload/rustfmt.vim

@@ -3,109 +3,85 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
 " Adapted from https://github.com/fatih/vim-go
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if !exists("g:rustfmt_autosave")
-	let g:rustfmt_autosave = 0
+  let g:rustfmt_autosave = 0
 endif
 
 if !exists("g:rustfmt_command")
-	let g:rustfmt_command = "rustfmt"
+    let g:rustfmt_command = "rustfmt"
 endif
 
 if !exists("g:rustfmt_options")
-	let g:rustfmt_options = ""
+  let g:rustfmt_options = ""
 endif
 
 if !exists("g:rustfmt_fail_silently")
-	let g:rustfmt_fail_silently = 0
+  let g:rustfmt_fail_silently = 0
 endif
 
 let s:got_fmt_error = 0
 
-function! s:RustfmtCommandRange(filename, line1, line2)
-	let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
-	return printf("%s %s --write-mode=overwrite --file-lines '[%s]'", g:rustfmt_command, g:rustfmt_options, json_encode(l:arg))
-endfunction
-
-function! s:RustfmtCommand(filename)
-	return g:rustfmt_command . " --write-mode=overwrite " . g:rustfmt_options . " " . shellescape(a:filename)
-endfunction
-
-function! s:RunRustfmt(command, curw, tmpname)
-	if exists("*systemlist")
-		let out = systemlist(a:command)
-	else
-		let out = split(system(a:command), '\r\?\n')
-	endif
-
-	if v:shell_error == 0 || v:shell_error == 3
-		" remove undo point caused via BufWritePre
-		try | silent undojoin | catch | endtry
-
-		" Replace current file with temp file, then reload buffer
-		call rename(a:tmpname, expand('%'))
-		silent edit!
-		let &syntax = &syntax
-
-		" only clear location list if it was previously filled to prevent
-		" clobbering other additions
-		if s:got_fmt_error
-			let s:got_fmt_error = 0
-			call setloclist(0, [])
-			lwindow
-		endif
-	elseif g:rustfmt_fail_silently == 0
-		" otherwise get the errors and put them in the location list
-		let errors = []
-
-		for line in out
-			" src/lib.rs:13:5: 13:10 error: expected `,`, or `}`, found `value`
-			let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\):\s*\(\d\+:\d\+\s*\)\?\s*error: \(.*\)')
-			if !empty(tokens)
-				call add(errors, {"filename": @%,
-						 \"lnum":     tokens[2],
-						 \"col":      tokens[3],
-						 \"text":     tokens[5]})
-			endif
-		endfor
-
-		if empty(errors)
-			% | " Couldn't detect rustfmt error format, output errors
-		endif
-
-		if !empty(errors)
-			call setloclist(0, errors, 'r')
-			echohl Error | echomsg "rustfmt returned error" | echohl None
-		endif
-
-		let s:got_fmt_error = 1
-		lwindow
-		" We didn't use the temp file, so clean up
-		call delete(a:tmpname)
-	endif
-
-	call winrestview(a:curw)
-endfunction
-
-function! rustfmt#FormatRange(line1, line2)
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
-
-	let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
-
-	call s:RunRustfmt(command, l:curw, l:tmpname)
-endfunction
-
 function! rustfmt#Format()
-	let l:curw = winsaveview()
-	let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
-	call writefile(getline(1, '$'), l:tmpname)
+  let l:curw = winsaveview()
+  let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
+  call writefile(getline(1, '$'), l:tmpname)
 
-	let command = s:RustfmtCommand(l:tmpname)
+  let command = g:rustfmt_command . " --write-mode=overwrite "
 
-	call s:RunRustfmt(command, l:curw, l:tmpname)
+  if exists("*systemlist")
+    let out = systemlist(command . g:rustfmt_options . " " . shellescape(l:tmpname))
+  else
+    let out = split(system(command . g:rustfmt_options . " " . shellescape(l:tmpname)), '\r\?\n')
+  endif
+
+  if v:shell_error == 0 || v:shell_error == 3
+    " remove undo point caused via BufWritePre
+    try | silent undojoin | catch | endtry
+
+    " Replace current file with temp file, then reload buffer
+    call rename(l:tmpname, expand('%'))
+    silent edit!
+    let &syntax = &syntax
+
+    " only clear location list if it was previously filled to prevent
+    " clobbering other additions
+    if s:got_fmt_error
+      let s:got_fmt_error = 0
+      call setloclist(0, [])
+      lwindow
+    endif
+  elseif g:rustfmt_fail_silently == 0
+    " otherwise get the errors and put them in the location list
+    let errors = []
+
+    for line in out
+      " src/lib.rs:13:5: 13:10 error: expected `,`, or `}`, found `value`
+      let tokens = matchlist(line, '^\(.\{-}\):\(\d\+\):\(\d\+\):\s*\(\d\+:\d\+\s*\)\?\s*error: \(.*\)')
+      if !empty(tokens)
+        call add(errors, {"filename": @%,
+                         \"lnum":     tokens[2],
+                         \"col":      tokens[3],
+                         \"text":     tokens[5]})
+      endif
+    endfor
+
+    if empty(errors)
+      % | " Couldn't detect rustfmt error format, output errors
+    endif
+
+    if !empty(errors)
+      call setloclist(0, errors, 'r')
+      echohl Error | echomsg "rustfmt returned error" | echohl None
+    endif
+
+    let s:got_fmt_error = 1
+    lwindow
+    " We didn't use the temp file, so clean up
+    call delete(l:tmpname)
+  endif
+
+  call winrestview(l:curw)
 endfunction
 
 endif

autoload/scss_indent.vim

@@ -1,41 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
-  
-" usage:
-" set indentexpr=scss_indent#GetIndent(v:lnum)
-fun! scss_indent#GetIndent(lnum)
-  " { -> increase indent
-  " } -> decrease indent
-  if a:lnum == 1
-    " start at 0 indentation
-    return 0
-  endif
-
-  " try to find last line ending with { or }
-  " ignoring // comments
-  let regex = '\([{}]\)\%(\/\/.*\)\?$'
-  let nr = search(regex, 'bnW')
-  if nr > 0
-    let last = indent(nr)
-    let m = matchlist(getline(nr), regex)
-    let m_curr = matchlist(getline(a:lnum), regex)
-    echoe string(m).string(m_curr)
-    if !empty(m_curr) && m_curr[1] == '}' && m[1] == '{'
-      " last was open, current is close, use same indent
-      return last
-    elseif !empty(m_curr) && m_curr[1] == '}' && m[1] == '}'
-      " } line and last line was }: decrease
-      return last - &sw
-    endif
-    if m[1] == '{'
-      " line after {: increase indent
-      return last + &sw
-    else
-      " line after } or { - same indent
-      return last
-    endif
-  else
-    return 0
-  endif
-endfun
-
-endif

autoload/vifm/edit.vim

@@ -1,18 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
-" common functions for vifm command-line editing buffer filetype plugins
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: August 18, 2013
-
-" Prepare buffer
-function! vifm#edit#Init()
-    " Mappings for quick leaving the buffer (behavior similar to Command line
-    " buffer in Vim)
-    nnoremap <buffer> <cr> :copy 0 \| wq<cr>
-    imap <buffer> <cr> <esc><cr>
-
-    " Start buffer editing in insert mode
-    startinsert
-endfunction
-
-endif

autoload/vital/crystal.vital

@@ -1,10 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-  
-crystal
-a977489
-
-Process
-Web.JSON
-ColorEcho
-
-endif

autoload/xml/aria.vim

@@ -3,220 +3,31 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
 " Maintainer:     othree <othree@gmail.com>
-" Last Change:    2017 Mar 07
+" Last Change:    2010 Sep 09
 
 " WAI_ARIA: {{{
-" Ref: https://www.w3.org/TR/wai-aria-1.1/
-" Version: W3C Candidate Recommendation 27 October 2016
+" Ref: http://www.w3.org/TR/wai-aria/
+" Version: Draft 15 December 2009
 
 let abstract_role = {}
 let role_attributes = {}
 let default_role = {}
 
-" Ref: https://www.w3.org/TR/wai-aria-1.1/#roles_categorization
-" Version: W3C Candidate Recommendation 27 October 2016
-let widget_role = [
-    \ 'alert',
-    \ 'alertdialog',
-    \ 'button',
-    \ 'checkbox',
-    \ 'combobox',
-    \ 'dialog',
-    \ 'gridcell',
-    \ 'link',
-    \ 'log',
-    \ 'marquee',
-    \ 'menuitem',
-    \ 'menuitemcheckbox',
-    \ 'menuitemradio',
-    \ 'option',
-    \ 'progressbar',
-    \ 'radio',
-    \ 'radiogroup',
-    \ 'scrollbar',
-    \ 'searchbox',
-    \ 'slider',
-    \ 'spinbutton',
-    \ 'status',
-    \ 'switch',
-    \ 'tab',
-    \ 'tabpanel',
-    \ 'textbox',
-    \ 'timer',
-    \ 'tooltip',
-    \ 'treeitem',
-    \ 'combobox',
-    \ 'grid',
-    \ 'listbox',
-    \ 'menu',
-    \ 'menubar',
-    \ 'radiogroup',
-    \ 'tablist',
-    \ 'tree',
-    \ 'treegrid'
-\ ]
-
-let document_structure = [
-    \ 'article',
-    \ 'cell',
-    \ 'columnheader',
-    \ 'definition',
-    \ 'directory',
-    \ 'document',
-    \ 'feed',
-    \ 'figure',
-    \ 'group',
-    \ 'heading',
-    \ 'img',
-    \ 'list',
-    \ 'listitem',
-    \ 'math',
-    \ 'none',
-    \ 'note',
-    \ 'presentation',
-    \ 'region',
-    \ 'row',
-    \ 'rowheader',
-    \ 'separator',
-    \ 'table',
-    \ 'term'
-\ ]
-
-let landmark_role = [
-    \ 'application',
-    \ 'banner',
-    \ 'complementary',
-    \ 'contentinfo',
-    \ 'form',
-    \ 'main',
-    \ 'navigation',
-    \ 'search'
-\ ]
-
-" Ref: https://www.w3.org/TR/dpub-aria-1.0/
-" Version: W3C Candidate Recommendation 15 December 2016
-let dpub_role = [
-    \ 'dpub-abstract',
-    \ 'dpub-afterword',
-    \ 'dpub-appendix',
-    \ 'dpub-biblioentry',
-    \ 'dpub-bibliography',
-    \ 'dpub-biblioref',
-    \ 'dpub-chapter',
-    \ 'dpub-cover',
-    \ 'dpub-epilogue',
-    \ 'dpub-footnote',
-    \ 'dpub-footnotes',
-    \ 'dpub-foreword',
-    \ 'dpub-glossary',
-    \ 'dpub-glossdef',
-    \ 'dpub-glossref',
-    \ 'dpub-glossterm',
-    \ 'dpub-index',
-    \ 'dpub-locator',
-    \ 'dpub-noteref',
-    \ 'dpub-notice',
-    \ 'dpub-pagebreak',
-    \ 'dpub-pagelist',
-    \ 'dpub-part',
-    \ 'dpub-preface',
-    \ 'dpub-prologue',
-    \ 'dpub-pullquote',
-    \ 'dpub-qna',
-    \ 'dpub-subtitle',
-    \ 'dpub-tip',
-    \ 'dpub-title',
-    \ 'dpub-toc'
-\ ]
-
+" Ref: http://www.w3.org/TR/wai-aria/roles
+" Version: Draft 15 December 2009
+let widget_role = ['alert', 'alertdialog', 'button', 'checkbox', 'combobox', 'dialog', 'gridcell', 'link', 'log', 'marquee', 'menuitem', 'menuitemcheckbox', 'menuitemradio', 'option', 'progressbar', 'radio', 'radiogroup', 'scrollbar', 'slider', 'spinbutton', 'status', 'tab', 'tabpanel', 'textbox', 'timer', 'tooltip', 'treeitem', 'combobox', 'grid', 'listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid']
+let document_structure = ['article', 'columnheader', 'definition', 'directory', 'document', 'group', 'heading', 'img', 'list', 'listitem', 'math', 'note', 'presentation', 'region', 'row', 'rowheader', 'separator']
+let landmark_role = ['application', 'banner', 'complementary', 'contentinfo', 'form', 'main', 'navigation', 'search']
 let role = extend(widget_role, document_structure)
 let role = extend(role, landmark_role)
-let role = extend(role, dpub_role)
 
-" https://www.w3.org/TR/wai-aria-1.1/#states_and_properties
-let global_states_and_properties = {
-    \ 'aria-atomic': ['true', 'false'],
-    \ 'aria-busy': ['true', 'false'],
-    \ 'aria-controls': [],
-    \ 'aria-current': [],
-    \ 'aria-describedby': [],
-    \ 'aria-disabled': ['true', 'false'],
-    \ 'aria-dropeffect': ['copy', 'move', 'link', 'execute', 'popup', 'none'],
-    \ 'aria-errormessage': [],
-    \ 'aria-flowto': [],
-    \ 'aria-grabbed': ['true', 'false', 'undefined'],
-    \ 'aria-haspopup': ['true', 'false'],
-    \ 'aria-hidden': ['true', 'false'],
-    \ 'aria-invalid': ['grammar', 'spelling', 'true', 'false'],
-    \ 'aria-keyshortcuts': [],
-    \ 'aria-label': [],
-    \ 'aria-labelledby': [],
-    \ 'aria-live': ['off', 'polite', 'assertive'],
-    \ 'aria-owns': [],
-    \ 'aria-relevant': ['additions', 'removals', 'text', 'all'],
-    \ 'aria-roledescription': [],
-\ }
-
-let widget_attributes = {
-    \ 'aria-autocomplete': ['inline', 'list', 'both', 'none'],
-    \ 'aria-checked': ['true', 'false', 'mixed', 'undefined'],
-    \ 'aria-disabled': ['true', 'false'],
-    \ 'aria-errormessage': [],
-    \ 'aria-expanded': ['true', 'false', 'undefined'],
-    \ 'aria-haspopup': ['true', 'false'],
-    \ 'aria-hidden': ['true', 'false'],
-    \ 'aria-invalid': ['grammar', 'spelling', 'true', 'false'],
-    \ 'aria-label': [],
-    \ 'aria-level': [],
-    \ 'aria-modal': ['true', 'false'],
-    \ 'aria-multiline': ['true', 'false'],
-    \ 'aria-multiselectable': ['true', 'false'],
-    \ 'aria-orientation': ['horizontal', 'vertical'],
-    \ 'aria-placeholder': [],
-    \ 'aria-pressed': ['true', 'false', 'mixed', 'undefined'],
-    \ 'aria-readonly': ['true', 'false'],
-    \ 'aria-required': ['true', 'false'],
-    \ 'aria-selected': ['true', 'false', 'undefined'],
-    \ 'aria-sort': ['ascending', 'descending', 'none', 'other'],
-    \ 'aria-valuemax': [],
-    \ 'aria-valuemin': [],
-    \ 'aria-valuenow': [],
-    \ 'aria-valuetext': []
-\ }
-
-let live_region_attributes = {
-    \ 'aria-atomic': ['true', 'false'],
-    \ 'aria-busy': ['true', 'false'],
-    \ 'aria-live': ['off', 'polite', 'assertive'],
-    \ 'aria-relevant': ['additions', 'removals', 'text', 'all', 'additions text']
-\ }
-
-let drag_and_drop_attributes = {
-    \ 'aria-dropeffect': ['copy', 'move', 'link', 'execute', 'popup', 'none'],
-    \ 'aria-grabbed': ['true', 'false', 'undefined']
-\ }
-
-let relationship_attributes = {
-    \ 'aria-activedescendant': [],
-    \ 'aria-colcount': [],
-    \ 'aria-colindex': [],
-    \ 'aria-colspan': [],
-    \ 'aria-controls': [],
-    \ 'aria-describedby': [],
-    \ 'aria-details': [],
-    \ 'aria-errormessage': [],
-    \ 'aria-flowto': [],
-    \ 'aria-labelledby': [],
-    \ 'aria-owns': [],
-    \ 'aria-posinset': [],
-    \ 'aria-rowcount': [],
-    \ 'aria-rowindex': [],
-    \ 'aria-rowspan': [],
-    \ 'aria-setsize': []
-\ }
-
-let aria_attributes = global_states_and_properties
-let aria_attributes = extend(aria_attributes, widget_attributes)
+" http://www.w3.org/TR/wai-aria/states_and_properties#state_prop_taxonomy
+"let global_states_and_properties = {'aria-atomic': ['true', 'false'], 'aria-busy': ['true', 'false'], 'aria-controls': [], 'aria-describedby': [], 'aria-disabled': ['true', 'false'], 'aria-dropeffect': ['copy', 'move', 'link', 'execute', 'popup', 'none'], 'aria-flowto': [], 'aria-grabbed': ['true', 'false', 'undefined'], 'aria-haspopup': ['true', 'false'], 'aria-hidden': ['true', 'false'], 'aria-invalid': ['grammar', 'spelling', 'true', 'false'], 'aria-label': [], 'aria-labelledby': [], 'aria-live': ['off', 'polite', 'assertive'], 'aria-owns': [], 'aria-relevant': ['additions', 'removals', 'text', 'all']}
+let widget_attributes = {'aria-autocomplete': ['inline', 'list', 'both', 'none'], 'aria-checked': ['true', 'false', 'mixed', 'undefined'], 'aria-disabled': ['true', 'false'], 'aria-expanded': ['true', 'false', 'undefined'], 'aria-haspopup': ['true', 'false'], 'aria-hidden': ['true', 'false'], 'aria-invalid': ['grammar', 'spelling', 'true', 'false'], 'aria-label': [], 'aria-level': [], 'aria-multiline': ['true', 'false'], 'aria-multiselectable': ['true', 'false'], 'aria-orientation': ['horizontal', 'vertical'], 'aria-pressed': ['true', 'false', 'mixed', 'undefined'], 'aria-readonly': ['true', 'false'], 'aria-required': ['true', 'false'], 'aria-selected': ['true', 'false', 'undefined'], 'aria-sort': ['ascending', 'descending', 'none', 'other'], 'aria-valuemax': [], 'aria-valuemin': [], 'aria-valuenow': [], 'aria-valuetext': []}
+let live_region_attributes = {'aria-atomic': ['true', 'false'], 'aria-busy': ['true', 'false'], 'aria-live': ['off', 'polite', 'assertive'], 'aria-relevant': ['additions', 'removals', 'text', 'all', 'additions text']}
+let drag_and_drop_attributes = {'aria-dropeffect': ['copy', 'move', 'link', 'execute', 'popup', 'none'], 'aria-grabbed': ['true', 'false', 'undefined']}
+let relationship_attributes = {'aria-activedescendant': [], 'aria-controls': [], 'aria-describedby': [], 'aria-flowto': [], 'aria-labelledby': [], 'aria-owns': [], 'aria-posinset': [], 'aria-setsize': []}
+let aria_attributes = widget_attributes
 let aria_attributes = extend(aria_attributes, live_region_attributes)
 let aria_attributes = extend(aria_attributes, drag_and_drop_attributes)
 let aria_attributes = extend(aria_attributes, relationship_attributes)
@@ -271,8 +82,6 @@ let role_attributes['status'] = abstract_role['composite'] + role_attributes['re
 let role_attributes['tab'] = abstract_role['sectionhead'] + abstract_role['widget'] + ['aria-selected']
 let role_attributes['tabpanel'] = role_attributes['region']
 let role_attributes['textbox'] = abstract_role['input'] + ['aria-autocomplete', 'aria-multiline', 'aria-readonly', 'aria-required']
-let role_attributes['searchbox'] = role_attributes['textbox']
-let role_attributes['switch'] = role_attributes['checkbox']
 let role_attributes['timer'] = role_attributes['status'] 
 let role_attributes['tooltip'] = abstract_role['section'] 
 let role_attributes['treeitem'] = role_attributes['listitem'] + role_attributes['option']
@@ -290,22 +99,16 @@ let role_attributes['treegrid'] = role_attributes['grid'] + role_attributes['tre
 let role_attributes['document'] = abstract_role['structure'] + ['aria-expanded'] 
 
 let role_attributes['article'] = role_attributes['document'] + role_attributes['region'] 
-let role_attributes['cell'] = abstract_role['section'] + ['aria-colindex', 'aria-colspan', 'aria-rowindex', 'aria-rowspan']
 let role_attributes['columnheader'] = role_attributes['gridcell'] + abstract_role['sectionhead'] + ['aria-sort']
 let role_attributes['definition'] = abstract_role['section'] 
-let role_attributes['feed'] = role_attributes['list']
-let role_attributes['figure'] = abstract_role['section'] 
 let role_attributes['heading'] = abstract_role['sectionhead'] + ['aria-level'] 
 let role_attributes['img'] = abstract_role['section'] 
 let role_attributes['math'] = abstract_role['section'] 
 let role_attributes['note'] = abstract_role['section'] 
 let role_attributes['presentation'] = abstract_role['structure']
-let role_attributes['none'] = role_attributes['presentation']
 let role_attributes['row'] = role_attributes['group'] + ['aria-level', 'aria-selected']
 let role_attributes['rowheader'] = role_attributes['gridcell'] + abstract_role['sectionhead']
 let role_attributes['separator'] = abstract_role['structure'] + ['aria-expanded'] 
-let role_attributes['table'] = abstract_role['section'] + ['aria-colcount', 'aria-rowcount']
-let role_attributes['term'] = abstract_role['section']
 
 " Landmark Roles
 let role_attributes['application'] = abstract_role['landmark'] 
@@ -321,30 +124,19 @@ let role_attributes['search'] = abstract_role['landmark']
 let aria_attributes_value = {
     \ 'aria-autocomplete': ['ID', ''],
     \ 'aria-checked': ['Token', ''],
-    \ 'aria-colcount': ['Number', ''],
-    \ 'aria-colindex': ['Number', ''],
-    \ 'aria-colspan': ['Number', ''],
     \ 'aria-disabled': ['true/false', ''],
-    \ 'aria-errormessage': ['ID', ''],
     \ 'aria-expanded': ['Token', ''],
-    \ 'aria-haspopup': ['Token', ''],
+    \ 'aria-haspopup': ['true/false', ''],
     \ 'aria-hidden': ['true/false', ''],
     \ 'aria-invalid': ['Token', ''],
-    \ 'aria-keyshortcuts': ['String', ''],
     \ 'aria-label': ['String', ''],
     \ 'aria-level': ['Int', ''],
-    \ 'aria-modal': ['true/false', ''],
     \ 'aria-multiline': ['true/false', ''],
     \ 'aria-multiselectable': ['true/false', ''],
     \ 'aria-orientation': ['Token', ''],
-    \ 'aria-placeholder': ['String', ''],
     \ 'aria-pressed': ['Token', ''],
     \ 'aria-readonly': ['true/false', ''],
     \ 'aria-required': ['true/false', ''],
-    \ 'aria-roledescription': ['String', ''],
-    \ 'aria-rowcount': ['Number', ''],
-    \ 'aria-rowindex': ['Number', ''],
-    \ 'aria-rowspan': ['Number', ''],
     \ 'aria-selected': ['Token', ''],
     \ 'aria-sort': ['Token', ''],
     \ 'aria-valuemax': ['Number', ''],

autoload/xml/html5.vim

@@ -62,8 +62,6 @@ let charset = [
     \ 'windows-1256', 'windows-1257', 'windows-1258', 'TIS-620', ]
 " }}}
 
-let autofill_tokens = ['on', 'off', 'name', 'honorific-prefix', 'given-name', 'additional-name', 'family-name', 'honorific-suffix', 'nickname', 'username', 'new-password', 'current-password', 'organization-title', 'organization', 'street-address', 'address-line1', 'address-line2', 'address-line3', 'address-level4', 'address-level3', 'address-level2', 'address-level1', 'country', 'country-name', 'postal-code', 'cc-name', 'cc-given-name', 'cc-additional-name', 'cc-family-name', 'cc-number', 'cc-exp', 'cc-exp-month', 'cc-exp-year', 'cc-csc', 'cc-type', 'transaction-currency', 'transaction-amount', 'language', 'bday', 'bday-day', 'bday-month', 'bday-year', 'sex', 'url', 'photo']
-
 " Attributes_and_Settings: {{{
 let core_attributes = {'accesskey': [], 'class': [], 'contenteditable': ['true', 'false', ''], 'contextmenu': [], 'dir': ['ltr', 'rtl'], 'draggable': ['true', 'false'], 'hidden': ['hidden', ''], 'id': [], 'is': [], 'lang': lang_tag, 'spellcheck': ['true', 'false', ''], 'style': [], 'tabindex': [], 'title': []}
 let xml_attributes = {'xml:lang': lang_tag, 'xml:space': ['preserve'], 'xml:base': [], 'xmlns': ['http://www.w3.org/1999/xhtml', 'http://www.w3.org/1998/Math/MathML', 'http://www.w3.org/2000/svg', 'http://www.w3.org/1999/xlink']}
@@ -80,12 +78,9 @@ let attributes_value = {
     \ 'accept-charset': ['Charset', ''],
     \ 'accesskey': ['Character', ''],
     \ 'action': ['URL', ''],
-    \ 'allowfullscreen': ['Bool', ''],
-    \ 'allowpaymentrequest': ['Bool', ''],
-    \ 'allowusermedia': ['Bool', ''],
     \ 'alt': ['Text', ''],
     \ 'async': ['Bool', ''],
-    \ 'autocomplete': ['*Token', ''],
+    \ 'autocomplete': ['on/off', ''],
     \ 'autofocus': ['Bool', ''],
     \ 'autoplay': ['Bool', ''],
     \ 'border': ['1', ''],
@@ -145,7 +140,6 @@ let attributes_value = {
     \ 'optimum': ['Number', ''],
     \ 'pattern': ['Pattern', ''],
     \ 'placeholder': ['Text', ''],
-    \ 'playsinline': ['Bool', ''],
     \ 'poster': ['URL', ''],
     \ 'preload': ['Token', ''],
     \ 'pubdate': ['Bool', ''],
@@ -319,15 +313,13 @@ if !exists('g:html5_aria_attributes_complete')
     let g:html5_aria_attributes_complete = 1
 endif
 if g:html5_aria_attributes_complete == 1
-    " Ref: https://www.w3.org/TR/wai-aria-1.1/#role_definitions
-    " Version: W3C Candidate Recommendation 27 October 2016
-    let widget_role = ['alert', 'alertdialog', 'button', 'checkbox', 'combobox', 'dialog', 'gridcell', 'link', 'log', 'marquee', 'menuitem', 'menuitemcheckbox', 'menuitemradio', 'option', 'progressbar', 'radio', 'radiogroup', 'scrollbar', 'searchbox', 'slider', 'spinbutton', 'status', 'switch', 'tab', 'tabpanel', 'textbox', 'timer', 'tooltip', 'treeitem', 'combobox', 'grid', 'listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid']
-    let document_structure = ['article', 'cell', 'columnheader', 'definition', 'directory', 'document', 'feed', 'figure', 'group', 'heading', 'img', 'list', 'listitem', 'math', 'none', 'note', 'presentation', 'region', 'row', 'rowheader', 'separator', 'table', 'term']
+    " Ref: http://www.w3.org/TR/wai-aria/roles
+    " Version: Draft 15 December 2009
+    let widget_role = ['alert', 'alertdialog', 'button', 'checkbox', 'combobox', 'dialog', 'gridcell', 'link', 'log', 'marquee', 'menuitem', 'menuitemcheckbox', 'menuitemradio', 'option', 'progressbar', 'radio', 'radiogroup', 'scrollbar', 'slider', 'spinbutton', 'status', 'tab', 'tabpanel', 'textbox', 'timer', 'tooltip', 'treeitem', 'combobox', 'grid', 'listbox', 'menu', 'menubar', 'radiogroup', 'tablist', 'tree', 'treegrid']
+    let document_structure = ['article', 'columnheader', 'definition', 'directory', 'document', 'group', 'heading', 'img', 'list', 'listitem', 'math', 'note', 'presentation', 'region', 'row', 'rowheader', 'separator']
     let landmark_role = ['application', 'banner', 'complementary', 'contentinfo', 'form', 'main', 'navigation', 'search']
-    let dpub_role = ['dpub-abstract', 'dpub-afterword', 'dpub-appendix', 'dpub-biblioentry', 'dpub-bibliography', 'dpub-biblioref', 'dpub-chapter', 'dpub-cover', 'dpub-epilogue', 'dpub-footnote', 'dpub-footnotes', 'dpub-foreword', 'dpub-glossary', 'dpub-glossdef', 'dpub-glossref', 'dpub-glossterm', 'dpub-index', 'dpub-locator', 'dpub-noteref', 'dpub-notice', 'dpub-pagebreak', 'dpub-pagelist', 'dpub-part', 'dpub-preface', 'dpub-prologue', 'dpub-pullquote', 'dpub-qna', 'dpub-subtitle', 'dpub-tip', 'dpub-title', 'dpub-toc']
     let role = extend(widget_role, document_structure)
     let role = extend(role, landmark_role)
-    let role = extend(role, dpub_role)
     let global_attributes = extend(global_attributes, {'role': role})
 endif
 " }}}
@@ -340,38 +332,14 @@ let metadata_elements = ['link', 'style', 'meta', 'script', 'noscript', 'command
 
 let flow_elements = phrasing_elements + ['p', 'hr', 'pre', 'ul', 'ol', 'dl', 'div', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hgroup', 'address', 'blockquote', 'ins', 'del', 'element', 'object', 'main', 'map', 'noscript', 'section', 'nav', 'article', 'aside', 'header', 'footer', 'video', 'audio', 'figure', 'table', 'template', 'form', 'fieldset', 'menu', 'canvas', 'details']
 
-" https://html.spec.whatwg.org/#linkTypes
-let linktypes = ['alternate', 'author', 'bookmark', 'dns-prefetch', 'external', 'help', 'icon', 'license', 'next', 'nofollow', 'noreferrer', 'noopener', 'pingback', 'preconnect', 'prefetch', 'preload', 'prerender', 'prev', 'search', 'stylesheet', 'tag']
-" https://w3c.github.io/manifest/
-let linkreltypes = linktypes
-let linkreltypes = linkreltypes + ['manifest']
+" http://dev.w3.org/html5/spec/Overview.html#linkTypes
+let linktypes = ['alternate', 'author', 'bookmark', 'external', 'help', 'icon', 'license', 'next', 'nofollow', 'noreferrer', 'pingback', 'prefetch', 'prev', 'search', 'stylesheet', 'sidebar', 'tag']
 " http://googlewebmastercentral.blogspot.com/2009/02/specify-your-canonical.html
-" http://www.ysearchblog.com/2009/02/12/fighting-duplication-adding-more-arrows-to-your-quiver/
-" http://blogs.bing.com/webmaster/2009/02/12/partnering-to-help-solve-duplicate-content-issues
-let linkreltypes = linkreltypes + ['canonical']
-" http://w3c.github.io/webcomponents/spec/imports/
-let linkreltypes = linkreltypes + ['import']
-" https://www.w3.org/TR/webmention/#sender-discovers-receiver-webmention-endpoint
-let linkreltypes = linkreltypes + ['webmention']
-" http://www.opensearch.org/Specifications/OpenSearch/1.1#Autodiscovery_in_HTML.2FXHTML
-let linkreltypes = linkreltypes + ['search']
-" http://microformats.org/wiki/rel-sitemap
-let linkreltypes = linkreltypes + ['sitemap']
-" https://www.ampproject.org/docs/get_started/create/prepare_for_discovery
-let linkreltypes = linkreltypes + ['amphtml']
-" https://developer.apple.com/library/content/documentation/AppleApplications/Reference/SafariWebContent/ConfiguringWebApplications/ConfiguringWebApplications.html
-let linkreltypes = linkreltypes + ['apple-touch-icon', 'apple-touch-icon-precomposed', 'apple-touch-startup-image']
-" https://developer.chrome.com/webstore/inline_installation
-let linkreltypes = linkreltypes + ['chrome-webstore-item']
-" http://pubsubhubbub.github.io/PubSubHubbub/pubsubhubbub-core-0.4.html#rfc.section.4
-let linkreltypes = linkreltypes + ['hub']
-" https://golem.ph.utexas.edu/~distler/blog/archives/000320.html
-let linkreltypes = linkreltypes + ['pgpkey']
+let linkreltypes = linktypes + ['canonical', 'import']
 
 " a and button are special elements for interactive, some element can't be its descendent
 let abutton_dec = 'details\\|embed\\|iframe\\|keygen\\|label\\|menu\\|select\\|textarea'
 
-let crossorigin = ['anonymous', 'use-credentials']
 
 
 let g:xmldata_html5 = {
@@ -379,7 +347,7 @@ let g:xmldata_html5 = {
 \ 'vimxmlroot': ['html', 'head', 'body'] + flow_elements, 
 \ 'a': [
     \ filter(copy(flow_elements), "!(v:val =~ '". abutton_dec ."')"),
-    \ extend(copy(global_attributes), {'name': [], 'href': [], 'target': [], 'rel': linktypes, 'hreflang': lang_tag, 'media': [], 'type': [], 'referrerpolicy': ['no-referrer', 'no-referrer-when-downgrade', 'origin', 'origin-when-cross-origin', 'unsafe-url']}) 
+    \ extend(copy(global_attributes), {'name': [], 'href': [], 'target': [], 'rel': linktypes, 'hreflang': lang_tag, 'media': [], 'type': []}) 
 \ ],
 \ 'abbr': [
     \ phrasing_elements,
@@ -391,7 +359,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'area': [
     \ [],
-    \ extend(copy(global_attributes), {'alt': [], 'href': [], 'target': [], 'rel': linktypes, 'media': [], 'hreflang': lang_tag, 'type': [], 'shape': ['rect', 'circle', 'poly', 'default'], 'coords': [], 'referrerpolicy': ['no-referrer', 'no-referrer-when-downgrade', 'origin', 'origin-when-cross-origin', 'unsafe-url']})
+    \ extend(copy(global_attributes), {'alt': [], 'href': [], 'target': [], 'rel': linktypes, 'media': [], 'hreflang': lang_tag, 'type': [], 'shape': ['rect', 'circle', 'poly', 'default'], 'coords': []})
 \ ],
 \ 'article': [
     \ flow_elements + ['style'],
@@ -527,7 +495,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'form': [
     \ flow_elements,
-    \ extend(copy(global_attributes), {'name': [], 'action': [], 'enctype': ['application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain'], 'method': ['get', 'post', 'put', 'delete'], 'target': [], 'novalidate': ['novalidate', ''], 'accept-charset': charset, 'autocomplete': autofill_tokens})
+    \ extend(copy(global_attributes), {'name': [], 'action': [], 'enctype': ['application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain'], 'method': ['get', 'post', 'put', 'delete'], 'target': [], 'novalidate': ['novalidate', ''], 'accept-charset': charset, 'autocomplete': ['on', 'off']})
 \ ],
 \ 'h1': [
     \ phrasing_elements,
@@ -579,15 +547,15 @@ let g:xmldata_html5 = {
 \ ],
 \ 'iframe': [
     \ [],
-    \ extend(copy(global_attributes), {'src': [], 'srcdoc': [], 'name': [], 'width': [], 'height': [], 'sandbox': ['allow-same-origin', 'allow-forms', 'allow-scripts'], 'seamless': ['seamless', ''], 'referrerpolicy': ['no-referrer', 'no-referrer-when-downgrade', 'origin', 'origin-when-cross-origin', 'unsafe-url'], 'allowfullscreen': [], 'allowpaymentrequest': [], 'allowusermedia': []})
+    \ extend(copy(global_attributes), {'src': [], 'srcdoc': [], 'name': [], 'width': [], 'height': [], 'sandbox': ['allow-same-origin', 'allow-forms', 'allow-scripts'], 'seamless': ['seamless', '']})
 \ ],
 \ 'img': [
     \ [],
-    \ extend(copy(global_attributes), {'src': [], 'alt': [], 'height': [], 'width': [], 'decoding': ['async', 'sync', 'auto'], 'usemap': [], 'ismap': ['ismap', ''], 'referrerpolicy': ['no-referrer', 'no-referrer-when-downgrade', 'origin', 'origin-when-cross-origin', 'unsafe-url'], 'crossorigin': ['anonymous', 'use-credentials']})
+    \ extend(copy(global_attributes), {'src': [], 'alt': [], 'height': [], 'width': [], 'usemap': [], 'ismap': ['ismap', '']})
 \ ],
 \ 'input': [
     \ [],
-    \ extend(copy(global_attributes), {'type': ['text', 'password', 'checkbox', 'radio', 'button', 'submit', 'reset', 'file', 'hidden', 'image', 'datetime-local', 'date', 'month', 'time', 'week', 'number', 'range', 'email', 'url', 'search', 'tel', 'color'], 'name': [], 'disabled': ['disabled', ''], 'form': [], 'maxlength': [], 'readonly': ['readonly', ''], 'size': [], 'value': [], 'autocomplete': autofill_tokens, 'autofocus': ['autofocus', ''], 'list': [], 'pattern': [], 'required': ['required', ''], 'placeholder': [], 'checked': ['checked'], 'accept': [], 'multiple': ['multiple', ''], 'alt': [], 'src': [], 'height': [], 'width': [], 'min': [], 'max': [], 'step': [], 'formenctype': ['application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain'], 'formmethod': ['get', 'post', 'put', 'delete'], 'formtarget': [], 'formnovalidate': ['formnovalidate', '']})
+    \ extend(copy(global_attributes), {'type': ['text', 'password', 'checkbox', 'radio', 'button', 'submit', 'reset', 'file', 'hidden', 'image', 'datetime', 'datetime-local', 'date', 'month', 'time', 'week', 'number', 'range', 'email', 'url', 'search', 'tel', 'color'], 'name': [], 'disabled': ['disabled', ''], 'form': [], 'maxlength': [], 'readonly': ['readonly', ''], 'size': [], 'value': [], 'autocomplete': ['on', 'off'], 'autofocus': ['autofocus', ''], 'list': [], 'pattern': [], 'required': ['required', ''], 'placeholder': [], 'checked': ['checked'], 'accept': [], 'multiple': ['multiple', ''], 'alt': [], 'src': [], 'height': [], 'width': [], 'min': [], 'max': [], 'step': [], 'formenctype': ['application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain'], 'formmethod': ['get', 'post', 'put', 'delete'], 'formtarget': [], 'formnovalidate': ['formnovalidate', '']})
 \ ],
 \ 'ins': [
     \ flow_elements,
@@ -615,7 +583,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'link': [
     \ [],
-    \ extend(copy(global_attributes), {'href': [], 'rel': linkreltypes, 'hreflang': lang_tag, 'media': [], 'type': [], 'sizes': ['any'], 'referrerpolicy': ['no-referrer', 'no-referrer-when-downgrade', 'origin', 'origin-when-cross-origin', 'unsafe-url'], 'crossorigin': crossorigin, 'preload': ['preload', ''], 'prefetch': ['prefetch', '']})
+    \ extend(copy(global_attributes), {'href': [], 'rel': linkreltypes, 'hreflang': lang_tag, 'media': [], 'type': [], 'sizes': ['any']})
 \ ],
 \ 'main': [
     \ flow_elements + ['style'],
@@ -723,7 +691,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'script': [
     \ [],
-    \ extend(copy(global_attributes), {'src': [], 'defer': ['defer', ''], 'async': ['async', ''], 'type': [], 'charset': charset, 'nonce': [], 'crossorigin': crossorigin})
+    \ extend(copy(global_attributes), {'src': [], 'defer': ['defer', ''], 'async': ['async', ''], 'type': [], 'charset': charset})
 \ ],
 \ 'section': [
     \ flow_elements + ['style'],
@@ -755,7 +723,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'style': [
     \ [],
-    \ extend(copy(global_attributes), {'type': [], 'media': [], 'scoped': ['scoped', ''], 'nonce': []})
+    \ extend(copy(global_attributes), {'type': [], 'media': [], 'scoped': ['scoped', '']})
 \ ],
 \ 'sub': [
     \ phrasing_elements,
@@ -835,7 +803,7 @@ let g:xmldata_html5 = {
 \ ],
 \ 'video': [
     \ flow_elements + ['source', 'track'],
-    \ extend(copy(global_attributes), {'autoplay': ['autoplay', ''], 'preload': ['none', 'metadata', 'auto', ''], 'controls': ['controls', ''], 'loop': ['loop', ''], 'playsinline': ['playsinline', ''], 'poster': [], 'height': [], 'width': [], 'src': [], 'crossorigin': crossorigin})
+    \ extend(copy(global_attributes), {'autoplay': ['autoplay', ''], 'preload': ['none', 'metadata', 'auto', ''], 'controls': ['controls', ''], 'loop': ['loop', ''], 'poster': [], 'height': [], 'width': [], 'src': []})
 \ ],
 \ 'wbr': [
     \ [],

build

@@ -2,12 +2,11 @@
 
 set -E
 
-DIRS="syntax indent compiler autoload ftplugin after/syntax after/indent after/ftplugin"
-DIRS_BASIC="syntax compiler indent after/syntax after/indent"
-DIRS_ALL="syntax indent compiler autoload ftplugin after"
-DIRS_SYNTAX="syntax after/syntax"
+DIRS="syntax indent compiler autoload ftplugin ftdetect after/syntax after/indent after/ftplugin after/ftdetect"
+DIRS_BASIC="syntax compiler indent ftdetect after/syntax after/indent after/ftdetect"
+DIRS_ALL="syntax indent compiler autoload ftplugin ftdetect after"
+DIRS_SYNTAX="syntax ftdetect after/syntax after/ftdetect"
 DIRS_JAVASCRIPT="${DIRS} extras"
-DIRS_RM="$DIRS_JAVASCRIPT"
 
 OUTPUT=""
 
@@ -29,9 +28,6 @@ download() {
 
 extract() {
   printf "\n"
-
-  cat config.vim >> tmp/polyglot.vim
-
   for pack in $1; do
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
@@ -52,21 +48,10 @@ extract() {
       fi
     done
 
-    for f in ${dir}/ftdetect/*; do
-      (
-        echo "augroup filetypedetect";
-        echo '" '"$pack";
-        cat "${f}";
-        echo "augroup END";
-        echo
-      ) >> tmp/polyglot.vim;
-    done
 
     output "${subdirs##, })\n"
   done
 
-  mv tmp/polyglot.vim ftdetect/
-
   for pack in $1; do
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
@@ -80,7 +65,7 @@ extract() {
 }
 
 copy_dir() {
-  for file in $(find "$1/$2" -name '*.vim' -o -name '*.vital'); do
+  for file in $(find "$1/$2" -name '*.vim'); do
     file_path="$(dirname "${file##$1/}")"
     mkdir -p "$file_path"
     touch "$file_path/$(basename "$file")"
@@ -90,6 +75,13 @@ copy_dir() {
   done
 }
 
+concat_ftdetect() {
+  cat config.vim >> tmp/polyglot.vim
+  for f in ftdetect/*; do (echo '" '"$f"; cat "${f}"; echo) >> tmp/polyglot.vim; done
+  rm -f ftdetect/*
+  mv tmp/polyglot.vim ftdetect/
+}
+
 update_readme() {
   OLD_README="$(cat README.md)"
 
@@ -98,7 +90,7 @@ update_readme() {
 +2kb
 /##
 'b,-2c
-$(printf -- "$OUTPUT" | sort)
+$(printf -- "$OUTPUT")
 .
 w
 q
@@ -107,55 +99,43 @@ EOF
 }
 
 PACKS="
-  apiblueprint:sheerun/apiblueprint.vim
   applescript:vim-scripts/applescript.vim
-  asciidoc:asciidoc/vim-asciidoc
-  yaml:stephpy/vim-yaml
   ansible:pearofducks/ansible-vim
   arduino:sudar/vim-arduino-syntax
-  autohotkey:hnamikaw/vim-autohotkey
   blade:jwalton512/vim-blade
   c++11:octol/vim-cpp-enhanced-highlight
   c/c++:vim-jp/vim-cpp
-  caddyfile:isobit/vim-caddyfile
-  carp:hellerve/carp-vim
   cjsx:mtscout6/vim-cjsx
   clojure:guns/vim-clojure-static
-  cmake:pboettch/vim-cmake-syntax
   coffee-script:kchmck/vim-coffee-script
   cryptol:victoredwardocallaghan/cryptol.vim
   crystal:rhysd/vim-crystal
   cql:elubow/cql-vim
+  css:JulesWang/css.vim
   cucumber:tpope/vim-cucumber
   dart:dart-lang/dart-vim-plugin
-  dockerfile:docker/docker::/contrib/syntax/vim/
+  dockerfile:honza/dockerfile.vim
   elixir:elixir-lang/vim-elixir
-  elm:ElmCast/elm-vim
+  elm:lambdatoast/elm.vim
   emberscript:yalesov/vim-ember-script
   emblem:yalesov/vim-emblem
   erlang:vim-erlang/vim-erlang-runtime
   fish:dag/vim-fish
-  fsharp:fsharp/vim-fsharp:_BASIC
   git:tpope/vim-git
-  gmpl:maelvalais/gmpl.vim
   glsl:tikhomirov/vim-glsl
-  gnuplot:vim-scripts/gnuplot-syntax-highlighting
   go:fatih/vim-go:_BASIC
   groovy:vim-scripts/groovy.vim
-  haml:sheerun/vim-haml
+  haml:tpope/vim-haml
   handlebars:mustache/vim-mustache-handlebars
   haskell:neovimhaskell/haskell-vim
   haxe:yaymukund/vim-haxe
   html5:othree/html5.vim
-  i3:PotatoesMaster/i3-vim-syntax
   jasmine:glanotte/vim-jasmine
   javascript:pangloss/vim-javascript:_JAVASCRIPT
-  jenkins:martinda/Jenkinsfile-vim-syntax
   json:elzr/vim-json
-  json5:GutenYe/json5.vim
   jst:briancollins/vim-jst
   jsx:mxw/vim-jsx:_ALL
-  julia:JuliaEditorSupport/julia-vim
+  julia:dcjones/julia-minimalist-vim
   kotlin:udalov/kotlin-vim
   latex:LaTeX-Box-Team/LaTeX-Box
   less:groenewege/vim-less
@@ -164,10 +144,9 @@ PACKS="
   lua:tbastos/vim-lua
   mako:sophacles/vim-bundle-mako
   markdown:plasticboy/vim-markdown:_SYNTAX
-  mathematica:rsmenon/vim-mathematica
-  nginx:chr4/nginx.vim
+  nginx:othree/nginx-contrib-vim
   nim:zah/nim.vim:_BASIC
-  nix:LnL7/vim-nix
+  nix:spwhitt/vim-nix
   objc:b4winckler/vim-objc
   ocaml:jrk/vim-ocaml
   octave:vim-scripts/octave.vim--
@@ -176,57 +155,49 @@ PACKS="
   pgsql:exu/pgsql.vim
   php:StanAngeloff/php.vim
   plantuml:aklt/plantuml-syntax
-  powershell:PProvost/vim-ps1
+  powershell:Persistent13/vim-ps1
   protobuf:uarun/vim-protobuf
   pug:digitaltoad/vim-pug
   puppet:voxpupuli/vim-puppet
-  purescript:purescript-contrib/purescript-vim
-  python:vim-python/python-syntax
-  python-compiler:aliev/vim-compiler-python
-  python-ident:Vimjas/vim-python-pep8-indent
+  purescript:raichoo/purescript-vim
+  python:mitsuhiko/vim-python-combined
   qml:peterhoeg/vim-qml
   r-lang:vim-scripts/R.vim
-  racket:wlangstroth/vim-racket
-  raml:IN3D/vim-raml
   ragel:jneen/ragel.vim
   rspec:sheerun/rspec.vim
   ruby:vim-ruby/vim-ruby
   rust:rust-lang/rust.vim
   sbt:derekwyatt/vim-sbt
   scala:derekwyatt/vim-scala
-  scss:cakebaker/scss-syntax.vim
   slim:slim-template/vim-slim
-  slime:slime-lang/vim-slime-syntax
-  solidity:tomlion/vim-solidity
+  solidity:ethereum/vim-solidity
   stylus:wavded/vim-stylus
   swift:keith/swift.vim
-  sxhkd:baskerville/vim-sxhkdrc
   systemd:kurayama/systemd-vim-syntax
-  terraform:hashivim/vim-terraform
   textile:timcharper/textile.vim
   thrift:solarnz/thrift.vim
   tmux:keith/tmux.vim
   tomdoc:wellbredgrapefruit/tomdoc.vim
   toml:cespare/vim-toml
-  twig:lumiliet/vim-twig
+  twig:evidens/vim-twig
   typescript:leafgarland/typescript-vim
-  vala:arrufat/vala.vim
+  vala:tkztmk/vim-vala
   vbnet:vim-scripts/vbnet.vim
   vcl:smerrill/vcl-vim-plugin
-  vifm:vifm/vifm.vim
-  vue:posva/vim-vue
   vm:lepture/vim-velocity
   xls:vim-scripts/XSLT-syntax
+  yaml:stephpy/vim-yaml
   yard:sheerun/vim-yardoc
 "
 
 rm -rf tmp
-rm -rf $DIRS_RM
+rm -rf $DIRS_ALL
 mkdir tmp
 
 printf "Downloading packs..."
 download "$PACKS"
 extract "$PACKS"
+concat_ftdetect
 update_readme
 
 rm -rf tmp

compiler/cargo.vim

@@ -4,38 +4,68 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Compiler:         Cargo Compiler
 " Maintainer:       Damien Radtke <damienradtke@gmail.com>
 " Latest Revision:  2014 Sep 24
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if exists('current_compiler')
-	finish
+  finish
 endif
 runtime compiler/rustc.vim
 let current_compiler = "cargo"
 
-let s:save_cpo = &cpo
-set cpo&vim
-
 if exists(':CompilerSet') != 2
-	command -nargs=* CompilerSet setlocal <args>
+    command -nargs=* CompilerSet setlocal <args>
 endif
 
 if exists('g:cargo_makeprg_params')
-	execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
+    execute 'CompilerSet makeprg=cargo\ '.escape(g:cargo_makeprg_params, ' \|"').'\ $*'
 else
-	CompilerSet makeprg=cargo\ $*
+    CompilerSet makeprg=cargo\ $*
 endif
 
-" Ignore general cargo progress messages
-CompilerSet errorformat+=
-			\%-G%\\s%#Downloading%.%#,
-			\%-G%\\s%#Compiling%.%#,
-			\%-G%\\s%#Finished%.%#,
-			\%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
-			\%-G%\\s%#To\ learn\ more\\,%.%#,
-			\%-Gnote:\ Run\ with\ \`RUST_BACKTRACE=%.%#,
-			\%.%#panicked\ at\ \\'%m\\'\\,\ %f:%l
+" Allow a configurable global Cargo.toml name. This makes it easy to
+" support variations like 'cargo.toml'.
+let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
 
-let &cpo = s:save_cpo
-unlet s:save_cpo
+function! s:is_absolute(path)
+    return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
+endfunction
+
+CompilerSet errorformat+=%-G%\\s%#Compiling%.%#
+
+let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
+if s:local_manifest != ''
+    let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
+    augroup cargo
+        au!
+        au QuickfixCmdPost make call s:FixPaths()
+    augroup END
+
+    " FixPaths() is run after Cargo, and is used to change the file paths
+    " to be relative to the current directory instead of Cargo.toml.
+    function! s:FixPaths()
+        let qflist = getqflist()
+        let manifest = s:local_manifest
+        for qf in qflist
+            if !qf.valid
+                let m = matchlist(qf.text, '(file://\(.*\))$')
+                if !empty(m)
+                    let manifest = m[1].'/'
+                    " Manually strip another slash if needed; usually just an
+                    " issue on Windows.
+                    if manifest =~ '^/[A-Z]\+:/'
+                        let manifest = manifest[1:]
+                    endif
+                endif
+                continue
+            endif
+            let filename = bufname(qf.bufnr)
+            if s:is_absolute(filename)
+                continue
+            endif
+            let qf.filename = simplify(manifest.filename)
+            call remove(qf, 'bufnr')
+        endfor
+        call setqflist(qflist, 'r')
+    endfunction
+endif
 
 endif

compiler/eslint.vim

@@ -1,20 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
-" Vim compiler plugin
-" Language:     JavaScript
-" Maintainer:   vim-javascript community
-" URL:          https://github.com/pangloss/vim-javascript
-
-if exists("current_compiler")
-  finish
-endif
-let current_compiler = "eslint"
-
-if exists(":CompilerSet") != 2
-  command! -nargs=* CompilerSet setlocal <args>
-endif
-
-CompilerSet makeprg=eslint\ -f\ compact\ %
-CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
-
-endif

compiler/go.vim

@@ -6,10 +6,10 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
 "
 " compiler/go.vim: Vim compiler file for Go.
 
-if exists("g:current_compiler")
+if exists("current_compiler")
   finish
 endif
-let g:current_compiler = "go"
+let current_compiler = "go"
 
 if exists(":CompilerSet") != 2
   command -nargs=* CompilerSet setlocal <args>

compiler/python.vim

@@ -1,71 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
-  
-" Vim compiler file
-" Compiler:	Unit testing tool for Python
-" Maintainer:	Ali Aliev <ali@aliev.me>
-" Last Change: 2015 Nov 2
-
-if exists("current_compiler")
-  finish
-endif
-
-let current_compiler = "python"
-
-if exists(":CompilerSet") != 2		" older Vim always used :setlocal
-  command -nargs=* CompilerSet setlocal <args>
-endif
-
-" Disable Python warnings
-if !exists('$PYTHONWARNINGS')
-  let $PYTHONWARNINGS="ignore"
-endif
-
-" For Flake8 first
-CompilerSet efm  =%E%f:%l:\ could\ not\ compile,
-CompilerSet efm +=%-Z%p^,
-CompilerSet efm +=%A%f:%l:%c:\ %t%n\ %m,
-CompilerSet efm +=%A%f:%l:\ %t%n\ %m,
-
-" Python errors are multi-lined. They often start with 'Traceback', so
-" we want to capture that (with +G) and show it in the quickfix window
-" because it explains the order of error messages.
-
-CompilerSet efm +=%+GTraceback%.%#,
-
-" The error message itself starts with a line with 'File' in it. There
-" are a couple of variations, and we need to process a line beginning
-" with whitespace followed by File, the filename in "", a line number,
-" and optional further text. %E here indicates the start of a multi-line
-" error message. The %\C at the end means that a case-sensitive search is
-" required.
-CompilerSet efm +=%E\ \ File\ \"%f\"\\,\ line\ %l\\,%m%\\C,
-CompilerSet efm +=%E\ \ File\ \"%f\"\\,\ line\ %l%\\C,
-
-" The possible continutation lines are idenitifed to Vim by %C. We deal
-" with these in order of most to least specific to ensure a proper
-" match. A pointer (^) identifies the column in which the error occurs
-" (but will not be entirely accurate due to indention of Python code).
-CompilerSet efm +=%C%p^,
-
-" Any text, indented by more than two spaces contain useful information.
-" We want this to appear in the quickfix window, hence %+.
-CompilerSet efm +=%+C\ \ \ \ %.%#,
-CompilerSet efm +=%+C\ \ %.%#,
-
-" The last line (%Z) does not begin with any whitespace. We use a zero
-" width lookahead (\&) to check this. The line contains the error
-" message itself (%m)
-CompilerSet efm +=%Z%\\S%\\&%m,
-
-" We can ignore any other lines (%-G)
-CompilerSet efm +=%-G%.%#
-
-if filereadable("Makefile")
-  CompilerSet makeprg=make
-else
-  CompilerSet makeprg=python
-endif
-
-" vim:foldmethod=marker:foldlevel=0
-
-endif

compiler/rake.vim

@@ -24,10 +24,10 @@ CompilerSet errorformat=
       \%D(in\ %f),
       \%\\s%#from\ %f:%l:%m,
       \%\\s%#from\ %f:%l:,
-      \%\\s%##\ %f:%l:%m%\\&%.%#%\\D:%\\d%#:%.%#,
-      \%\\s%##\ %f:%l%\\&%.%#%\\D:%\\d%#,
-      \%\\s%#[%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%#:%.%#,
-      \%\\s%#%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%#:%.%#,
+      \%\\s%##\ %f:%l:%m,
+      \%\\s%##\ %f:%l,
+      \%\\s%#[%f:%l:\ %#%m,
+      \%\\s%#%f:%l:\ %#%m,
       \%\\s%#%f:%l:,
       \%m\ [%f:%l]:,
       \%+Erake\ aborted!,

compiler/rustc.vim

@@ -4,10 +4,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 " Compiler:         Rust Compiler
 " Maintainer:       Chris Morgan <me@chrismorgan.info>
 " Latest Revision:  2013 Jul 12
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
 if exists("current_compiler")
-	finish
+  finish
 endif
 let current_compiler = "rustc"
 
@@ -24,7 +23,6 @@ else
 	CompilerSet makeprg=rustc\ \%
 endif
 
-" Old errorformat (before nightly 2016/08/10)
 CompilerSet errorformat=
 			\%f:%l:%c:\ %t%*[^:]:\ %m,
 			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
@@ -33,17 +31,6 @@ CompilerSet errorformat=
 			\%-G%*[\ ]^%*[~],
 			\%-G%*[\ ]...
 
-" New errorformat (after nightly 2016/08/10)
-CompilerSet errorformat+=
-			\%-G,
-			\%-Gerror:\ aborting\ %.%#,
-			\%-Gerror:\ Could\ not\ compile\ %.%#,
-			\%Eerror:\ %m,
-			\%Eerror[E%n]:\ %m,
-			\%Wwarning:\ %m,
-			\%Inote:\ %m,
-			\%C\ %#-->\ %f:%l:%c
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 

compiler/sass.vim

@@ -0,0 +1,34 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
+" Vim compiler file
+" Compiler:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2013 May 30
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "sass"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+CompilerSet makeprg=sass
+
+CompilerSet errorformat=
+      \%f:%l:%m\ (Sass::Syntax%trror),
+      \%ESyntax\ %trror:%m,
+      \%C%\\s%\\+on\ line\ %l\ of\ %f,
+      \%Z%.%#,
+      \%-G%.%#
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim:set sw=2 sts=2:
+
+endif

compiler/typescript.vim

@@ -13,22 +13,8 @@ if !exists("g:typescript_compiler_options")
   let g:typescript_compiler_options = ""
 endif
 
-if exists(":CompilerSet") != 2
-  command! -nargs=* CompilerSet setlocal <args>
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-execute 'CompilerSet makeprg='
-      \ . escape(g:typescript_compiler_binary, ' ')
-      \ . '\ '
-      \ . escape(g:typescript_compiler_options, ' ')
-      \ . '\ $*\ %'
+let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $*  %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
 endif

config.vim

@@ -7,11 +7,3 @@ endif
 if !exists('g:vim_json_syntax_conceal')
   let g:vim_json_syntax_conceal = 0
 endif
-
-let g:filetype_euphoria = 'elixir'
-
-augroup filetypedetect
-  autocmd BufNewFile,BufReadPost *.vb setlocal filetype=vbnet
-augroup END
-
-let g:python_highlight_all = 1

extras/flow.vim

@@ -1,40 +1,265 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
   
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+syntax keyword jsFlowStorageClass   contained const var let
+syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowParenRegion        PreProc
+  HiLink jsFlowClass              PreProc
+  HiLink jsFlowTypeObject         PreProc
+  HiLink jsFlowTypeKey            PreProc
+  HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
+  HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+syntax keyword jsFlowStorageClass   contained const var let
+syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowParenRegion        PreProc
+  HiLink jsFlowClass              PreProc
+  HiLink jsFlowTypeObject         PreProc
+  HiLink jsFlowTypeKey            PreProc
+  HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
+  HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+syntax keyword jsFlowStorageClass   contained const var let
+syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowParenRegion        PreProc
+  HiLink jsFlowClass              PreProc
+  HiLink jsFlowTypeObject         PreProc
+  HiLink jsFlowTypeKey            PreProc
+  HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
+  HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+syntax keyword jsFlowStorageClass   contained const var let
+syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowParenRegion        PreProc
+  HiLink jsFlowClass              PreProc
+  HiLink jsFlowTypeObject         PreProc
+  HiLink jsFlowTypeKey            PreProc
+  HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
+  HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+syntax keyword jsFlowDeclareKeyword contained declare
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+syntax match   jsFlowNoise          contained /[:;,<>]/
+syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+syntax keyword jsFlowStorageClass   contained const var let
+syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsFlow                   PreProc
+  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowArray              PreProc
+  HiLink jsFlowDeclareBlock       PreProc
+  HiLink jsFlowObject             PreProc
+  HiLink jsFlowParenRegion        PreProc
+  HiLink jsFlowClass              PreProc
+  HiLink jsFlowTypeObject         PreProc
+  HiLink jsFlowTypeKey            PreProc
+  HiLink jsFlowTypeValue          PreProc
+  HiLink jsFlowClassProperty      jsClassProperty
+  HiLink jsFlowType               Type
+  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowNoise              Noise
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
 syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
 syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowExactObject    contained matchgroup=jsFlowNoise start=/{|/   end=/|}/       contains=@jsFlowCluster,jsComment fold
-syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster keepend fold
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster
 syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object array bool class
 syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
-syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
+syntax match   jsFlowTypeCustom     contained /\k*/ skipwhite skipempty nextgroup=jsFlowGroup
 syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
 syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
 syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
+syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments
 syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
 syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
-syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
-syntax match   jsFlowWildcard       contained /*/
 
-syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster,jsFlowArrow,jsFlowReturnParens
-syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
-syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp fold
-syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp,jsFlowReturnArrow fold
-syntax match   jsFlowReturnArrow    contained /=>/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
-syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword,jsFlowReturnObject
+syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
 syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
 syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
-syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
 
 syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
 syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
 
-syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
-syntax region  jsFlowTypeValue      contained     matchgroup=jsFlowNoise start=/=/       end=/[\n;]/ contains=@jsFlowCluster,jsFlowGroup,jsFlowMaybe
-syntax match   jsFlowTypeOperator   contained /=/ containedin=jsFlowTypeValue
+syntax region  jsFlowTypeStatement                                   start=/type/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression,jsFlowGroup,jsFlowMaybe
 syntax match   jsFlowTypeOperator   contained /=/
 syntax keyword jsFlowTypeKeyword    contained type
 
@@ -44,18 +269,12 @@ syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)
 
 syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
 syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
-syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise fold
+syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise
 
-" NOTE: It appears the nextgroup was causing a ton of breakages... testing it
-" witout a nextgroup, but keeping this arround for reference incase something breaks
-" syntax match   jsFlowMaybe          contained /?/ nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject extend keepend
-syntax match   jsFlowMaybe          contained /?/
-syntax region  jsFlowInterfaceBlock contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend fold
+syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
 
-syntax region  jsFlowParenAnnotation contained start=/:/ end=/[,=)]\@=/ containedin=jsParen contains=@jsFlowCluster
-
-syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn,jsFlowReturnArrow
-syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowExactObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -72,11 +291,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowTypeof             PreProc
   HiLink jsFlowArray              PreProc
   HiLink jsFlowObject             PreProc
-  HiLink jsFlowExactObject        PreProc
   HiLink jsFlowParens             PreProc
   HiLink jsFlowGroup              PreProc
   HiLink jsFlowReturn             PreProc
-  HiLink jsFlowParenAnnotation    PreProc
   HiLink jsFlowReturnObject       jsFlowReturn
   HiLink jsFlowReturnArray        jsFlowArray
   HiLink jsFlowReturnParens       jsFlowParens
@@ -85,10 +302,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowClassGroup         PreProc
   HiLink jsFlowArrowArguments     PreProc
   HiLink jsFlowArrow              PreProc
-  HiLink jsFlowReturnArrow        PreProc
   HiLink jsFlowTypeStatement      PreProc
   HiLink jsFlowTypeKeyword        PreProc
-  HiLink jsFlowTypeOperator       Operator
+  HiLink jsFlowTypeOperator       PreProc
   HiLink jsFlowMaybe              PreProc
   HiLink jsFlowReturnMaybe        PreProc
   HiLink jsFlowClassProperty      jsClassProperty
@@ -97,12 +313,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFlowInterface          PreProc
   HiLink jsFlowNoise              Noise
   HiLink jsFlowObjectKey          jsObjectKey
-  HiLink jsFlowOrOperator         jsOperator
+  HiLink jsFlowOrOperator         PreProc
   HiLink jsFlowReturnOrOp         jsFlowOrOperator
-  HiLink jsFlowWildcard           PreProc
-  HiLink jsFlowWildcardReturn     PreProc
-  HiLink jsFlowImportType         PreProc
-  HiLink jsFlowTypeValue          PreProc
   delcommand HiLink
 endif
 

extras/jsdoc.vim

@@ -6,13 +6,13 @@ syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contai
 " tags containing a param
 syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
 " tags containing type and param
-syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\|typedef\)\>" skipwhite nextgroup=jsDocType
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
 " tags containing type but no param
-syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
 " tags containing references
 syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
 " other tags (no extra syntax)
-syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|async\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
 
 syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
 syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
@@ -20,7 +20,222 @@ syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRe
 syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
 syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
 syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
-syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.\{-}]\|=\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
+syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
+
+if version >= 508 || !exists("did_javascript_syn_inits")
+  if version < 508
+    let did_javascript_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+  HiLink jsDocTags              Special
+  HiLink jsDocSeeTag            Function
+  HiLink jsDocType              Type
+  HiLink jsDocTypeBrackets      jsDocType
+  HiLink jsDocTypeRecord        jsDocType
+  HiLink jsDocTypeNoParam       Type
+  HiLink jsDocParam             Label
+  delcommand HiLink
+endif
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+"" syntax coloring for javadoc comments (HTML)
+syntax region jsComment    matchgroup=jsComment start="/\*\s*"  end="\*/" contains=jsDocTags,jsCommentTodo,jsCvsTag,@jsHtml,@Spell fold
+
+" tags containing a param
+syntax match  jsDocTags         contained "@\(alias\|api\|augments\|borrows\|class\|constructs\|default\|defaultvalue\|emits\|exception\|exports\|extends\|fires\|kind\|link\|listens\|member\|member[oO]f\|mixes\|module\|name\|namespace\|requires\|template\|throws\|var\|variation\|version\)\>" skipwhite nextgroup=jsDocParam
+" tags containing type and param
+syntax match  jsDocTags         contained "@\(arg\|argument\|cfg\|param\|property\|prop\)\>" skipwhite nextgroup=jsDocType
+" tags containing type but no param
+syntax match  jsDocTags         contained "@\(callback\|define\|enum\|external\|implements\|this\|type\|typedef\|return\|returns\)\>" skipwhite nextgroup=jsDocTypeNoParam
+" tags containing references
+syntax match  jsDocTags         contained "@\(lends\|see\|tutorial\)\>" skipwhite nextgroup=jsDocSeeTag
+" other tags (no extra syntax)
+syntax match  jsDocTags         contained "@\(abstract\|access\|accessor\|author\|classdesc\|constant\|const\|constructor\|copyright\|deprecated\|desc\|description\|dict\|event\|example\|file\|file[oO]verview\|final\|function\|global\|ignore\|inheritDoc\|inner\|instance\|interface\|license\|localdoc\|method\|mixin\|nosideeffects\|override\|overview\|preserve\|private\|protected\|public\|readonly\|since\|static\|struct\|todo\|summary\|undocumented\|virtual\)\>"
+
+syntax region jsDocType         contained matchgroup=jsDocTypeBrackets start="{" end="}" contains=jsDocTypeRecord oneline skipwhite nextgroup=jsDocParam
+syntax match  jsDocType         contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+" skipwhite nextgroup=jsDocParam
+syntax region jsDocTypeRecord   contained start=/{/ end=/}/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeRecord   contained start=/\[/ end=/\]/ contains=jsDocTypeRecord extend
+syntax region jsDocTypeNoParam  contained start="{" end="}" oneline
+syntax match  jsDocTypeNoParam  contained "\%(#\|\"\|\w\|\.\|:\|\/\)\+"
+syntax match  jsDocParam        contained "\%(#\|\$\|-\|'\|\"\|{.\{-}}\|\w\|\.\|:\|\/\|\[.{-}]\|=\)\+"
 syntax region jsDocSeeTag       contained matchgroup=jsDocSeeTag start="{" end="}" contains=jsDocTags
 
 if version >= 508 || !exists("did_javascript_syn_inits")

extras/ngdoc.vim

@@ -5,3 +5,38 @@ syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" n
 syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
 
 endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+syntax match  jsDocTags         contained /@\(link\|method[oO]f\|ngdoc\|ng[iI]nject\|restrict\)/ nextgroup=jsDocParam skipwhite
+syntax match  jsDocType         contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|\/\)\+" nextgroup=jsDocParam skipwhite
+syntax match  jsDocParam        contained "\%(#\|\$\|\w\|\"\|-\|\.\|:\|{\|}\|\/\|\[\|]\|=\)\+"
+
+endif

ftplugin/ansible.vim

@@ -4,6 +4,5 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ansible') == -1
 if exists('+regexpengine') && ('&regexpengine' == 0)
   setlocal regexpengine=1
 endif
-set path+=./../templates,./../files,templates,files
 
 endif

ftplugin/blade.vim

@@ -23,8 +23,7 @@ setlocal comments+=s:{{--,m:\ \ \ \ ,e:--}}
 if exists('loaded_matchit') && exists('b:match_words')
     " Append to html matchit words
     let b:match_words .= ',' .
-                \ '@\%(section\s*([^\,]*)\|if\|unless\|foreach\|forelse\|for\|while\|push\|can\|cannot\|hasSection\|' .
-                \     'php\s*(\@!\|verbatim\|component\|slot\|prepend\)' .
+                \ '@\%(section\|if\|unless\|foreach\|forelse\|for\|while\|push\|can\|cannot\|hasSection\|php\|verbatim\)\>' .
                 \ ':' .
                 \ '@\%(else\|elseif\|empty\|break\|continue\|elsecan\|elsecannot\)\>' .
                 \ ':' .

ftplugin/caddyfile.vim

@@ -1,28 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
-  
-" Language:	    Caddyfile
-" Author:	    Josh Glendenning <josh@isobit.io>
-
-if exists('b:did_ftplugin')
-	finish
-endif
-let b:did_ftplugin = 1
-
-setlocal commentstring=#\ %s
-
-" Add NERDCommenter delimiters
-let s:delimiters = {'left': '#'}
-if exists('g:NERDDelimiterMap')
-	if !has_key(g:NERDDelimiterMap, 'caddyfile')
-		let g:NERDDelimiterMap.caddyfile = s:delimiters
-	endif
-elseif exists('g:NERDCustomDelimiters')
-	if !has_key(g:NERDCustomDelimiters, 'caddyfile')
-		let g:NERDDelimiterMap.caddyfile = s:delimiters
-	endif
-else
-	let g:NERDCustomDelimiters = {'caddyfile': s:delimiters}
-endif
-unlet s:delimiters
-
-endif

ftplugin/crystal.vim

@@ -12,7 +12,7 @@ if exists('loaded_matchit') && !exists('b:match_words')
   let b:match_ignorecase = 0
 
   let b:match_words =
-        \ '\<\%(if\|unless\|case\|while\|until\|for\|do\|class\|module\|struct\|lib\|macro\|ifdef\|def\|fun\|begin\|enum\)\>=\@!' .
+        \ '\<\%(if\|unless\|case\|while\|until\|for\|do\|class\|module\|struct\|lib\|macro\|ifdef\|def\|fun\|begin\)\>=\@!' .
         \ ':' .
         \ '\<\%(else\|elsif\|ensure\|when\|rescue\|break\|redo\|next\|retry\)\>' .
         \ ':' .

ftplugin/dart.vim

@@ -25,9 +25,7 @@ let &l:errorformat =
   \   '%m'
   \ ], ',')
 
-setlocal includeexpr=dart#resolveUri(v:fname)
-setlocal isfname+=:
 
-let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms< inex< isf<'
+let b:undo_ftplugin = 'setl et< fo< sw< sts< com< cms<'
 
 endif

ftplugin/eelixir.vim

@@ -16,7 +16,7 @@ if !exists("g:eelixir_default_subtype")
 endif
 
 if !exists("b:eelixir_subtype")
-  let s:lines = join(getline(1, 5) + [getline('$')], "\n")
+  let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
   let b:eelixir_subtype = matchstr(s:lines,'eelixir_subtype=\zs\w\+')
   if b:eelixir_subtype == ''
     let b:eelixir_subtype = matchstr(&filetype,'^eex\.\zs\w\+')
@@ -80,27 +80,10 @@ if exists("loaded_matchit")
   let b:match_words = s:match_words
 endif
 
-if !exists('b:surround_45')
-  " When using surround `-` (ASCII 45) would provide `<% selection %>`
-  let b:surround_45 = "<% \r %>"
-endif
-if !exists('b:surround_61')
-  " When using surround `=` (ASCII 61) would provide `<%= selection %>`
-  let b:surround_61 = "<%= \r %>"
-endif
-if !exists('b:surround_35')
-  " When using surround `#` (ASCII 35) would provide `<%# selection %>`
-  let b:surround_35 = "<%# \r %>"
-endif
-if !exists('b:surround_5')
-  " When using surround `<C-e>` (ASCII 5 `ENQ`) would provide `<% selection %>\n<% end %>`
-  let b:surround_5 = "<% \r %>\n<% end %>"
-endif
-
 setlocal comments=:<%#
 setlocal commentstring=<%#\ %s\ %>
 
-let b:undo_ftplugin = "setl cms< " .
+let b:undo_ftplugin = "setl cms< "
       \ " | unlet! b:browsefilter b:match_words | " . s:undo_ftplugin
 
 let &cpo = s:save_cpo

ftplugin/elixir.vim

@@ -17,24 +17,45 @@ if exists("loaded_matchit") && !exists("b:match_words")
         \ ',{:},\[:\],(:)'
 endif
 
-setlocal shiftwidth=2 softtabstop=2 expandtab iskeyword+=!,?
 setlocal comments=:#
 setlocal commentstring=#\ %s
 
+function! GetElixirFilename(word)
+  let word = a:word
+
+  " get first thing that starts uppercase, until the first space or end of line
+  let word = substitute(word,'^\s*\(\u[^ ]\+\).*$','\1','g')
+
+  " remove any trailing characters that don't look like a nested module
+  let word = substitute(word,'\.\U.*$','','g')
+
+  " replace module dots with slash
+  let word = substitute(word,'\.','/','g')
+
+  " remove any special chars
+  let word = substitute(word,'[^A-z0-9-_/]','','g')
+
+  " convert to snake_case
+  let word = substitute(word,'\(\u\+\)\(\u\l\)','\1_\2','g')
+  let word = substitute(word,'\(\u\+\)\(\u\l\)','\1_\2','g')
+  let word = substitute(word,'\(\l\|\d\)\(\u\)','\1_\2','g')
+  let word = substitute(word,'-','_','g')
+  let word = tolower(word)
+
+  return word
+endfunction
+
 let &l:path =
       \ join([
-      \   'lib',
-      \   'src',
-      \   'deps/**/lib',
-      \   'deps/**/src',
+      \   getcwd().'/lib',
+      \   getcwd().'/src',
+      \   getcwd().'/deps/**/lib',
+      \   getcwd().'/deps/**/src',
       \   &g:path
       \ ], ',')
-setlocal includeexpr=elixir#util#get_filename(v:fname)
+setlocal includeexpr=GetElixirFilename(v:fname)
 setlocal suffixesadd=.ex,.exs,.eex,.erl,.yrl,.hrl
 
 silent! setlocal formatoptions-=t formatoptions+=croqlj
 
-let b:undo_ftplugin = 'setlocal sw< sts< et< isk< com< cms< path< inex< sua< '.
-      \ '| unlet! b:match_ignorecase b:match_words'
-
 endif

ftplugin/elm.vim

@@ -1,101 +1,86 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
   
-" plugin for Elm (http://elm-lang.org/)
+" elm.vim - Plugin for the Elm programming language
+" Maintainer:   Alexander Noriega <http://lambdatoast.com/>
+" Version:      0.4.3
 
-if exists('b:did_ftplugin')
+" Plugin setup stuff
+
+if exists("b:did_ftplugin")
   finish
 endif
 
 let b:did_ftplugin = 1
 
-" Settings
-if !exists('g:elm_jump_to_error')
-	let g:elm_jump_to_error = 0
-endif
+" Compilation
 
-if !exists('g:elm_make_output_file')
-	let g:elm_make_output_file = 'elm.js'
-endif
-
-if !exists('g:elm_make_show_warnings')
-	let g:elm_make_show_warnings = 0
-endif
-
-if !exists('g:elm_syntastic_show_warnings')
-	let g:elm_syntastic_show_warnings = 0
-endif
-
-if !exists('g:elm_format_autosave')
-	let g:elm_format_autosave = 1
-endif
-
-if !exists('g:elm_format_fail_silently')
-    let g:elm_format_fail_silently = 0
-endif
-
-if !exists('g:elm_setup_keybindings')
-	let g:elm_setup_keybindings = 1
-endif
-
-setlocal omnifunc=elm#Complete
-
-setlocal comments=:--
-setlocal commentstring=--\ %s
-
-" Commands
-command -buffer -nargs=? -complete=file ElmMake call elm#Make(<f-args>)
-command -buffer ElmMakeMain call elm#Make("Main.elm")
-command -buffer -nargs=? -complete=file ElmTest call elm#Test(<f-args>)
-command -buffer ElmRepl call elm#Repl()
-command -buffer ElmErrorDetail call elm#ErrorDetail()
-command -buffer ElmShowDocs call elm#ShowDocs()
-command -buffer ElmBrowseDocs call elm#BrowseDocs()
-command -buffer ElmFormat call elm#Format()
-
-if get(g:, 'elm_setup_keybindings', 1)
-  nmap <buffer> <LocalLeader>m <Plug>(elm-make)
-  nmap <buffer> <LocalLeader>b <Plug>(elm-make-main)
-  nmap <buffer> <LocalLeader>t <Plug>(elm-test)
-  nmap <buffer> <LocalLeader>r <Plug>(elm-repl)
-  nmap <buffer> <LocalLeader>e <Plug>(elm-error-detail)
-  nmap <buffer> <LocalLeader>d <Plug>(elm-show-docs)
-  nmap <buffer> <LocalLeader>w <Plug>(elm-browse-docs)
-endif
-
-" Better gf command
-nmap <buffer> gf :call elm#util#GoToModule(expand('<cfile>'))<CR>
-
-" Elm code formatting on save
-if get(g:, 'elm_format_autosave', 1)
-  augroup elmFormat
-	autocmd!
-	autocmd BufWritePre *.elm call elm#Format()
-	autocmd BufWritePost *.elm call elm#util#EchoStored()
-   augroup END
-endif
-if has('win32')
-	set viewdir=$HOME/vimfiles/views/
-endif
-
-" Enable go to file under cursor from module name
-" Based on: https://github.com/elixir-lang/vim-elixir/blob/bd66ed134319d1e390f3331e8c4d525109f762e8/ftplugin/elixir.vim#L22-L56
-function! GetElmFilename(word)
-  let l:word = a:word
-
-  " replace module dots with slash
-  let l:word = substitute(l:word,'\.','/','g')
-
-  return l:word
+function! ElmMake(file)
+  let args = a:file
+  return elm#io#system("elm-make", args)
 endfunction
 
-let &l:path =
-      \ join([
-      \   elm#FindRootDirectory().'/src',
-      \   elm#FindRootDirectory().'/elm-stuff/packages/**/src',
-      \   &g:path
-      \ ], ',')
-setlocal includeexpr=GetElmFilename(v:fname)
-setlocal include=^\\s*import\\s\\+
-setlocal suffixesadd=.elm
+function! ElmMakeCurrentFile()
+  echo ElmMake(expand("%"))
+endfunction
+
+function! ElmMakeMain()
+  echo ElmMake("Main.elm")
+endfunction
+
+function! ElmMakeFile(file)
+  echo ElmMake(a:file)
+endfunction
+
+" REPL
+
+function! ElmRepl()
+  !elm-repl
+endfunction
+
+" Evaluation
+
+function! ElmEvalLine()
+  return ElmEval(getline("."))
+endfunction
+
+function! ElmEvalSelection()
+  let savedReg = @z
+  normal! `<v`>"zy
+  let res = ElmEval(substitute(getreg("z"), "\n", "\\\n", "g"))
+  let @z = savedReg
+  normal! gv
+endfunction
+
+function! ElmEval(sourceCode)
+  let currentLine = a:sourceCode
+  let args = "echo '" . currentLine . "' | elm-repl"
+  let result = elm#io#system("echo", args)
+  let cleanResult = "-- " . join(s:Filtered(function("s:IsUsefulReplOutput"), split(result, "\n")), "")
+  put =cleanResult
+endfunction
+
+function! s:IsUsefulReplOutput(str)
+  return a:str !~ "^Elm REPL" && a:str !~ "Type :help" && a:str !~ ">\\s*$"
+endfunction
+
+" List processing
+
+function! s:Filtered(fn, l)
+    let new_list = deepcopy(a:l)
+    call filter(new_list, string(a:fn) . '(v:val)')
+    return new_list
+endfunction
+
+command -buffer ElmEvalLine          call ElmEvalLine()
+command -buffer ElmEvalSelection     call ElmEvalSelection()
+command -buffer ElmMakeMain          call ElmMakeMain()
+command -buffer -nargs=1 ElmMakeFile call ElmMakeFile <args>
+command -buffer ElmMakeCurrentFile   call ElmMakeCurrentFile()
+command -buffer ElmRepl              call ElmRepl()
+
+" Define comment convention
+
+setlocal comments=:--
+setlocal commentstring=--%s
 
 endif

ftplugin/elm/tagbar.vim

@@ -1,24 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
-  
-if !executable('ctags')
-    finish
-elseif globpath(&runtimepath, 'plugin/tagbar.vim') ==? ''
-    finish
-endif
-
-function! s:SetTagbar()
-    if !exists('g:tagbar_type_elm')
-        let g:tagbar_type_elm = {
-                    \ 'ctagstype' : 'elm',
-                    \ 'kinds'     : [
-                    \ 'c:constants',
-                    \ 'f:functions',
-                    \ 'p:ports'
-                    \ ]
-                    \ }
-    endif
-endfunction
-
-call s:SetTagbar()
-
-endif

ftplugin/eruby.vim

@@ -29,7 +29,7 @@ elseif !exists("b:eruby_subtype")
   let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
   let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
   if b:eruby_subtype == ''
-    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\|\.example\)\+$','',''),'\.\zs\w\+\%(\ze+\w\+\)\=$')
+    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+\%(\ze+\w\+\)\=$')
   endif
   if b:eruby_subtype == 'rhtml'
     let b:eruby_subtype = 'html'
@@ -47,7 +47,7 @@ elseif !exists("b:eruby_subtype")
   endif
 endif
 
-if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=? 'eruby'
+if exists("b:eruby_subtype") && b:eruby_subtype != ''
   exe "runtime! ftplugin/".b:eruby_subtype.".vim ftplugin/".b:eruby_subtype."_*.vim ftplugin/".b:eruby_subtype."/*.vim"
 else
   runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim

ftplugin/fish.vim

@@ -31,7 +31,7 @@ endif
 " Use the 'man' wrapper function in fish to include fish's man pages.
 " Have to use a script for this; 'fish -c man' would make the the man page an
 " argument to fish instead of man.
-execute 'setlocal keywordprg=fish\ '.fnameescape(expand('<sfile>:p:h:h').'/bin/man.fish')
+execute 'setlocal keywordprg=fish\ '.expand('<sfile>:p:h:h').'/bin/man.fish'
 
 let b:match_words =
             \ escape('<%(begin|function|if|switch|while|for)>:<end>', '<>%|)')

ftplugin/gitrebase.vim

@@ -28,12 +28,11 @@ function! s:cycle()
   call s:choose(get({'s':'edit','p':'squash','e':'reword','r':'fixup'},getline('.')[0],'pick'))
 endfunction
 
-command! -buffer -bar -range Pick   :<line1>,<line2>call s:choose('pick')
-command! -buffer -bar -range Squash :<line1>,<line2>call s:choose('squash')
-command! -buffer -bar -range Edit   :<line1>,<line2>call s:choose('edit')
-command! -buffer -bar -range Reword :<line1>,<line2>call s:choose('reword')
-command! -buffer -bar -range Fixup  :<line1>,<line2>call s:choose('fixup')
-command! -buffer -bar -range Drop   :<line1>,<line2>call s:choose('drop')
+command! -buffer -bar Pick   :call s:choose('pick')
+command! -buffer -bar Squash :call s:choose('squash')
+command! -buffer -bar Edit   :call s:choose('edit')
+command! -buffer -bar Reword :call s:choose('reword')
+command! -buffer -bar Fixup  :call s:choose('fixup')
 command! -buffer -bar Cycle  :call s:cycle()
 " The above are more useful when they are mapped; for example:
 "nnoremap <buffer> <silent> S :Cycle<CR>

ftplugin/i3.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'i3') == -1
-  
-setlocal commentstring=#\ %s
-
-endif

ftplugin/julia.vim

@@ -1,99 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-  
-" Vim filetype plugin file
-" Language:	Julia
-" Maintainer:	Carlo Baldassi <carlobaldassi@gmail.com>
-" Last Change:	2014 may 29
-
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-let s:save_cpo = &cpo
-set cpo-=C
-
-setlocal include=^\\s*\\%(reload\\\|include\\)\\>
-setlocal suffixesadd=.jl
-setlocal comments=:#
-setlocal commentstring=#=%s=#
-setlocal cinoptions+=#1
-setlocal define=^\\s*macro\\>
-
-let b:julia_vim_loaded = 1
-
-let b:undo_ftplugin = "setlocal include< suffixesadd< comments< commentstring<"
-      \ . " define< shiftwidth< expandtab< indentexpr< indentkeys< cinoptions< omnifunc<"
-      \ . " | unlet! b:julia_vim_loaded"
-
-" MatchIt plugin support
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-
-  " note: begin_keywords must contain all blocks in order
-  " for nested-structures-skipping to work properly
-  let b:julia_begin_keywords = '\%(\%(\.\s*\)\@<!\|\%(@\s*.\s*\)\@<=\)\<\%(\%(staged\)\?function\|macro\|begin\|mutable\s\+struct\|\%(mutable\s\+\)\@<!struct\|\%(abstract\|primitive\)\s\+type\|\%(\(abstract\|primitive\)\s\+\)\@<!type\|immutable\|let\|do\|\%(bare\)\?module\|quote\|if\|for\|while\|try\)\>'
-  let s:macro_regex = '@\%(#\@!\S\)\+\s\+'
-  let s:nomacro = '\%(' . s:macro_regex . '\)\@<!'
-  let s:yesmacro = s:nomacro . '\%('. s:macro_regex . '\)\+'
-  let b:julia_begin_keywordsm = '\%(' . s:yesmacro . b:julia_begin_keywords . '\)\|'
-        \ . '\%(' . s:nomacro . b:julia_begin_keywords . '\)'
-  let b:julia_end_keywords = '\<end\>'
-
-  " note: this function relies heavily on the syntax file
-  function! JuliaGetMatchWords()
-    let [l,c] = [line('.'),col('.')]
-    let attr = synIDattr(synID(l, c, 1),"name")
-    let c1 = c
-    while attr == 'juliaMacro'
-      normal! W
-      if line('.') > l || col('.') == c1
-        call cursor(l, c)
-        return ''
-      endif
-      let attr = synIDattr(synID(l, col('.'), 1),"name")
-      let c1 = col('.')
-    endwhile
-    call cursor(l, c)
-    if attr == 'juliaConditional'
-      return b:julia_begin_keywordsm . ':\<\%(elseif\|else\)\>:' . b:julia_end_keywords
-    elseif attr =~ '\<\%(juliaRepeat\|juliaRepKeyword\)\>'
-      return b:julia_begin_keywordsm . ':\<\%(break\|continue\)\>:' . b:julia_end_keywords
-    elseif attr == 'juliaBlKeyword'
-      return b:julia_begin_keywordsm . ':' . b:julia_end_keywords
-    elseif attr == 'juliaException'
-      return b:julia_begin_keywordsm . ':\<\%(catch\|finally\)\>:' . b:julia_end_keywords
-    endif
-    return '\<\>:\<\>'
-  endfunction
-
-  let b:match_words = 'JuliaGetMatchWords()'
-
-  " we need to skip everything within comments, strings and
-  " the 'end' keyword when it is used as a range rather than as
-  " the end of a block
-  let b:match_skip = 'synIDattr(synID(line("."),col("."),1),"name") =~ '
-        \ . '"\\<julia\\%(Comprehension\\%(For\\|If\\)\\|RangeEnd\\|SymbolS\\?\\|Comment[LM]\\|\\%([bv]\\|ip\\|MIME\\|Shell\\|Doc\\)\\?String\\|RegEx\\)\\>"'
-
-  let b:undo_ftplugin = b:undo_ftplugin
-        \ . " | unlet! b:match_words b:match_skip b:match_ignorecase"
-        \ . " | unlet! b:julia_begin_keywords b:julia_end_keywords"
-        \ . " | delfunction JuliaGetMatchWords"
-        \ . " | call julia_blocks#remove_mappings()"
-
-  if get(g:, "julia_blocks", 1)
-    call julia_blocks#init_mappings()
-    let b:undo_ftplugin .= " | call julia_blocks#remove_mappings()"
-  endif
-
-endif
-
-if has("gui_win32")
-  let b:browsefilter = "Julia Source Files (*.jl)\t*.jl\n"
-  let b:undo_ftplugin = b:undo_ftplugin . " | unlet! b:browsefilter"
-endif
-
-let &cpo = s:save_cpo
-unlet s:save_cpo
-
-endif

ftplugin/litcoffee.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-  
-runtime ftplugin/coffee.vim
-
-endif

ftplugin/mail_vifm.vim

@@ -1,66 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
-" Mail file type extension to pick files for attachments via vifm
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: January 23, 2016
-
-" Insert attachment picked via vifm after 'Subject' header
-function! s:AddMailAttacments()
-	" TODO: reduce duplication between this file and plugins/vifm.vim
-	let l:listf = tempname()
-
-	if !has('nvim')
-		if has('gui_running')
-			execute 'silent !' g:vifm_term g:vifm_exec
-			                 \ '--choose-files' shellescape(l:listf, 1)
-			                 \ g:vifm_exec_args
-		else
-			execute 'silent !' g:vifm_exec
-			                 \ '--choose-files' shellescape(l:listf, 1)
-			                 \ g:vifm_exec_args
-		endif
-
-		redraw!
-
-		call s:HandleRunResults(v:shell_error, l:listf)
-	else
-		" Work around handicapped neovim...
-		let callback = { 'listf': l:listf }
-		function! callback.on_exit(id, code)
-			buffer #
-			silent! bdelete! #
-			call s:HandleRunResults(a:code, self.listf)
-		endfunction
-		enew
-		call termopen(g:vifm_exec . ' --choose-files ' . shellescape(l:listf, 1)
-		             \. ' ' . g:vifm_exec_args, callback)
-
-		startinsert
-	endif
-endfunction
-
-function! s:HandleRunResults(exitcode, listf)
-	if a:exitcode != 0
-		echohl WarningMsg
-		echo 'Got non-zero code from vifm: ' . a:exitcode
-		echohl None
-		call delete(a:listf)
-		return
-	endif
-
-	let l:insert_pos = search('^Subject:', 'nw')
-
-	if filereadable(a:listf) && l:insert_pos != 0
-		for line in readfile(a:listf)
-			call append(l:insert_pos, 'Attach: '.line)
-			let l:insert_pos += 1
-		endfor
-	endif
-	call delete(a:listf)
-endfunction
-
-nnoremap <buffer> <silent> <localleader>a :call <sid>AddMailAttacments()<cr>
-
-" vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif

ftplugin/mma.vim

@@ -1,63 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
-  
-"Vim filetype plugin
-" Language: Mathematica
-" Maintainer: R. Menon <rsmenon@icloud.com>
-" Last Change: Feb 26, 2013
-
-" Initialization {
-if exists("b:did_ftplugin")
-  finish
-endif
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo&vim
-"}
-
-" Syntax completion function {
-if exists('&ofu')
-	setlocal omnifunc=syntaxcomplete#Complete
-	setlocal completefunc=syntaxcomplete#Complete
-endif
-"}
-
-" Main functions {
-if has('python')
-	" Random ID generator {
-	function! RandomID()
-
-"Python implementation follows; do not alter indentations/whitespace
-python << EOF
-import random, string, vim
-vim.command("let l:id = '" + (''.join(random.sample(string.ascii_uppercase + string.digits, 8))) + "'")
-EOF
-
-	return l:id
-	endfunction
-	"}
-
-	"Unit test template {
-	function! Test()
-		if exists("*strftime")
-			let l:date = strftime("%Y%m%d") . "-"
-		else
-			let l:date = ""
-		endif
-
-		let l:testid = expand("%:t") . "-" . l:date . RandomID()
-		let l:template = "Test[\rtest\r,\rresult\r,\rTestID -> \"" . l:testid . "\"\r\b]"
-		exe ":normal i" . l:template
-	endfunction
-	"}
-endif
-"}
-
-" Cleanup {
-let &cpo = s:cpo_save
-unlet s:cpo_save
-"}
-
-" vim: set foldmarker={,} foldlevel=0 foldmethod=marker:
-
-endif

ftplugin/nginx.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nginx') == -1
-  
-setlocal commentstring=#\ %s
-
-endif

ftplugin/nix.vim

@@ -1,17 +1,17 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
   
-" Vim filetype plugin
-" Language:    Nix
-" Maintainer:  Daiderd Jordan <daiderd@gmail.com>
-" URL:         https://github.com/LnL7/vim-nix
-
-if (exists("b:did_ftplugin"))
-  finish
+if exists("b:did_ftplugin")
+    finish
 endif
-let b:did_ftplugin = 1
+let b:did_ftplugin=1
 
-
-setlocal comments=:#
+setlocal comments=
 setlocal commentstring=#\ %s
 
+" Nixpkgs indent settings
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
+setlocal expandtab
+
 endif

ftplugin/perl6.vim

@@ -0,0 +1,92 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
+  
+" Vim filetype plugin file
+" Language:      Perl 6
+" Maintainer:    vim-perl <vim-perl@googlegroups.com>
+" Homepage:      http://github.com/vim-perl/vim-perl
+" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
+" Last Change:   {{LAST_CHANGE}}
+" Contributors:  Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
+"
+" Based on ftplugin/perl.vim by Dan Sharp <dwsharp at hotmail dot com>
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+" Make sure the continuation lines below do not cause problems in
+" compatibility mode.
+let s:save_cpo = &cpo
+set cpo-=C
+
+setlocal formatoptions-=t
+setlocal formatoptions+=crqol
+setlocal keywordprg=p6doc
+
+setlocal comments=:#\|,:#=,:#
+setlocal commentstring=#%s
+
+" Change the browse dialog on Win32 to show mainly Perl-related files
+if has("gui_win32")
+    let b:browsefilter = "Perl Source Files (*.pl)\t*.pl\n" .
+               \ "Perl Modules (*.pm)\t*.pm\n" .
+               \ "Perl Documentation Files (*.pod)\t*.pod\n" .
+               \ "All Files (*.*)\t*.*\n"
+endif
+
+" Provided by Ned Konz <ned at bike-nomad dot com>
+"---------------------------------------------
+setlocal include=\\<\\(use\\\|require\\)\\>
+setlocal includeexpr=substitute(substitute(v:fname,'::','/','g'),'$','.pm','')
+setlocal define=[^A-Za-z_]
+
+" The following line changes a global variable but is necessary to make
+" gf and similar commands work. Thanks to Andrew Pimlott for pointing out
+" the problem. If this causes a " problem for you, add an
+" after/ftplugin/perl6.vim file that contains
+"       set isfname-=:
+set isfname+=:
+setlocal iskeyword=@,48-57,_,192-255,-
+
+" Set this once, globally.
+if !exists("perlpath")
+    if executable("perl6")
+        try
+            if &shellxquote != '"'
+                let perlpath = system('perl6 -e  "@*INC.join(q/,/).say"')
+            else
+                let perlpath = system("perl6 -e  '@*INC.join(q/,/).say'")
+            endif
+            let perlpath = substitute(perlpath,',.$',',,','')
+        catch /E145:/
+            let perlpath = ".,,"
+        endtry
+    else
+        " If we can't call perl to get its path, just default to using the
+        " current directory and the directory of the current file.
+        let perlpath = ".,,"
+    endif
+endif
+
+" Append perlpath to the existing path value, if it is set.  Since we don't
+" use += to do it because of the commas in perlpath, we have to handle the
+" global / local settings, too.
+if &l:path == ""
+    if &g:path == ""
+        let &l:path=perlpath
+    else
+        let &l:path=&g:path.",".perlpath
+    endif
+else
+    let &l:path=&l:path.",".perlpath
+endif
+"---------------------------------------------
+
+" Undo the stuff we changed.
+let b:undo_ftplugin = "setlocal fo< com< cms< inc< inex< def< isf< isk< kp< path<" .
+        \         " | unlet! b:browsefilter"
+
+" Restore the saved compatibility options.
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+endif

ftplugin/plantuml.vim

@@ -1,37 +1,22 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
   
-if exists('b:loaded_plantuml_plugin')
-  finish
-endif
-let b:loaded_plantuml_plugin = 1
-let s:cpo_save = &cpo
-set cpo&vim
+" Vim plugin file
+" Language:     PlantUML
+" Maintainer:   Aaron C. Meadows < language name at shadowguarddev dot com>
+" Last Change:  19-Jun-2012
+" Version:      0.1
 
-if !exists('g:plantuml_executable_script')
-  let g:plantuml_executable_script='plantuml'
+if exists("g:loaded_plantuml_plugin")
+    finish
+endif
+let g:loaded_plantuml_plugin = 1
+
+if !exists("g:plantuml_executable_script")
+	let g:plantuml_executable_script="plantuml"
 endif
 
-if exists('loaded_matchit')
-  let b:match_ignorecase = 0
-  let b:match_words =
-        \ '\(\<ref\>\|\<box\>\|\<opt\>\|\<alt\>\|\<group\>\|\<loop\>\|\<note\>\|\<legend\>\):\<else\>:\<end\>' .
-        \ ',\<if\>:\<elseif\>:\<else\>:\<endif\>' .
-        \ ',\<rnote\>:\<endrnote\>' .
-        \ ',\<hnote\>:\<endhnote\>' .
-        \ ',\<title\>:\<endtitle\>' .
-        \ ',\<\while\>:\<endwhile\>'
-endif
-
-let &l:makeprg=g:plantuml_executable_script . ' ' .  fnameescape(expand('%'))
+autocmd Filetype plantuml let &l:makeprg=g:plantuml_executable_script . " " .  fnameescape(expand("%"))
 
 setlocal comments=s1:/',mb:',ex:'/,:' commentstring=/'%s'/ formatoptions-=t formatoptions+=croql
 
-let b:endwise_addition = '\=index(["note","legend"], submatch(0))!=-1 ? "end " . submatch(0) : "end"'
-let b:endwise_words = 'loop,group,alt,note,legend'
-let b:endwise_pattern = '^\s*\zs\<\(loop\|group\|alt\|note\ze[^:]*$\|legend\)\>.*$'
-let b:endwise_syngroups = 'plantumlKeyword'
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
 endif

ftplugin/purescript.vim

@@ -1,42 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'purescript') == -1
-  
-setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
-setlocal include=^import
-setlocal includeexpr=printf('%s.purs',substitute(v:fname,'\\.','/','g'))
-
-let s:PS = []
-fun! InitPureScript()
-  let dirs = map(
-	\ findfile("psc-package.json", expand("%:p:h") . ";/", -1),
-	\ { idx, val -> fnamemodify(val, ":p:h") }
-	\ )
-  if empty(dirs)
-    let dirs = map(
-	  \ findfile("bower.json", expand("%:p:h") . ";/", -1),
-	  \ { idx, val -> fnamemodify(val, ":p:h") }
-	  \ )
-    if empty(dirs)
-      return
-    endif
-  endif
-
-  let path = expand("%:p")
-  for p in s:PS
-    if stridx(path, p[0], 0) == 0
-      let &l:path=p[1]
-      return
-    endif
-  endfor
-
-  let dir = dirs[len(dirs) - 1]
-  let gp = globpath(dir, "src/**/*.purs", v:true, v:true)
-  if empty(gp)
-    return
-  endif
-
-  let &l:path=join([dir, dir . "/bower_components/**", dir . "/src/**"], ",")
-  call add(s:PS, [dir, &l:path])
-endfun
-call InitPureScript()
-
-endif

ftplugin/racket.vim

@@ -1,63 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
-  
-" Language:     Racket
-" Maintainer:   Will Langstroth <will@langstroth.com>
-" URL:          http://github.com/wlangstroth/vim-racket
-
-setl iskeyword+=#,%,^
-setl lispwords+=module,module*,module+,parameterize,let-values,let*-values,letrec-values,local
-setl lispwords+=define-values,opt-lambda,case-lambda,syntax-rules,with-syntax,syntax-case,syntax-parse
-setl lispwords+=define-signature,unit,unit/sig,compund-unit/sig,define-values/invoke-unit/sig
-setl lispwords+=define-opt/c,define-syntax-rule
-setl lispwords+=struct
-
-" Racket OOP
-setl lispwords+=class,define/public,define/private
-
-" kanren
-setl lispwords+=fresh,run,run*,project,conde,condu
-
-" loops
-setl lispwords+=for,for/list,for/fold,for*,for*/list,for*/fold,for/or,for/and
-setl lispwords+=for/hash,for/sum,for/flvector,for*/flvector,for/vector
-
-setl lispwords+=match,match*,match/values,define/match,match-lambda,match-lambda*,match-lambda**
-setl lispwords+=match-let,match-let*,match-let-values,match-let*-values
-setl lispwords+=match-letrec,match-define,match-define-values
-setl lisp
-
-" Enable auto begin new comment line when continuing from an old comment line
-setl comments+=:;
-setl formatoptions+=r
-
-setl makeprg=raco\ make\ --\ %
-
-" Simply setting keywordprg like this works:
-"    setl keywordprg=raco\ docs
-" but then vim says:
-"    "press ENTER or type a command to continue"
-" We avoid the annoyance of having to hit enter by remapping K directly.
-nnoremap <buffer> K :silent !raco docs <cword><cr>:redraw!<cr>
-
-" For the visual mode K mapping, it's slightly more convoluted to get the 
-" selected text:
-function! s:Racket_visual_doc()
-  try
-    let l:old_a = @a
-    normal! gv"ay
-    call system("raco docs '". @a . "'")
-    redraw!
-    return @a
-  finally
-    let @a = l:old_a
-  endtry
-endfunction
-
-vnoremap <buffer> K :call <SID>Racket_visual_doc()<cr>
-
-nnoremap <buffer> <f9> :!racket -t %<cr>
-
-"setl commentstring=;;%s
-setl commentstring=#\|\ %s\ \|#
-
-endif

ftplugin/raml.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'raml') == -1
-  
-set ts=2 sts=2 sw=2 et
-
-endif

ftplugin/ruby.vim

@@ -71,15 +71,15 @@ endif
 
 function! s:query_path(root) abort
   let code = "print $:.join %q{,}"
-  if &shell =~# 'sh' && empty(&shellxquote)
+  if &shell =~# 'sh'
     let prefix = 'env PATH='.shellescape($PATH).' '
   else
     let prefix = ''
   endif
   if &shellxquote == "'"
-    let path_check = prefix.'ruby --disable-gems -e "' . code . '"'
+    let path_check = prefix.'ruby -e --disable-gems"' . code . '"'
   else
-    let path_check = prefix."ruby --disable-gems -e '" . code . "'"
+    let path_check = prefix."ruby -e --disable-gems'" . code . "'"
   endif
 
   let cd = haslocaldir() ? 'lcd' : 'cd'
@@ -164,23 +164,23 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
   nmap <buffer><script> <SID>:  :<C-U>
   nmap <buffer><script> <SID>c: :<C-U><C-R>=v:count ? v:count : ''<CR>
 
-  nnoremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>',['rubyDefine'],'b','n')<CR>
-  nnoremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>',['rubyDefine'],'','n')<CR>
-  nnoremap <silent> <buffer> [M :<C-U>call <SID>searchsyn('\<end\>',['rubyDefine'],'b','n')<CR>
-  nnoremap <silent> <buffer> ]M :<C-U>call <SID>searchsyn('\<end\>',['rubyDefine'],'','n')<CR>
-  xnoremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>',['rubyDefine'],'b','v')<CR>
-  xnoremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>',['rubyDefine'],'','v')<CR>
-  xnoremap <silent> <buffer> [M :<C-U>call <SID>searchsyn('\<end\>',['rubyDefine'],'b','v')<CR>
-  xnoremap <silent> <buffer> ]M :<C-U>call <SID>searchsyn('\<end\>',['rubyDefine'],'','v')<CR>
+  nnoremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','b','n')<CR>
+  nnoremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','','n')<CR>
+  nnoremap <silent> <buffer> [M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','b','n')<CR>
+  nnoremap <silent> <buffer> ]M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','','n')<CR>
+  xnoremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','b','v')<CR>
+  xnoremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','','v')<CR>
+  xnoremap <silent> <buffer> [M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','b','v')<CR>
+  xnoremap <silent> <buffer> ]M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','','v')<CR>
 
-  nnoremap <silent> <buffer> [[ :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>',['rubyModule','rubyClass'],'b','n')<CR>
-  nnoremap <silent> <buffer> ]] :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>',['rubyModule','rubyClass'],'','n')<CR>
-  nnoremap <silent> <buffer> [] :<C-U>call <SID>searchsyn('\<end\>',['rubyModule','rubyClass'],'b','n')<CR>
-  nnoremap <silent> <buffer> ][ :<C-U>call <SID>searchsyn('\<end\>',['rubyModule','rubyClass'],'','n')<CR>
-  xnoremap <silent> <buffer> [[ :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>',['rubyModule','rubyClass'],'b','v')<CR>
-  xnoremap <silent> <buffer> ]] :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>',['rubyModule','rubyClass'],'','v')<CR>
-  xnoremap <silent> <buffer> [] :<C-U>call <SID>searchsyn('\<end\>',['rubyModule','rubyClass'],'b','v')<CR>
-  xnoremap <silent> <buffer> ][ :<C-U>call <SID>searchsyn('\<end\>',['rubyModule','rubyClass'],'','v')<CR>
+  nnoremap <silent> <buffer> [[ :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>','rubyModule\<Bar>rubyClass','b','n')<CR>
+  nnoremap <silent> <buffer> ]] :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>','rubyModule\<Bar>rubyClass','','n')<CR>
+  nnoremap <silent> <buffer> [] :<C-U>call <SID>searchsyn('\<end\>','rubyModule\<Bar>rubyClass','b','n')<CR>
+  nnoremap <silent> <buffer> ][ :<C-U>call <SID>searchsyn('\<end\>','rubyModule\<Bar>rubyClass','','n')<CR>
+  xnoremap <silent> <buffer> [[ :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>','rubyModule\<Bar>rubyClass','b','v')<CR>
+  xnoremap <silent> <buffer> ]] :<C-U>call <SID>searchsyn('\<\%(class\<Bar>module\)\>','rubyModule\<Bar>rubyClass','','v')<CR>
+  xnoremap <silent> <buffer> [] :<C-U>call <SID>searchsyn('\<end\>','rubyModule\<Bar>rubyClass','b','v')<CR>
+  xnoremap <silent> <buffer> ][ :<C-U>call <SID>searchsyn('\<end\>','rubyModule\<Bar>rubyClass','','v')<CR>
 
   let b:undo_ftplugin = b:undo_ftplugin
         \."| sil! exe 'unmap <buffer> [[' | sil! exe 'unmap <buffer> ]]' | sil! exe 'unmap <buffer> []' | sil! exe 'unmap <buffer> ]['"
@@ -290,13 +290,12 @@ function! s:searchsyn(pattern, syn, flags, mode) abort
     norm! gv
   endif
   let i = 0
-  call map(a:syn, 'hlID(v:val)')
   while i < cnt
     let i = i + 1
     let line = line('.')
     let col  = col('.')
     let pos = search(a:pattern,'W'.a:flags)
-    while pos != 0 && index(a:syn, s:synid()) < 0
+    while pos != 0 && s:synname() !~# a:syn
       let pos = search(a:pattern,'W'.a:flags)
     endwhile
     if pos == 0
@@ -306,8 +305,8 @@ function! s:searchsyn(pattern, syn, flags, mode) abort
   endwhile
 endfunction
 
-function! s:synid() abort
-  return synID(line('.'),col('.'),0)
+function! s:synname() abort
+  return synIDattr(synID(line('.'),col('.'),0),'name')
 endfunction
 
 function! s:wrap_i(back,forward) abort
@@ -363,9 +362,8 @@ function! RubyCursorFile() abort
   let pre = matchstr(strpart(getline('.'), 0, col('.')-1), '.*\f\@<!')
   let post = matchstr(strpart(getline('.'), col('.')), '\f\@!.*')
   let ext = getline('.') =~# '^\s*\%(require\%(_relative\)\=\|autoload\)\>' && cfile !~# '\.rb$' ? '.rb' : ''
-  if s:synid() ==# hlID('rubyConstant')
+  if s:synname() ==# 'rubyConstant'
     let cfile = substitute(cfile,'\.\w\+[?!=]\=$','','')
-    let cfile = substitute(cfile,'^::','','')
     let cfile = substitute(cfile,'::','/','g')
     let cfile = substitute(cfile,'\(\u\+\)\(\u\l\)','\1_\2', 'g')
     let cfile = substitute(cfile,'\(\l\|\d\)\(\u\)','\1_\2', 'g')

ftplugin/rust.vim

@@ -1,11 +1,10 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
   
 " Language:     Rust
-" Description:  Vim ftplugin for Rust
+" Description:  Vim syntax file for Rust
 " Maintainer:   Chris Morgan <me@chrismorgan.info>
 " Maintainer:   Kevin Ballard <kevin@sb.org>
 " Last Change:  June 08, 2016
-" For bugs, patches and license go to https://github.com/rust-lang/rust.vim 
 
 if exists("b:did_ftplugin")
 	finish
@@ -49,6 +48,7 @@ endif
 " This includeexpr isn't perfect, but it's a good start
 setlocal includeexpr=substitute(v:fname,'::','/','g')
 
+" NOT adding .rc as it's being phased out (0.7)
 setlocal suffixesadd=.rs
 
 if exists("g:ftplugin_rust_source_path")
@@ -113,6 +113,16 @@ xnoremap <silent> <buffer> ]] :call rust#Jump('v', 'Forward')<CR>
 onoremap <silent> <buffer> [[ :call rust#Jump('o', 'Back')<CR>
 onoremap <silent> <buffer> ]] :call rust#Jump('o', 'Forward')<CR>
 
+" %-matching. <:> is handy for generics.
+set matchpairs+=<:>
+" There are two minor issues with it; (a) comparison operators in expressions,
+" where a less-than may match a greater-than later on—this is deemed a trivial
+" issue—and (b) `Fn() -> X` syntax. This latter issue is irremediable from the
+" highlighting perspective (built into Vim), but the actual % functionality
+" can be fixed by this use of matchit.vim.
+let b:match_skip = 's:comment\|string\|rustArrow'
+source $VIMRUNTIME/macros/matchit.vim
+
 " Commands {{{1
 
 " See |:RustRun| for docs
@@ -133,9 +143,6 @@ command! -range=% RustPlay :call rust#Play(<count>, <line1>, <line2>, <f-args>)
 " See |:RustFmt| for docs
 command! -buffer RustFmt call rustfmt#Format()
 
-" See |:RustFmtRange| for docs
-command! -range -buffer RustFmtRange call rustfmt#FormatRange(<line1>, <line2>)
-
 " Mappings {{{1
 
 " Bind ⌘R in MacVim to :RustRun
@@ -183,24 +190,21 @@ let b:undo_ftplugin = "
 		\|ounmap <buffer> ]]
 		\|set matchpairs-=<:>
 		\|unlet b:match_skip
+		\|augroup! rust.vim
 		\"
 
 " }}}1
 
 " Code formatting on save
 if get(g:, "rustfmt_autosave", 0)
-	autocmd BufWritePre *.rs silent! call rustfmt#Format()
+	autocmd BufWritePre *.rs call rustfmt#Format()
 endif
 
 augroup END
 
-set matchpairs+=<:>
-" For matchit.vim (rustArrow stops `Fn() -> X` messing things up)
-let b:match_skip = 's:comment\|string\|rustArrow'
-
 let &cpo = s:save_cpo
 unlet s:save_cpo
 
-" vim: set noet sw=8 ts=8:
+" vim: set noet sw=4 ts=4:
 
 endif

ftplugin/sass.vim

@@ -0,0 +1,27 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+  
+" Vim filetype plugin
+" Language:	Sass
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2010 Jul 26
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl com< cms< def< inc< inex< ofu< sua<"
+
+setlocal comments=://
+setlocal commentstring=//\ %s
+setlocal define=^\\s*\\%(@mixin\\\|=\\)
+setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
+setlocal omnifunc=csscomplete#CompleteCSS
+setlocal suffixesadd=.sass,.scss,.css
+
+let &l:include = '^\s*@import\s\+\%(url(\)\=["'']\='
+
+" vim:set sw=2:
+
+endif

ftplugin/scala.vim

@@ -18,11 +18,7 @@ silent! setlocal formatoptions+=j
 
 " Just like c.vim, but additionally doesn't wrap text onto /** line when
 " formatting. Doesn't bungle bulleted lists when formatting.
-if get(g:, 'scala_scaladoc_indent', 0)
-  setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s2:/**,mb:*,ex:*/,s1:/*,mb:*,ex:*/,://
-else
-  setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/**,mb:*,ex:*/,s1:/*,mb:*,ex:*/,://
-endif
+setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/**,mb:*,ex:*/,s1:/*,mb:*,ex:*/,://
 setlocal commentstring=//\ %s
 
 setlocal shiftwidth=2 softtabstop=2 expandtab

ftplugin/scss.vim

@@ -1,17 +1,17 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
   
-if exists('b:did_indent') && b:did_indent
-  " be kind. allow users to override this. Does it work?
+" Vim filetype plugin
+" Language:	SCSS
+" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
+" Last Change:	2010 Jul 26
+
+if exists("b:did_ftplugin")
   finish
 endif
 
-setlocal indentexpr=scss_indent#GetIndent(v:lnum)
-
-" Automatically insert the current comment leader after hitting <Enter>
-" in Insert mode respectively after hitting 'o' or 'O' in Normal mode
-setlocal formatoptions+=ro
-
-" SCSS comments are either /* */ or //
+runtime! ftplugin/sass.vim
 setlocal comments=s1:/*,mb:*,ex:*/,://
 
+" vim:set sw=2:
+
 endif

ftplugin/solidity.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'solidity') == -1
-  
-setlocal commentstring=//\ %s
-
-endif

ftplugin/typescript.vim

@@ -15,7 +15,7 @@ setlocal commentstring=//\ %s
 " " and insert the comment leader when hitting <CR> or using "o".
 setlocal formatoptions-=t formatoptions+=croql
 
-setlocal suffixesadd+=.ts,.tsx
+setlocal suffixesadd+=.ts
 
 let b:undo_ftplugin = "setl fo< ofu< com< cms<"
 

ftplugin/vifm-cmdedit.vim

@@ -1,23 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
-" vifm command-line editing buffer filetype plugin
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: August 18, 2013
-
-if exists("b:did_ftplugin")
-	finish
-endif
-
-let b:did_ftplugin = 1
-
-" Behave as vifm script file
-runtime! ftplugin/vifm.vim
-
-" Use vifm script highlighting
-set syntax=vifm
-
-call vifm#edit#Init()
-
-" vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif

ftplugin/vifm-edit.vim

@@ -1,17 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
-" vifm command-line editing buffer filetype plugin
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: August 18, 2013
-
-if exists("b:did_ftplugin")
-	finish
-endif
-
-let b:did_ftplugin = 1
-
-call vifm#edit#Init()
-
-" vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif

ftplugin/vifm-rename.vim

@@ -1,62 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
-" Filetype plugin for vifm rename buffer
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: October 05, 2014
-
-if exists("b:did_ftplugin")
-	finish
-endif
-
-let b:did_ftplugin = 1
-
-" Copy list of original file names
-let s:files = getline(1, '$')
-
-" Closes window/tab/Vim when buffer is left alone in there
-function! s:QuitIfOnlyWindow()
-	" Boil out if there is more than one window
-	if winbufnr(2) != -1
-		return
-	endif
-
-	" Just close tab with this single window or quit Vim with last tab
-	if tabpagenr('$') == 1
-		bdelete
-		quit
-	else
-		close
-	endif
-endfunction
-
-" Create a vertical split window for original file names and configure it
-belowright vsplit __VifmRenameOrig__
-enew
-call setline(1, s:files)
-setlocal buftype=nofile
-setlocal bufhidden=hide
-setlocal noswapfile
-setlocal nobuflisted
-setlocal cursorbind
-setlocal scrollbind
-setlocal nocursorline
-
-" Free now useless list of file names
-unlet s:files
-
-" Setup a hook in auxiliary local window to do not leave it alone, when it's
-" useless
-augroup VifmRenameAutoCmds
-	autocmd! * <buffer>
-	autocmd BufEnter <buffer> call s:QuitIfOnlyWindow()
-augroup END
-
-" Go back to the original window and ensure it will remain synchronized with
-" the auxiliary one
-wincmd w
-setlocal cursorbind
-setlocal scrollbind
-
-" vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif

ftplugin/vifm.vim

@@ -1,50 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-  
-" vifmrc filetype plugin
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: July 08, 2016
-" Based On:    Vim file type file by Bram Moolenaar
-
-if exists("b:did_ftplugin")
-	finish
-endif
-
-let b:did_ftplugin = 1
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-let b:undo_ftplugin = "setlocal formatoptions< comments< textwidth< commentstring<"
-
-" Break comment lines but not other lines
-setlocal formatoptions-=t formatoptions+=croql
-
-" Set comment character
-setlocal comments=:\"
-
-" Format comments to be up to 78 characters long
-if &textwidth == 0
-	setlocal textwidth=78
-endif
-
-" Comments start with a double quote
-setlocal commentstring=\"%s
-
-" Move around comments
-nnoremap <silent><buffer> ]" :call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
-vnoremap <silent><buffer> ]" :<C-U>exe "normal! gv"<Bar>call search('^\(\s*".*\n\)\@<!\(\s*"\)', "W")<CR>
-nnoremap <silent><buffer> [" :call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
-vnoremap <silent><buffer> [" :<C-U>exe "normal! gv"<Bar>call search('\%(^\s*".*\n\)\%(^\s*"\)\@!', "bW")<CR>
-
-" Let the matchit plugin know what items can be matched.
-if exists("loaded_matchit")
-	let b:match_ignorecase = 0
-	let b:match_words = '\<if\>:\<el\%[seif]\>:\<en\%[dif]\>'
-endif
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: set tabstop=2 softtabstop=2 shiftwidth=2 noexpandtab cinoptions-=(0 :
-
-endif

ftplugin/vue.vim

@@ -1,30 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
-  
-" Vim filetype plugin
-" Language: Vue.js
-" Maintainer: Eduardo San Martin Morote
-" Author: Adriaan Zonnenberg
-
-if exists("b:did_ftplugin")
-  finish
-endif
-
-runtime! ftplugin/html.vim
-
-setlocal suffixesadd+=.vue
-
-if !exists('g:no_plugin_maps') && !exists('g:no_vue_maps')
-  nnoremap <silent> <buffer> [[ :call search('^<\(template\<Bar>script\<Bar>style\)', 'bW')<CR>
-  nnoremap <silent> <buffer> ]] :call search('^<\(template\<Bar>script\<Bar>style\)', 'W')<CR>
-  nnoremap <silent> <buffer> [] :call search('^</\(template\<Bar>script\<Bar>style\)', 'bW')<CR>
-  nnoremap <silent> <buffer> ][ :call search('^</\(template\<Bar>script\<Bar>style\)', 'W')<CR>
-endif
-
-if exists('g:loaded_ale')
-  let g:ale_linters = get(g:, 'ale_linters', {})
-  let g:ale_linters.vue = get(g:ale_linters, 'vue', ['eslint'])
-  let g:ale_linter_aliases = get(g:, 'ale_linter_aliases', {})
-  let g:ale_linter_aliases.vue = get(g:ale_linter_aliases, 'vue', 'javascript')
-endif
-
-endif

indent/Jenkinsfile.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jenkins') == -1
-  
-runtime indent/groovy.vim
-
-endif

indent/ansible.vim

@@ -27,12 +27,7 @@ endif
 
 function GetAnsibleIndent(lnum)
   if a:lnum == 1 || !prevnonblank(a:lnum-1)
-    return 0
-  endif
-  if exists("g:ansible_unindent_after_newline")
-    if (a:lnum -1) != prevnonblank(a:lnum - 1)
       return 0
-    endif
   endif
   let prevlnum = prevnonblank(a:lnum - 1)
   let maintain = indent(prevlnum)

indent/autohotkey.vim

@@ -1,223 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'autohotkey') == -1
-  
-" Vim indent file
-" Language:   AutoHotkey
-" Maintainer: Hirotoshi Namikawa <hnamikaw1@gmail.com>
-" URL:        http://github.com/hnamikaw/vim-autohotkey
-" License:    Same as Vim.
-
-if exists('b:did_indent')
-    finish
-endif
-
-setlocal autoindent
-setlocal indentexpr=GetAutoHotkeyIndent()
-setlocal indentkeys=!^F,o,O,0{,0},=if,=else,=return
-setlocal expandtab
-
-let b:undo_indent = 'setlocal '.join([
-            \   'autoindent<',
-            \   'indentexpr<',
-            \   'indentkeys<',
-            \   'expandtab<',
-            \ ])
-
-let s:TRUE = !0
-let s:FALSE = 0
-
-" Check BEGIN BLOCK
-" TRUE:
-" {
-" { ; with comment
-" if {
-" if { ; with comment
-"
-" FALSE:
-" ; if { comment
-" sleep 1000 ; {
-function! IsBeginBlockByStr(str)
-    return a:str =~? '^[^;]*{\s*\(;.*\)\?$' ? s:TRUE : s:FALSE
-endfunction
-
-" Check END BLOCK
-" TRUE:
-" }
-" } ; with comment
-" } else {
-" } else { ; with comment
-"
-" FALSE:
-" ; } else {
-function! IsEndBlockByStr(str)
-    return a:str =~? '^\s*}.*\(;.*\)\?$' ? s:TRUE : s:FALSE
-endfunction
-
-" Check DOUBLE CORON
-" TRUE:
-" LAlt up::
-" LAlt up:: ; with comment
-"
-" FALSE:
-" ; LAlt up::
-" sleep 1000 ; ::
-function! IsDoubleCoronByStr(str)
-    return a:str =~? '^[^;]*::\s*\(;.*\)\?$' ? s:TRUE : s:FALSE
-endfunction
-
-" Check RETURN
-" TRUE:
-" return
-" return 1
-" return ; with comment
-"
-" FALSE:
-" ; return
-function! IsReturnByStr(str)
-    return a:str =~? '^\s*return.*\(;.*\)\?$' ? s:TRUE : s:FALSE
-endfunction
-
-" Check IF STATEMENT(without BLOCK)
-" TRUE:
-" if
-" if ; with comment
-" else
-" else ; with comment
-"
-" FALSE:
-" if {
-" else {
-function! IsIfStatementByStr(str)
-    return a:str =~? '^\s*\(if\|else\)[^{]*\(;.*\)\?$' ? s:TRUE : s:FALSE
-endfunction
-
-" Check inside of BLOCK.
-" TRUE:
-" if {
-"     hogehoge
-"     fugafuga <--- line_num
-" }
-"
-" FALSE:
-" foobar <--- line_num
-function! IsInsideOfBlockByNum(line_num)
-    let block_indent_level = 0
-
-    for scan_line_num in range(1, a:line_num)
-        if IsBeginBlockByStr(getline(scan_line_num)) == s:TRUE
-            let block_indent_level += 1
-        endif
-
-        if IsEndBlockByStr(getline(scan_line_num)) == s:TRUE
-            let block_indent_level -= 1
-        endif
-    endfor
-
-    return block_indent_level >= 1 ? s:TRUE : s:FALSE
-endfunction
-
-function! AddIndentByInd(indent)
-    return a:indent + &l:shiftwidth
-endfunction
-
-function! UnIndentByInd(indent)
-    return a:indent - &l:shiftwidth
-endfunction
-
-function! GetAutoHotkeyIndent()
-    let  l0_num = v:lnum
-    let  l1_num = v:lnum - 1
-    let pl1_num = prevnonblank(l1_num)
-    let pl2_num = prevnonblank(pl1_num - 1)
-
-    let  l0_str = getline(l0_num)
-    let pl1_str = getline(pl1_num)
-    let pl2_str = getline(pl2_num)
-    let pl1_ind = indent(pl1_num)
-    let pl2_ind = indent(pl2_num)
-
-    " Case: Next line of IF STATEMENT(without BLOCK)
-    " if bar = 1
-    "     callFunc1() <--- AddIndent
-    "
-    " if bar = 1
-    " { <--- No! AddIndent
-    if IsIfStatementByStr(pl1_str) == s:TRUE && IsBeginBlockByStr(l0_str) == s:FALSE
-        return AddIndentByInd(pl1_ind)
-    endif
-
-    " Case: End of IF STATEMENT(without BLOCK)
-    " if bar = 1
-    "     callFunc1()
-    " if bar = 2 <--- UnIndent
-    "
-    " Case: End of IF STATEMENT(without BLOCK) and END BLOCK(of outer block)
-    " if foo
-    " {
-    "     if bar = 3
-    "         callFunc3()
-    " } <--- UnIndent (2level)
-    if IsIfStatementByStr(pl2_str) == s:TRUE && IsBeginBlockByStr(pl1_str) == s:FALSE
-        if IsEndBlockByStr(l0_str) == s:FALSE
-            return UnIndentByInd(pl1_ind)
-        else
-            return UnIndentByInd(pl2_ind)
-        endif
-    endif
-
-    " Case: Next line of BEGIN BLOCK
-    " Swap(ByRef Left, ByRef Right)
-    " {
-    "     temp := Left <--- AddIndent
-    "     Left := Right
-    "     Right := temp
-    " }
-    if IsBeginBlockByStr(pl1_str) == s:TRUE
-        return AddIndentByInd(pl1_ind)
-    endif
-
-    " Case: END BLOCK
-    " Swap(ByRef Left, ByRef Right)
-    " {
-    "     temp := Left
-    "     Left := Right
-    "     Right := temp
-    " } <--- UnIndent
-    if IsEndBlockByStr(l0_str) == s:TRUE
-        return UnIndentByInd(pl1_ind)
-    endif
-
-    " Case: Next line of DOUBLE CORON
-    " #n::
-    "     Run Notepad <--- AddIndent
-    " return
-    if IsDoubleCoronByStr(pl1_str) == s:TRUE
-        return AddIndentByInd(pl1_ind)
-    endif
-
-    " Case: RETURN
-    " Note: It is not nothing if in the BLOCK.
-    " #n::
-    "     Run Notepad
-    " return <--- UnIndent
-    " ~~~
-    " if foo
-    " {
-    "     callFunc1()
-    "     return <--- No! UnIndent
-    " }
-    if IsReturnByStr(l0_str) == s:TRUE && IsInsideOfBlockByNum(l0_num) == s:FALSE
-        return UnIndentByInd(pl1_ind)
-    endif
-
-    " Case: Top line.
-    if pl1_num == 0
-        return 0
-    endif
-
-    " Case: It does not match anything.
-    return pl1_ind
-endfunction
-
-let b:did_indent = 1
-
-endif

indent/blade.vim

@@ -4,22 +4,22 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'blade') == -1
 " Language:     Blade (Laravel)
 " Maintainer:   Jason Walton <jwalton512@gmail.com>
 
-if exists('b:did_indent')
+if exists("b:did_indent")
     finish
 endif
 
 runtime! indent/html.vim
 let s:htmlindent = &indentexpr
-
 unlet! b:did_indent
+
 runtime! indent/php.vim
 let s:phpindent = &indentexpr
+unlet! b:did_indent
 
 let b:did_indent = 1
 
 " Doesn't include 'foreach' and 'forelse' because these already get matched by 'for'.
-let s:directives_start = 'if\|else\|unless\|for\|while\|empty\|push\|section\|can\|hasSection\|verbatim\|php\|' .
-            \ 'component\|slot\|prepend\|auth\|guest'
+let s:directives_start = 'if\|else\|unless\|for\|while\|empty\|push\|section\|can\|hasSection\|verbatim'
 let s:directives_end = 'else\|end\|empty\|show\|stop\|append\|overwrite'
 
 if exists('g:blade_custom_directives_pairs')
@@ -29,71 +29,55 @@ endif
 
 setlocal autoindent
 setlocal indentexpr=GetBladeIndent()
-exe 'setlocal indentkeys=o,O,<>>,!^F,0=}},0=!!},=@' . substitute(s:directives_end, '\\|', ',=@', 'g')
+exe "setlocal indentkeys=o,O,<>>,!^F,0=}},0=!!},=@" . substitute(s:directives_end, '\\|', ',=@', 'g')
 
 " Only define the function once.
-if exists('*GetBladeIndent')
+if exists("*GetBladeIndent")
     finish
 endif
 
-function! s:IsStartingDelimiter(lnum)
-    let line = getline(a:lnum)
-    return line =~# '\%(\w\|@\)\@<!@\%(' . s:directives_start . '\)\%(.*@end\|.*@stop\)\@!'
-                \ || line =~# '{{\%(.*}}\)\@!'
-                \ || line =~# '{!!\%(.*!!}\)\@!'
-                \ || line =~# '<?\%(.*?>\)\@!'
-endfunction
-
 function! GetBladeIndent()
-    let lnum = prevnonblank(v:lnum - 1)
+    let lnum = prevnonblank(v:lnum-1)
     if lnum == 0
         return 0
     endif
 
-    let line = getline(lnum)
-    let cline = getline(v:lnum)
+    let line = substitute(substitute(getline(lnum), '\s\+$', '', ''), '^\s\+', '', '')
+    let cline = substitute(substitute(getline(v:lnum), '\s\+$', '', ''), '^\s\+', '', '')
     let indent = indent(lnum)
-
-    " 1. Check for special directives
-    " @section is a single-line directive if it has a second argument.
-    " @php is a single-line directive if it is followed by parentheses.
-    if (line =~# '@section\%(.*@end\)\@!' && line !~# '@section\s*([^,]*)')
-                \ || line =~# '@php\s*('
-        return indent
-    endif
-
-    " 2. When the current line is an ending delimiter: decrease indentation
-    "    if the previous line wasn't a starting delimiter.
-    if cline =~# '^\s*@\%(' . s:directives_end . '\)'
-                \ || cline =~# '\%(<?.*\)\@<!?>'
-                \ || cline =~# '\%({{.*\)\@<!}}'
-                \ || cline =~# '\%({!!.*\)\@<!!!}'
-        return s:IsStartingDelimiter(lnum) ? indent : indent - &sw
-    endif
-
-    " 3. Increase indentation if the line contains a starting delimiter.
-    if s:IsStartingDelimiter(lnum)
-        return indent + &sw
-    endif
-
-    " 4. External indent scripts (PHP and HTML)
-    execute 'let indent = ' . s:htmlindent
-
-    if exists('*GetBladeIndentCustom')
-        let indent = GetBladeIndentCustom()
-    elseif line !~# '^\s*\%(#\|//\)\|\*/\s*$' && (
-                \ searchpair('@include\%(If\)\?\s*(', '', ')', 'bWr') ||
-                \ searchpair('{!!', '', '!!}', 'bWr') ||
-                \ searchpair('{{', '', '}}', 'bWr') ||
-                \ searchpair('<?', '', '?>', 'bWr') ||
-                \ searchpair('@php\s*(\@!', '', '@endphp', 'bWr') )
-        " Only use PHP's indent if the region spans multiple lines
-        if !s:IsStartingDelimiter(v:lnum)
-            execute 'let indent = ' . s:phpindent
+    if cline =~# '@\%(' . s:directives_end . '\)' ||
+                \ cline =~# '\%(<?.*\)\@<!?>\|\%({{.*\)\@<!}}\|\%({!!.*\)\@<!!!}'
+        let indent = indent - &sw
+    elseif line =~# '<?\%(.*?>\)\@!\|@php\%(\s*(\)\@!'
+        let indent = indent + &sw
+    else
+        if exists("*GetBladeIndentCustom")
+            let hindent = GetBladeIndentCustom()
+        " Don't use PHP indentation if line is a comment
+        elseif line !~# '^\s*\%(#\|//\)\|\*/\s*$' && (
+                    \ searchpair('@include\%(If\)\?\s*(', '', ')', 'bWr') ||
+                    \ searchpair('{!!', '', '!!}', 'bWr') ||
+                    \ searchpair('{{', '', '}}', 'bWr') ||
+                    \ searchpair('<?', '', '?>', 'bWr') ||
+                    \ searchpair('@php\%(\s*(\)\@!', '', '@endphp', 'bWr') )
+            execute 'let hindent = ' . s:phpindent
+        else
+            execute 'let hindent = ' . s:htmlindent
+        endif
+        if hindent > -1
+            let indent = hindent
         endif
     endif
+    let increase = indent + &sw
 
-    return indent
+    if line =~# '@\%(section\)\%(.*@end\)\@!' && line !~# '@\%(section\)\s*([^,]*)'
+        return indent
+    elseif line =~# '@\%(' . s:directives_start . '\)\%(.*@end\|.*@stop\)\@!' ||
+                \ line =~# '{{\%(.*}}\)\@!' || line =~# '{!!\%(.*!!}\)\@!'
+        return increase
+    else
+        return indent
+    endif
 endfunction
 
 endif

indent/caddyfile.vim

@@ -1,46 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
-  
-if exists('b:did_indent')
-	finish
-endif
-let b:did_indent = 1
-
-setlocal nolisp
-setlocal autoindent
-setlocal indentexpr=GetCaddyfileIndent(v:lnum)
-setlocal indentkeys+=<:>,0=},0=)
-" setlocal cindent
-
-if exists('*shiftwidth')
-	func s:sw()
-		return shiftwidth()
-	endfunc
-else
-	func s:sw()
-		return &sw
-	endfunc
-endif
-
-function! GetCaddyfileIndent(lnum)
-	let prevlnum = prevnonblank(a:lnum-1)
-	if prevlnum == 0
-		return 0
-	endif
-
-	let thisl = substitute(getline(a:lnum), '#.*$', '', '')
-	let prevl = substitute(getline(prevlnum), '#.*$', '', '')
-
-	let ind = indent(prevlnum)
-
-	if prevl =~ '{\s*$'
-		let ind += s:sw()
-	endif
-
-	if thisl =~ '^\s*}\s*$'
-		let ind -= s:sw()
-	endif
-
-	return ind
-endfunction
-
-endif

indent/clojure.vim

@@ -89,7 +89,7 @@ if exists("*searchpairpos")
 	function! s:match_pairs(open, close, stopat)
 		" Stop only on vector and map [ resp. {. Ignore the ones in strings and
 		" comments.
-		if a:stopat == 0 && g:clojure_maxlines > 0
+		if a:stopat == 0
 			let stopat = max([line(".") - g:clojure_maxlines, 0])
 		else
 			let stopat = a:stopat
@@ -123,7 +123,7 @@ if exists("*searchpairpos")
 			if s:syn_id_name() !~? "string"
 				return -1
 			endif
-			if s:current_char() != '\'
+			if s:current_char() != '\\'
 				return -1
 			endif
 			call cursor(0, col("$") - 1)
@@ -192,7 +192,11 @@ if exists("*searchpairpos")
 	" Check if form is a reader conditional, that is, it is prefixed by #?
 	" or @#?
 	function! s:is_reader_conditional_special_case(position)
-		return getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"
+		if getline(a:position[0])[a:position[1] - 3 : a:position[1] - 2] == "#?"
+			return 1
+		endif
+
+		return 0
 	endfunction
 
 	" Returns 1 for opening brackets, -1 for _anything else_.
@@ -290,19 +294,6 @@ if exists("*searchpairpos")
 			return paren
 		endif
 
-		" If the keyword begins with #, check if it is an anonymous
-		" function or set, in which case we indent by the shiftwidth
-		" (minus one if g:clojure_align_subforms = 1), or if it is
-		" ignored, in which case we use the ( position for indent.
-		if w[0] == "#"
-			" TODO: Handle #=() and other rare reader invocations?
-			if w[1] == '(' || w[1] == '{'
-				return [paren[0], paren[1] + (g:clojure_align_subforms ? 0 : &shiftwidth - 1)]
-			elseif w[1] == '_'
-				return paren
-			endif
-		endif
-
 		" Test words without namespace qualifiers and leading reader macro
 		" metacharacters.
 		"

indent/cmake.vim

@@ -1,93 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cmake') == -1
-  
-" Vim indent file
-" Language:     CMake (ft=cmake)
-" Author:       Andy Cedilnik <andy.cedilnik@kitware.com>
-" Maintainer:   Dimitri Merejkowsky <d.merej@gmail.com>
-" Former Maintainer: Karthik Krishnan <karthik.krishnan@kitware.com>
-" Last Change:  2017 Aug 30
-"
-" Licence:      The CMake license applies to this file. See
-"               https://cmake.org/licensing
-"               This implies that distribution with Vim is allowed
-
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-let s:keepcpo= &cpo
-set cpo&vim
-
-setlocal indentexpr=CMakeGetIndent(v:lnum)
-setlocal indentkeys+==ENDIF(,ENDFOREACH(,ENDMACRO(,ELSE(,ELSEIF(,ENDWHILE(
-
-" Only define the function once.
-if exists("*CMakeGetIndent")
-  finish
-endif
-
-fun! CMakeGetIndent(lnum)
-  let this_line = getline(a:lnum)
-
-  " Find a non-blank line above the current line.
-  let lnum = a:lnum
-  let lnum = prevnonblank(lnum - 1)
-  let previous_line = getline(lnum)
-
-  " Hit the start of the file, use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-  let ind = indent(lnum)
-
-  let or = '\|'
-  " Regular expressions used by line indentation function.
-  let cmake_regex_comment = '#.*'
-  let cmake_regex_identifier = '[A-Za-z][A-Za-z0-9_]*'
-  let cmake_regex_quoted = '"\([^"\\]\|\\.\)*"'
-  let cmake_regex_arguments = '\(' . cmake_regex_quoted .
-                    \       or . '\$(' . cmake_regex_identifier . ')' .
-                    \       or . '[^()\\#"]' . or . '\\.' . '\)*'
-
-  let cmake_indent_comment_line = '^\s*' . cmake_regex_comment
-  let cmake_indent_blank_regex = '^\s*$'
-  let cmake_indent_open_regex = '^\s*' . cmake_regex_identifier .
-                    \           '\s*(' . cmake_regex_arguments .
-                    \           '\(' . cmake_regex_comment . '\)\?$'
-
-  let cmake_indent_close_regex = '^' . cmake_regex_arguments .
-                    \            ')\s*' .
-                    \            '\(' . cmake_regex_comment . '\)\?$'
-
-  let cmake_indent_begin_regex = '^\s*\(IF\|MACRO\|FOREACH\|ELSE\|ELSEIF\|WHILE\|FUNCTION\)\s*('
-  let cmake_indent_end_regex = '^\s*\(ENDIF\|ENDFOREACH\|ENDMACRO\|ELSE\|ELSEIF\|ENDWHILE\|ENDFUNCTION\)\s*('
-
-  " Add
-  if previous_line =~? cmake_indent_comment_line " Handle comments
-    let ind = ind
-  else
-    if previous_line =~? cmake_indent_begin_regex
-      let ind = ind + shiftwidth()
-    endif
-    if previous_line =~? cmake_indent_open_regex
-      let ind = ind + shiftwidth()
-    endif
-  endif
-
-  " Subtract
-  if this_line =~? cmake_indent_end_regex
-    let ind = ind - shiftwidth()
-  endif
-  if previous_line =~? cmake_indent_close_regex
-    let ind = ind - shiftwidth()
-  endif
-
-  return ind
-endfun
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-endif

indent/cython.vim

@@ -1,433 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-ident') == -1
-  
-" PEP8 compatible Python indent file
-" Language:         Python
-" Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
-" Prev Maintainer:  Hynek Schlawack <hs@ox.cx>
-" Prev Maintainer:  Eric Mc Sween <em@tomcom.de> (address invalid)
-" Original Author:  David Bustos <bustos@caltech.edu> (address invalid)
-" License:          CC0
-"
-" vim-python-pep8-indent - A nicer Python indentation style for vim.
-" Written in 2004 by David Bustos <bustos@caltech.edu>
-" Maintained from 2004-2005 by Eric Mc Sween <em@tomcom.de>
-" Maintained from 2013 by Hynek Schlawack <hs@ox.cx>
-" Maintained from 2017 by Daniel Hahler <https://daniel.hahler.de/>
-"
-" To the extent possible under law, the author(s) have dedicated all copyright
-" and related and neighboring rights to this software to the public domain
-" worldwide. This software is distributed without any warranty.
-" You should have received a copy of the CC0 Public Domain Dedication along
-" with this software. If not, see
-" <http://creativecommons.org/publicdomain/zero/1.0/>.
-
-" Only load this indent file when no other was loaded.
-if exists('b:did_indent')
-    finish
-endif
-let b:did_indent = 1
-
-setlocal nolisp
-setlocal autoindent
-setlocal indentexpr=GetPythonPEPIndent(v:lnum)
-setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
-
-if !exists('g:python_pep8_indent_multiline_string')
-    let g:python_pep8_indent_multiline_string = 0
-endif
-
-let s:block_rules = {
-            \ '^\s*elif\>': ['if', 'elif'],
-            \ '^\s*except\>': ['try', 'except'],
-            \ '^\s*finally\>': ['try', 'except', 'else']
-            \ }
-let s:block_rules_multiple = {
-            \ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'],
-            \ }
-" Pairs to look for when searching for opening parenthesis.
-" The value is the maximum offset in lines.
-let s:paren_pairs = {'()': 50, '[]': 100, '{}': 1000}
-
-if &filetype ==# 'pyrex' || &filetype ==# 'cython'
-    let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
-else
-    let b:control_statement = '\v^\s*(class|def|if|while|with|for|except)>'
-endif
-let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>'
-
-" Skip strings and comments. Return 1 for chars to skip.
-" jedi* refers to syntax definitions from jedi-vim for call signatures, which
-" are inserted temporarily into the buffer.
-let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
-            \ '=~? "\\vstring|comment|jedi\\S"'
-
-let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
-            \ '=~? "\\vcomment|jedi\\S"'
-
-" Also ignore anything concealed.
-" Wrapper around synconcealed for older Vim (7.3.429, used on Travis CI).
-function! s:is_concealed(line, col)
-    let concealed = synconcealed(a:line, a:col)
-    return len(concealed) && concealed[0]
-endfunction
-if has('conceal')
-    let s:skip_special_chars .= '|| s:is_concealed(line("."), col("."))'
-endif
-
-
-let s:skip_search = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
-            \ '=~? "comment"'
-
-" Use 'shiftwidth()' instead of '&sw'.
-" (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop').
-if exists('*shiftwidth')
-    function! s:sw()
-        return shiftwidth()
-    endfunction
-else
-    function! s:sw()
-        return &shiftwidth
-    endfunction
-endif
-
-function! s:pair_sort(x, y)
-    if a:x[0] == a:y[0]
-        return a:x[1] == a:y[1] ? 0 : a:x[1] > a:y[1] ? 1 : -1
-    else
-        return a:x[0] > a:y[0] ? 1 : -1
-    endif
-endfunction
-
-" Find backwards the closest open parenthesis/bracket/brace.
-function! s:find_opening_paren(...)
-    " optional arguments: line and column (defaults to 1) to search around
-    if a:0 > 0
-        let view = winsaveview()
-        call cursor(a:1, a:0 > 1 ? a:2 : 1)
-        let ret = s:find_opening_paren()
-        call winrestview(view)
-        return ret
-    endif
-
-    " Return if cursor is in a comment.
-    exe 'if' s:skip_search '| return [0, 0] | endif'
-
-    let nearest = [0, 0]
-    for [p, maxoff] in items(s:paren_pairs)
-        let stopline = max([0, line('.') - maxoff, nearest[0]])
-        let next = searchpairpos(
-           \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline)
-        if next[0] && (next[0] > nearest[0] || (next[0] == nearest[0] && next[1] > nearest[1]))
-            let nearest = next
-        endif
-    endfor
-    return nearest
-endfunction
-
-" Find the start of a multi-line statement
-function! s:find_start_of_multiline_statement(lnum)
-    let lnum = a:lnum
-    while lnum > 0
-        if getline(lnum - 1) =~# '\\$'
-            let lnum = prevnonblank(lnum - 1)
-        else
-            let [paren_lnum, _] = s:find_opening_paren(lnum)
-            if paren_lnum < 1
-                return lnum
-            else
-                let lnum = paren_lnum
-            endif
-        endif
-    endwhile
-endfunction
-
-" Find possible indent(s) of the block starter that matches the current line.
-function! s:find_start_of_block(lnum, types, multiple)
-    let r = []
-    let types = copy(a:types)
-    let re = '\V\^\s\*\('.join(a:types, '\|').'\)\>'
-    let lnum = a:lnum
-    let last_indent = indent(lnum) + 1
-    while lnum > 0 && last_indent > 0
-        let indent = indent(lnum)
-        if indent < last_indent
-            for type in types
-                let re = '\v^\s*'.type.'>'
-                if getline(lnum) =~# re
-                    if !a:multiple
-                        return [indent]
-                    endif
-                    if index(r, indent) == -1
-                        let r += [indent]
-                    endif
-                    " Remove any handled type, e.g. 'if'.
-                    call remove(types, index(types, type))
-                endif
-            endfor
-            let last_indent = indent(lnum)
-        endif
-        let lnum = prevnonblank(lnum - 1)
-    endwhile
-    return r
-endfunction
-
-" Is "expr" true for every position in "lnum", beginning at "start"?
-" (optionally up to a:1 / 4th argument)
-function! s:match_expr_on_line(expr, lnum, start, ...)
-    let text = getline(a:lnum)
-    let end = a:0 ? a:1 : len(text)
-    if a:start > end
-        return 1
-    endif
-    let save_pos = getpos('.')
-    let r = 1
-    for i in range(a:start, end)
-        call cursor(a:lnum, i)
-        if !(eval(a:expr) || text[i-1] =~# '\s')
-            let r = 0
-            break
-        endif
-    endfor
-    call setpos('.', save_pos)
-    return r
-endfunction
-
-" Line up with open parenthesis/bracket/brace.
-function! s:indent_like_opening_paren(lnum)
-    let [paren_lnum, paren_col] = s:find_opening_paren(a:lnum)
-    if paren_lnum <= 0
-        return -2
-    endif
-    let text = getline(paren_lnum)
-    let base = indent(paren_lnum)
-
-    let nothing_after_opening_paren = s:match_expr_on_line(
-                \ s:skip_after_opening_paren, paren_lnum, paren_col+1)
-    let starts_with_closing_paren = getline(a:lnum) =~# '^\s*[])}]'
-
-    if nothing_after_opening_paren
-        if starts_with_closing_paren
-            let res = base
-        else
-            let res = base + s:sw()
-        endif
-    else
-        " Indent to match position of opening paren.
-        let res = paren_col
-    endif
-
-    " If this line is the continuation of a control statement
-    " indent further to distinguish the continuation line
-    " from the next logical line.
-    if text =~# b:control_statement && res == base + s:sw()
-        return base + s:sw() * 2
-    else
-        return res
-    endif
-endfunction
-
-" Match indent of first block of this type.
-function! s:indent_like_block(lnum)
-    let text = getline(a:lnum)
-    for [multiple, block_rules] in [
-                \ [0, s:block_rules],
-                \ [1, s:block_rules_multiple]]
-        for [line_re, blocks] in items(block_rules)
-            if text !~# line_re
-                continue
-            endif
-
-            let indents = s:find_start_of_block(a:lnum - 1, blocks, multiple)
-            if !len(indents)
-                return -1
-            endif
-            if len(indents) == 1
-                return indents[0]
-            endif
-
-            " Multiple valid indents, e.g. for 'else' with both try and if.
-            let indent = indent(a:lnum)
-            if index(indents, indent) != -1
-                " The indent is valid, keep it.
-                return indent
-            endif
-            " Fallback to the first/nearest one.
-            return indents[0]
-        endfor
-    endfor
-    return -2
-endfunction
-
-function! s:indent_like_previous_line(lnum)
-    let lnum = prevnonblank(a:lnum - 1)
-
-    " No previous line, keep current indent.
-    if lnum < 1
-      return -1
-    endif
-
-    let text = getline(lnum)
-    let start = s:find_start_of_multiline_statement(lnum)
-    let base = indent(start)
-    let current = indent(a:lnum)
-
-    " Jump to last character in previous line.
-    call cursor(lnum, len(text))
-    let ignore_last_char = eval(s:skip_special_chars)
-
-    " Search for final colon that is not inside something to be ignored.
-    while 1
-        let curpos = getpos('.')[2]
-        if curpos == 1 | break | endif
-        if eval(s:skip_special_chars) || text[curpos-1] =~# '\s'
-            normal! h
-            continue
-        elseif text[curpos-1] ==# ':'
-            return base + s:sw()
-        endif
-        break
-    endwhile
-
-    if text =~# '\\$' && !ignore_last_char
-        " If this line is the continuation of a control statement
-        " indent further to distinguish the continuation line
-        " from the next logical line.
-        if getline(start) =~# b:control_statement
-            return base + s:sw() * 2
-        endif
-
-        " Nest (other) explicit continuations only one level deeper.
-        return base + s:sw()
-    endif
-
-    let empty = getline(a:lnum) =~# '^\s*$'
-
-    " Current and prev line are empty, next is not -> indent like next.
-    if empty && a:lnum > 1 &&
-          \ (getline(a:lnum - 1) =~# '^\s*$') &&
-          \ !(getline(a:lnum + 1) =~# '^\s*$')
-      return indent(a:lnum + 1)
-    endif
-
-    " If the previous statement was a stop-execution statement or a pass
-    if getline(start) =~# s:stop_statement
-        " Remove one level of indentation if the user hasn't already dedented
-        if empty || current > base - s:sw()
-            return base - s:sw()
-        endif
-        " Otherwise, trust the user
-        return -1
-    endif
-
-    if !empty && s:is_dedented_already(current, base)
-        return -1
-    endif
-
-    " In all other cases, line up with the start of the previous statement.
-    return base
-endfunction
-
-" If this line is dedented and the number of indent spaces is valid
-" (multiple of the indentation size), trust the user.
-function! s:is_dedented_already(current, base)
-    let dedent_size = a:current - a:base
-    return (dedent_size < 0 && a:current % s:sw() == 0) ? 1 : 0
-endfunction
-
-" Is the syntax at lnum (and optionally cnum) a python string?
-function! s:is_python_string(lnum, ...)
-    let line = getline(a:lnum)
-    let linelen = len(line)
-    if linelen < 1
-      let linelen = 1
-    endif
-    let cols = a:0 ? type(a:1) != type([]) ? [a:1] : a:1 : range(1, linelen)
-    for cnum in cols
-        if match(map(synstack(a:lnum, cnum),
-                    \ "synIDattr(v:val, 'name')"), 'python\S*String') == -1
-            return 0
-        end
-    endfor
-    return 1
-endfunction
-
-function! GetPythonPEPIndent(lnum)
-    " First line has indent 0
-    if a:lnum == 1
-        return 0
-    endif
-
-    let line = getline(a:lnum)
-    let prevline = getline(a:lnum-1)
-
-    " Multilinestrings: continous, docstring or starting.
-    if s:is_python_string(a:lnum-1, len(prevline))
-                \ && (s:is_python_string(a:lnum, 1)
-                \     || match(line, '^\%("""\|''''''\)') != -1)
-
-        " Indent closing quotes as the line with the opening ones.
-        let match_quotes = match(line, '^\s*\zs\%("""\|''''''\)')
-        if match_quotes != -1
-            " closing multiline string
-            let quotes = line[match_quotes:(match_quotes+2)]
-            let pairpos = searchpairpos(quotes, '', quotes, 'b')
-            if pairpos[0] != 0
-                return indent(pairpos[0])
-            else
-                " TODO: test to cover this!
-            endif
-        endif
-
-        if s:is_python_string(a:lnum-1)
-            " Previous line is (completely) a string.
-            return indent(a:lnum-1)
-        endif
-
-        if match(prevline, '^\s*\%("""\|''''''\)') != -1
-            " docstring.
-            return indent(a:lnum-1)
-        endif
-
-        let indent_multi = get(b:, 'python_pep8_indent_multiline_string',
-                    \ get(g:, 'python_pep8_indent_multiline_string', 0))
-        if match(prevline, '\v%("""|'''''')$') != -1
-            " Opening multiline string, started in previous line.
-            if (&autoindent && indent(a:lnum) == indent(a:lnum-1))
-                        \ || match(line, '\v^\s+$') != -1
-                " <CR> with empty line or to split up 'foo("""bar' into
-                " 'foo("""' and 'bar'.
-                if indent_multi == -2
-                    return indent(a:lnum-1) + s:sw()
-                endif
-                return indent_multi
-            endif
-        endif
-
-        " Keep existing indent.
-        if match(line, '\v^\s*\S') != -1
-            return -1
-        endif
-
-        if indent_multi != -2
-            return indent_multi
-        endif
-
-        return s:indent_like_opening_paren(a:lnum)
-    endif
-
-    " Parens: If we can find an open parenthesis/bracket/brace, line up with it.
-    let indent = s:indent_like_opening_paren(a:lnum)
-    if indent >= -1
-        return indent
-    endif
-
-    " Blocks: Match indent of first block of this type.
-    let indent = s:indent_like_block(a:lnum)
-    if indent >= -1
-        return indent
-    endif
-
-    return s:indent_like_previous_line(a:lnum)
-endfunction
-
-endif

indent/dart.vim

@@ -8,32 +8,6 @@ let b:did_indent = 1
 setlocal cindent
 setlocal cinoptions+=j1,J1
 
-setlocal indentexpr=DartIndent()
-
 let b:undo_indent = 'setl cin< cino<'
 
-if exists("*DartIndent")
-  finish
-endif
-
-function! DartIndent()
-  " Default to cindent in most cases
-  let indentTo = cindent(v:lnum)
-
-  let previousLine = getline(prevnonblank(v:lnum - 1))
-  let currentLine = getline(v:lnum)
-
-  " Don't indent after an annotation
-  if previousLine =~# '^\s*@.*$'
-    let indentTo = indent(v:lnum - 1)
-  endif
-
-  " Indent after opening List literal
-  if previousLine =~# '\[$' && !(currentLine =~# '^\s*\]')
-    let indentTo = indent(v:lnum - 1) + &shiftwidth
-  endif
-
-  return indentTo
-endfunction
-
 endif

indent/eelixir.vim

@@ -8,9 +8,6 @@ runtime! indent/elixir.vim
 unlet! b:did_indent
 setlocal indentexpr=
 
-let s:cpo_save = &cpo
-set cpo&vim
-
 if exists("b:eelixir_subtype")
   exe "runtime! indent/".b:eelixir_subtype.".vim"
 else
@@ -56,21 +53,19 @@ function! GetEelixirIndent(...)
   let line = getline(lnum)
   let cline = getline(v:lnum)
   if cline =~# '^\s*<%\s*\%(end\|else\|elsif\|catch\|after\|rescue\)\>.*%>'
-    let ind -= &sw
+    let ind = ind - &sw
   elseif line =~# '\S\s*<%\s*end\s*%>'
-    let ind -= &sw
+    let ind = ind - &sw
   endif
-  if line =~# '<%[=%]\=\s*.*\(\<do\|->\)\s*%>' ||
-        \ line =~# '<%\s*\%(else\|elsif\|catch\|after\|rescue\)\>.*%>'
-    let ind += &sw
+  if line =~# '<%[=%]\=\s*.*\<do\s*%>'
+    let ind = ind + &sw
+  elseif line =~# '<%\s*\%(else\|elsif\|catch\|after\|rescue\)\>.*%>'
+    let ind = ind + &sw
   endif
   if cline =~# '^\s*%>\s*$'
-    let ind -= &sw
+    let ind = ind - &sw
   endif
   return ind
 endfunction
 
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
 endif

indent/elixir.vim

@@ -2,18 +2,144 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
   
 if exists("b:did_indent")
   finish
-end
+endif
 let b:did_indent = 1
 
-setlocal indentexpr=elixir#indent(v:lnum)
+setlocal nosmartindent
 
-setlocal indentkeys+==after,=catch,=do,=else,=end,=rescue,
-setlocal indentkeys+=*<Return>,=->,=\|>,=<>,0},0],0)
+setlocal indentexpr=GetElixirIndent()
+setlocal indentkeys+=0),0],0=end,0=else,0=match,0=elsif,0=catch,0=after,0=rescue
 
-" TODO: @jbodah 2017-02-27: all operators should cause reindent when typed
+if exists("*GetElixirIndent")
+  finish
+endif
 
-function! elixir#indent(lnum)
-  return elixir#indent#indent(a:lnum)
+let s:cpo_save = &cpo
+set cpo&vim
+
+let s:no_colon_before        = ':\@<!'
+let s:no_colon_after         = ':\@!'
+let s:symbols_end            = '\]\|}\|)'
+let s:symbols_start          = '\[\|{\|('
+let s:arrow                  = '^.*->$'
+let s:skip_syntax            = '\%(Comment\|String\)$'
+let s:block_skip             = "synIDattr(synID(line('.'),col('.'),1),'name') =~? '".s:skip_syntax."'"
+let s:block_start            = '\<\%(do\|fn\)\>'
+let s:block_middle           = 'else\|match\|elsif\|catch\|after\|rescue'
+let s:block_end              = 'end'
+let s:starts_with_pipeline   = '^\s*|>.*$'
+let s:ending_with_assignment = '=\s*$'
+
+let s:indent_keywords   = '\<'.s:no_colon_before.'\%('.s:block_start.'\|'.s:block_middle.'\)$'.'\|'.s:arrow
+let s:deindent_keywords = '^\s*\<\%('.s:block_end.'\|'.s:block_middle.'\)\>'.'\|'.s:arrow
+
+let s:pair_start  = '\<\%('.s:no_colon_before.s:block_start.'\)\>'.s:no_colon_after
+let s:pair_middle = '\<\%('.s:block_middle.'\)\>'.s:no_colon_after.'\zs'
+let s:pair_end    = '\<\%('.s:no_colon_before.s:block_end.'\)\>\zs'
+
+let s:inside_block = 0
+
+function! GetElixirIndent()
+  let lnum = prevnonblank(v:lnum - 1)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let opened_symbol = 0
+  let current_line  = getline(v:lnum)
+  let last_line     = getline(lnum)
+  let ind           = indent(lnum)
+
+  " TODO: Remove these 2 lines
+  " I don't know why, but for the test on spec/indent/lists_spec.rb:24.
+  " Vim is making some mess on parsing the syntax of 'end', it is being
+  " recognized as 'elixirString' when should be recognized as 'elixirBlock'.
+  " This forces vim to sync the syntax.
+  call synID(v:lnum, 1, 1)
+  syntax sync fromstart
+
+  if synIDattr(synID(v:lnum, 1, 1), "name") !~ s:skip_syntax
+
+    if last_line !~ s:arrow
+      let split_line = split(last_line, '\zs')
+      let opened_symbol += count(split_line, '(') - count(split_line, ')')
+      let opened_symbol += count(split_line, '[') - count(split_line, ']')
+      let opened_symbol += count(split_line, '{') - count(split_line, '}')
+    end
+
+    " if start symbol is followed by a character, indent based on the
+    " whitespace after the symbol, otherwise use the default shiftwidth
+    if last_line =~ '\('.s:symbols_start.'\).'
+      let opened_prefix = matchlist(last_line, '\('.s:symbols_start.'\)\s*')[0]
+      let ind += (opened_symbol * strlen(opened_prefix))
+    else
+      let ind += (opened_symbol * &sw)
+    endif
+
+    if last_line =~ '^\s*\('.s:symbols_end.'\)' || last_line =~ s:indent_keywords
+      let ind += &sw
+    endif
+
+    if current_line =~ '^\s*\('.s:symbols_end.'\)'
+      let ind -= &sw
+    endif
+
+    if last_line =~ s:ending_with_assignment && opened_symbol == 0
+      let b:old_ind = indent(lnum)
+      let ind += &sw
+    end
+
+    " if line starts with pipeline
+    " and last line ends with a pipeline,
+    " align them
+    if last_line =~ '|>.*$' &&
+          \ current_line =~ s:starts_with_pipeline
+      let ind = float2nr(match(last_line, '|>') / &sw) * &sw
+
+    " if line starts with pipeline
+    " and last line is an attribution
+    " indents pipeline in same level as attribution
+    elseif current_line =~ s:starts_with_pipeline &&
+          \ last_line =~ '^[^=]\+=.\+$'
+
+      if !exists('b:old_ind') || b:old_ind == 0
+        let b:old_ind = indent(lnum)
+      end
+      let ind = float2nr(matchend(last_line, '=\s*[^ ]') / &sw) * &sw
+    endif
+
+    " if last line starts with pipeline
+    " and current line doesn't start with pipeline
+    " returns the indentation before the pipeline
+    if last_line =~ s:starts_with_pipeline &&
+          \ current_line !~ s:starts_with_pipeline
+      let ind = b:old_ind
+    endif
+
+    if current_line =~ s:deindent_keywords
+      let bslnum = searchpair(
+            \ s:pair_start,
+            \ s:pair_middle,
+            \ s:pair_end,
+            \ 'nbW',
+            \ s:block_skip
+            \ )
+
+      let ind = indent(bslnum)
+    endif
+
+    " indent case statements '->'
+    if current_line =~ s:arrow
+      let ind += &sw
+    endif
+  endif
+
+  return ind
 endfunction
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 endif

indent/elm.vim

@@ -1,115 +1,129 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
   
-" indentation for Elm (http://elm-lang.org/)
+" Vim indent file
+" Language:     Haskell
+" Maintainer:   lilydjwg <lilydjwg@gmail.com>
+" Version:	1.0
+" References:	http://en.wikibooks.org/wiki/Haskell/Indentation
+" 		http://book.realworldhaskell.org/read/
+" See Also:	The Align plugin http://www.vim.org/scripts/script.php?script_id=294
 
 " Only load this indent file when no other was loaded.
-if exists('b:did_indent')
-	finish
+if exists("b:did_indent")
+    finish
 endif
 let b:did_indent = 1
 
-" Local defaults
+setlocal indentexpr=HaskellIndent()
+for i in split('0{,:,0#,e', ',')
+    exec "setlocal indentkeys-=" . i
+endfor
+setlocal indentkeys+=0=else,0=in,0=where,0),0<bar>
+setlocal tabstop=8
 setlocal expandtab
-setlocal indentexpr=GetElmIndent()
-setlocal indentkeys+=0=else,0=if,0=of,0=import,0=then,0=type,0\|,0},0\],0),=-},0=in
-setlocal nolisp
-setlocal nosmartindent
 
-" Comment formatting
-setlocal comments=s1fl:{-,mb:\ ,ex:-},:--
-
-" Only define the function once.
-if exists('*GetElmIndent')
-	finish
+if !exists('g:Haskell_no_mapping')
+    inoremap <silent> <BS> <C-R>=<SID>HaskellDedent(1)<CR>
+    inoremap <silent> <C-D> <C-R>=<SID>HaskellDedent(0)<CR>
 endif
 
-" Indent pairs
-function! s:FindPair(pstart, pmid, pend)
-	"call search(a:pend, 'bW')
-	return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
+" Only define the functions once.
+if exists("*HaskellIndent")
+    finish
+endif
+
+let s:align_map = {
+            \ 'in': '\<let\>',
+            \ '\<else\>': '\<then\>',
+            \ ',': '\v%(\s|\w|^)@<=[[{]%(\s|\w|"|$)@='
+            \ }
+let s:indent_self = ['=']
+let s:indent_next = ['let', 'in', 'where', 'do', 'if']
+let s:indent_if_final = ['=', 'do', '->', 'of', 'where']
+
+function HaskellIndent()
+    let lnum = v:lnum - 1
+
+    " Hit the start of the file, use zero indent.
+    if lnum == 0
+        return 0
+    endif
+
+    let ind = indent(lnum)
+    let prevline = getline(lnum)
+    let curline = getline(v:lnum)
+    let curwords = split(curline)
+    if len(curwords) > 0
+        if has_key(s:align_map, curwords[0])
+            let word = s:align_map[curwords[0]]
+            let m = -1
+            let line = v:lnum
+            while m == -1
+                let line -= 1
+                if line <= 0
+                    return -1
+                endif
+                let m = match(getline(line), word)
+            endwhile
+            return m
+        elseif index(s:indent_self, curwords[0]) != -1
+            return ind + &sw
+        elseif curwords[0] == '|'
+            return match(prevline, '\v%(\s|\w|^)@<=[|=]%(\s|\w)@=')
+        elseif index([')', '}'], curwords[0]) != -1
+            return ind - &sw
+        elseif curwords[0] == 'where'
+            if prevline =~ '\v^\s+\|%(\s|\w)@='
+                return ind - 1
+            endif
+        endif
+    endif
+
+    let prevwords = split(prevline)
+    if len(prevwords) == 0
+        return 0
+    endif
+
+    if prevwords[-1] == 'where' && prevwords[0] == 'module'
+        return 0
+    elseif index(s:indent_if_final, prevwords[-1]) != -1
+        return ind + &sw
+    elseif prevwords[-1] =~ '\v%(\s|\w|^)@<=[[{(]$'
+        return ind + &sw
+    else
+        for word in reverse(prevwords)
+            if index(s:indent_next, word) != -1
+                return match(prevline, '\<'.word.'\>') + len(word) + 1
+            endif
+        endfor
+    endif
+
+    if len(curwords) > 0 && curwords[0] == 'where'
+        return ind + &sw
+    endif
+
+    return ind
 endfunction
 
-function! GetElmIndent()
-	let l:lnum = v:lnum - 1
+function s:HaskellDedent(isbs)
+    if a:isbs && strpart(getline('.'), 0, col('.')-1) !~ '^\s\+$'
+        return "\<BS>"
+    endif
 
-	" Ident 0 if the first line of the file:
-	if l:lnum == 0
-		return 0
-	endif
-
-	let l:ind = indent(l:lnum)
-	let l:lline = getline(l:lnum)
-	let l:line = getline(v:lnum)
-
-	" Indent if current line begins with '}':
-	if l:line =~? '^\s*}'
-		return s:FindPair('{', '', '}')
-
-	" Indent if current line begins with 'else':
-	elseif l:line =~# '^\s*else\>'
-		if l:lline !~# '^\s*\(if\|then\)\>'
-			return s:FindPair('\<if\>', '', '\<else\>')
-		endif
-
-	" Indent if current line begins with 'then':
-	elseif l:line =~# '^\s*then\>'
-		if l:lline !~# '^\s*\(if\|else\)\>'
-			return s:FindPair('\<if\>', '', '\<then\>')
-		endif
-
-	" HACK: Indent lines in case with nearest case clause:
-	elseif l:line =~# '->' && l:line !~# ':' && l:line !~# '\\'
-		return indent(search('^\s*case', 'bWn')) + &shiftwidth
-
-	" HACK: Don't change the indentation if the last line is a comment.
-	elseif l:lline =~# '^\s*--'
-		return l:ind
-
-	" Align the end of block comments with the start
-	elseif l:line =~# '^\s*-}'
-		return indent(search('{-', 'bWn'))
-
-	" Indent double shift after let with an empty rhs
-	elseif l:lline =~# '\<let\>.*\s=$'
-		return l:ind + 4 + &shiftwidth
-
-	" Align 'in' with the parent let.
-	elseif l:line =~# '^\s*in\>'
-		return indent(search('^\s*let', 'bWn'))
-
-	" Align bindings with the parent let.
-	elseif l:lline =~# '\<let\>'
-		return l:ind + 4
-
-	" Align bindings with the parent in.
-	elseif l:lline =~# '^\s*in\>'
-		return l:ind + 4
-
-	endif
-
-	" Add a 'shiftwidth' after lines ending with:
-	if l:lline =~# '\(|\|=\|->\|<-\|(\|\[\|{\|\<\(of\|else\|if\|then\)\)\s*$'
-		let l:ind = l:ind + &shiftwidth
-
-	" Add a 'shiftwidth' after lines starting with type ending with '=':
-	elseif l:lline =~# '^\s*type' && l:line =~# '^\s*='
-		let l:ind = l:ind + &shiftwidth
-
-	" Back to normal indent after comments:
-	elseif l:lline =~# '-}\s*$'
-		call search('-}', 'bW')
-		let l:ind = indent(searchpair('{-', '', '-}', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"'))
-
-	" Ident some operators if there aren't any starting the last line.
-	elseif l:line =~# '^\s*\(!\|&\|(\|`\|+\||\|{\|[\|,\)=' && l:lline !~# '^\s*\(!\|&\|(\|`\|+\||\|{\|[\|,\)=' && l:lline !~# '^\s*$'
-		let l:ind = l:ind + &shiftwidth
-
-	elseif l:lline ==# '' && getline(l:lnum - 1) !=# ''
-		let l:ind = indent(search('^\s*\S+', 'bWn'))
-
-	endif
-
-	return l:ind
-endfunc
+    let curind = indent('.')
+    let line = line('.') - 1
+    while curind > 0 && line > 0
+        let ind = indent(line)
+        if ind >= curind
+            let line -= 1
+        else
+            echomsg curind ind
+            call setline('.', repeat(' ', ind) .
+                        \ substitute(getline('.'), '^\s\+', '', ''))
+            return ''
+        endif
+    endwhile
+    return a:isbs ? "\<BS>" : ''
+endfunction
 
 endif

indent/erlang.vim

@@ -6,9 +6,9 @@ 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:  2013-Jul-21
 " License:      Vim license
-" URL:          https://github.com/vim-erlang/vim-erlang-runtime
+" URL:          https://github.com/hcs42/vim-erlang
 
 " Note About Usage:
 "   This indentation script works best with the Erlang syntax file created by
@@ -528,9 +528,7 @@ endfunction
 "       ok.          % IsLineAtomContinuation = false
 function! s:IsLineAtomContinuation(lnum)
   if has('syntax_items')
-    let syn_name = synIDattr(synID(a:lnum, 1, 0), 'name')
-    return syn_name =~# '^erlangQuotedAtom' ||
-         \ syn_name =~# '^erlangQuotedRecord'
+    return synIDattr(synID(a:lnum, 1, 0), 'name') =~# '^erlangQuotedAtom'
   else
     return 0
   endif
@@ -684,7 +682,7 @@ function! s:BeginningOfClauseFound(stack, token, stored_vcol, lnum, i)
     call s:Pop(a:stack)
     if empty(a:stack)
       call s:Log('    Stack is ["when"], so LTI is in a guard -> return')
-      return [1, a:stored_vcol + shiftwidth() + 2]
+      return [1, a:stored_vcol + &sw + 2]
     else
       return [1, s:UnexpectedToken(a:token, a:stack)]
     endif
@@ -693,7 +691,7 @@ function! s:BeginningOfClauseFound(stack, token, stored_vcol, lnum, i)
     call s:Pop(a:stack)
     if empty(a:stack)
       call s:Log('    Stack is ["->"], so LTI is in function body -> return')
-      return [1, a:stored_vcol + shiftwidth()]
+      return [1, a:stored_vcol + &sw]
     elseif a:stack[0] ==# ';'
       call s:Pop(a:stack)
 
@@ -845,7 +843,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
 
       elseif token ==# 'begin'
         let [ret, res] = s:BeginElementFound(stack, token, curr_vcol,
-                                            \stored_vcol, 'end', shiftwidth())
+                                            \stored_vcol, 'end', &sw)
         if ret | return res | endif
 
       " case EXPR of BRANCHES end
@@ -896,11 +894,11 @@ function! s:ErlangCalcIndent2(lnum, stack)
         elseif stack == ['->']
           call s:Log('    LTI is in a branch after ' .
                     \'"of/receive/after/if/catch" -> return')
-          return stored_vcol + shiftwidth()
+          return stored_vcol + &sw
         elseif stack == ['when']
           call s:Log('    LTI is in a guard after ' .
                     \'"of/receive/after/if/catch" -> return')
-          return stored_vcol + shiftwidth()
+          return stored_vcol + &sw
         else
           return s:UnexpectedToken(token, stack)
         endif
@@ -936,7 +934,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
           if empty(stack)
             call s:Log('    LTI is in a condition; matching ' .
                       \'"case/if/try/receive" found')
-            let stored_vcol = curr_vcol + shiftwidth()
+            let stored_vcol = curr_vcol + &sw
           elseif stack[0] ==# 'align_to_begin_element'
             call s:Pop(stack)
             let stored_vcol = curr_vcol
@@ -945,23 +943,23 @@ function! s:ErlangCalcIndent2(lnum, stack)
                       \'"case/if/try/receive" found')
             call s:Pop(stack)
             call s:Pop(stack)
-            let stored_vcol = curr_vcol + shiftwidth()
+            let stored_vcol = curr_vcol + &sw
           elseif stack[0] ==# '->'
             call s:Log('    LTI is in a branch; matching ' .
                       \'"case/if/try/receive" found')
             call s:Pop(stack)
-            let stored_vcol = curr_vcol + 2 * shiftwidth()
+            let stored_vcol = curr_vcol + 2 * &sw
           elseif stack[0] ==# 'when'
             call s:Log('    LTI is in a guard; matching ' .
                       \'"case/if/try/receive" found')
             call s:Pop(stack)
-            let stored_vcol = curr_vcol + 2 * shiftwidth() + 2
+            let stored_vcol = curr_vcol + 2 * &sw + 2
           endif
 
         endif
 
         let [ret, res] = s:BeginElementFound(stack, token, curr_vcol,
-                                            \stored_vcol, 'end', shiftwidth())
+                                            \stored_vcol, 'end', &sw)
         if ret | return res | endif
 
       elseif token ==# 'fun'
@@ -987,7 +985,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " stack = ['when']  =>  LTI is in a guard
           if empty(stack)
             call s:Log('    LTI is in a condition; matching "fun" found')
-            let stored_vcol = curr_vcol + shiftwidth()
+            let stored_vcol = curr_vcol + &sw
           elseif len(stack) > 1 && stack[0] ==# '->' && stack[1] ==# ';'
             call s:Log('    LTI is in a condition; matching "fun" found')
             call s:Pop(stack)
@@ -995,15 +993,15 @@ function! s:ErlangCalcIndent2(lnum, stack)
           elseif stack[0] ==# '->'
             call s:Log('    LTI is in a branch; matching "fun" found')
             call s:Pop(stack)
-            let stored_vcol = curr_vcol + 2 * shiftwidth()
+            let stored_vcol = curr_vcol + 2 * &sw
           elseif stack[0] ==# 'when'
             call s:Log('    LTI is in a guard; matching "fun" found')
             call s:Pop(stack)
-            let stored_vcol = curr_vcol + 2 * shiftwidth() + 2
+            let stored_vcol = curr_vcol + 2 * &sw + 2
           endif
 
           let [ret, res] = s:BeginElementFound(stack, token, curr_vcol,
-                                              \stored_vcol, 'end', shiftwidth())
+                                              \stored_vcol, 'end', &sw)
           if ret | return res | endif
         else
           " Pass: we have a function reference (e.g. "fun f/0")
@@ -1277,7 +1275,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
             "   when A,
             "        LTI
             let [ret, res] = s:BeginElementFoundIfEmpty(stack, token, curr_vcol,
-                                                       \stored_vcol, shiftwidth())
+                                                       \stored_vcol, &sw)
             if ret | return res | endif
           else
             " Example:
@@ -1309,7 +1307,7 @@ function! s:ErlangCalcIndent2(lnum, stack)
           " If LTI is between an 'after' and the corresponding
           " 'end', then let's return
           let [ret, res] = s:BeginElementFoundIfEmpty(stack, token, curr_vcol,
-                                                     \stored_vcol, shiftwidth())
+                                                     \stored_vcol, &sw)
           if ret | return res | endif
         endif
 

indent/eruby.vim

@@ -14,7 +14,7 @@ runtime! indent/ruby.vim
 unlet! b:did_indent
 setlocal indentexpr=
 
-if exists("b:eruby_subtype") && b:eruby_subtype != '' && b:eruby_subtype !=# 'eruby'
+if exists("b:eruby_subtype")
   exe "runtime! indent/".b:eruby_subtype.".vim"
 else
   runtime! indent/html.vim
@@ -43,10 +43,6 @@ if exists("*GetErubyIndent")
   finish
 endif
 
-" this file uses line continuations
-let s:cpo_sav = &cpo
-set cpo&vim
-
 function! GetErubyIndent(...)
   " The value of a single shift-width
   if exists('*shiftwidth')
@@ -97,7 +93,6 @@ function! GetErubyIndent(...)
     let ind = ind + sw
   endif
   if line !~# '^\s*<%' && line =~# '%>\s*$' && line !~# '^\s*end\>'
-	\ && synID(v:lnum, match(cline, '\S') + 1, 1) != hlID('htmlEndTag')
     let ind = ind - sw
   endif
   if cline =~# '^\s*[-=]\=%>\s*$'
@@ -106,9 +101,6 @@ function! GetErubyIndent(...)
   return ind
 endfunction
 
-let &cpo = s:cpo_sav
-unlet! s:cpo_sav
-
 " vim:set sw=2 sts=2 ts=8 noet:
 
 endif

indent/fsharp.vim

@@ -1,253 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fsharp') == -1
-  
-" Vim indent file
-" Language:     FSharp
-" Maintainers:  Jean-Francois Yuen   <jfyuen@happycoders.org>
-"               Mike Leary           <leary@nwlink.com>
-"               Markus Mottl         <markus.mottl@gmail.com>
-"               Rudi Grinberg        <rudi.grinberg@gmail.com>
-"               Gregor Uhlenheuer    <kongo2002@gmail.com>
-" Last Change:  2013 Jun 29
-"               2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working
-"               2005 May 09 - Added an option to not indent OCaml-indents specially (MM)
-"               2013 June   - commented textwidth (Marc Weber)
-"               2014 August - Ported to F#
-"               2014 August - F# specific cleanup
-"
-" Marc Weber's comment: This file may contain a lot of (very custom) stuff
-" which eventually should be moved somewhere else ..
-
-" Only load this indent file when no other was loaded.
-
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-setlocal indentexpr=GetFsharpIndent()
-setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception,0=external,0=if,0=in,0=include,0=inherit,0=let,0=method,0=open,0=then,0=type,0=val,0=with,0;;,0>\],0\|\],0>},0\|,0},0\],0)
-
-" Only define the function once.
-if exists("*GetFsharpIndent")
-    finish
-endif
-
-" Skipping pattern, for comments
-function! s:GetLineWithoutFullComment(lnum)
-    let lnum = prevnonblank(a:lnum - 1)
-    let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-    while lline =~ '^\s*$' && lnum > 0
-        let lnum = prevnonblank(lnum - 1)
-        let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-    endwhile
-    return lnum
-endfunction
-
-" Indent for ';;' to match multiple 'let'
-function! s:GetInd(lnum, pat, lim)
-    let llet = search(a:pat, 'bW')
-    let old = indent(a:lnum)
-    while llet > 0
-        let old = indent(llet)
-        let nb = s:GetLineWithoutFullComment(llet)
-        if getline(nb) =~ a:lim
-            return old
-        endif
-        let llet = search(a:pat, 'bW')
-    endwhile
-    return old
-endfunction
-
-" Indent pairs
-function! s:FindPair(pstart, pmid, pend)
-    call search(a:pend, 'bW')
-    return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"'))
-endfunction
-
-" Indent 'let'
-function! s:FindLet(pstart, pmid, pend)
-    call search(a:pend, 'bW')
-    return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\<in\\s*$" || getline(prevnonblank(".") - 1) =~ s:beflet'))
-endfunction
-
-function! GetFsharpIndent()
-    " Find a non-commented line above the current line.
-    let lnum = s:GetLineWithoutFullComment(v:lnum)
-
-    " At the start of the file use zero indent.
-    if lnum == 0
-        return 0
-    endif
-
-    let ind = indent(lnum)
-    let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '')
-
-    " " Return single 'shiftwidth' after lines matching:
-    " if lline =~ '^\s*|.*->\s*$'
-    "     return ind + &sw
-    " endif
-
-    let line = getline(v:lnum)
-
-    " Indent if current line begins with 'end':
-    if line =~ '^\s*end\>'
-        return s:FindPair(s:module, '','\<end\>')
-
-        " Indent if current line begins with 'done' for 'do':
-    elseif line =~ '^\s*done\>'
-        return s:FindPair('\<do\>', '','\<done\>')
-
-        " Indent if current line begins with '}' or '>}':
-    elseif line =~ '^\s*\(\|>\)}'
-        return s:FindPair('{', '','}')
-
-        " Indent if current line begins with ']', '|]' or '>]':
-    elseif line =~ '^\s*\(\||\|>\)\]'
-        return s:FindPair('\[', '','\]')
-
-        " Indent if current line begins with ')':
-    elseif line =~ '^\s*)'
-        return s:FindPair('(', '',')')
-
-        " Indent if current line begins with 'let':
-    elseif line =~ '^\s*let\>'
-        if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet
-            return s:FindLet(s:type, '','\<let\s*$')
-        endif
-
-        " Indent if current line begins with 'class' or 'type':
-    elseif line =~ '^\s*\(class\|type\)\>'
-        if lline !~ s:lim . '\|\<and\s*$\|' . s:letlim
-            return s:FindLet(s:type, '','\<\(class\|type\)\s*$')
-        endif
-
-        " Indent for pattern matching:
-    elseif line =~ '^\s*|'
-        if lline !~ '^\s*\(|[^\]]\|\(match\|type\|with\)\>\)\|\<\(function\|private\|with\)\s*$'
-            call search('|', 'bW')
-            return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"'))
-        endif
-
-        " Indent if current line begins with ';;':
-    elseif line =~ '^\s*;;'
-        if lline !~ ';;\s*$'
-            return s:GetInd(v:lnum, s:letpat, s:letlim)
-        endif
-
-        " Indent if current line begins with 'in':
-    elseif line =~ '^\s*in\>'
-        if lline !~ '^\s*\(let\|and\)\>'
-            return s:FindPair('\<let\>', '', '\<in\>')
-        endif
-
-        " Indent if current line begins with 'else':
-    elseif line =~ '^\s*else\>'
-        if lline !~ '^\s*\(if\|then\)\>'
-            return s:FindPair('\<if\>', '', '\<else\>')
-        endif
-
-        " Indent if current line begins with 'then':
-    elseif line =~ '^\s*then\>'
-        if lline !~ '^\s*\(if\|else\)\>'
-            return s:FindPair('\<if\>', '', '\<then\>')
-        endif
-
-        " Indent if current line begins with 'and':
-    elseif line =~ '^\s*and\>'
-        if lline !~ '^\s*\(and\|let\|type\)\>\|\<end\s*$'
-            return ind - &sw
-        endif
-
-        " Indent if current line begins with 'with':
-    elseif line =~ '^\s*with\>'
-        if lline !~ '^\s*\(match\|try\)\>'
-            return s:FindPair('\<\%(match\|try\)\>', '','\<with\>')
-        endif
-
-        " Indent if current line begins with 'exception', 'external', 'include' or
-        " 'open':
-    elseif line =~ '^\s*\(exception\|external\|include\|open\)\>'
-        if lline !~ s:lim . '\|' . s:letlim
-            call search(line)
-            return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW'))
-        endif
-
-        " Indent if current line begins with 'val':
-    elseif line =~ '^\s*val\>'
-        if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim
-            return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW'))
-        endif
-
-        " Indent if current line begins with 'constraint', 'inherit', 'initializer'
-        " or 'method':
-    elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>'
-        if lline !~ s:obj
-            return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw
-        endif
-
-    endif
-
-    " Add a 'shiftwidth' after lines ending with:
-    if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|private\|sig\|struct\|then\|try\)\|\<object\s*(.*)\)\s*$'
-        let ind = ind + &sw
-
-        " Back to normal indent after lines ending with ';;':
-    elseif lline =~ ';;\s*$' && lline !~ '^\s*;;'
-        let ind = s:GetInd(v:lnum, s:letpat, s:letlim)
-
-        " Back to normal indent after lines ending with 'end':
-    elseif lline =~ '\<end\s*$'
-        let ind = s:FindPair(s:module, '','\<end\>')
-
-        " Back to normal indent after lines ending with 'in':
-    elseif lline =~ '\<in\s*$' && lline !~ '^\s*in\>'
-        let ind = s:FindPair('\<let\>', '', '\<in\>')
-
-        " Back to normal indent after lines ending with 'done':
-    elseif lline =~ '\<done\s*$'
-        let ind = s:FindPair('\<do\>', '','\<done\>')
-
-        " Back to normal indent after lines ending with '}' or '>}':
-    elseif lline =~ '\(\|>\)}\s*$'
-        let ind = s:FindPair('{', '','}')
-
-        " Back to normal indent after lines ending with ']', '|]' or '>]':
-    elseif lline =~ '\(\||\|>\)\]\s*$'
-        let ind = s:FindPair('\[', '','\]')
-
-        " Back to normal indent after comments:
-    elseif lline =~ '\*)\s*$'
-        call search('\*)', 'bW')
-        let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"'))
-
-        " Back to normal indent after lines ending with ')':
-    elseif lline =~ ')\s*$'
-        let ind = s:FindPair('(', '',')')
-
-        " If this is a multiline comment then align '*':
-    elseif lline =~ '^\s*(\*' && line =~ '^\s*\*'
-        let ind = ind + 1
-
-    else
-        " Don't change indentation of this line
-        " for new lines (indent==0) use indentation of previous line
-
-        " This is for preventing removing indentation of these args:
-        "   let f x =
-        "     let y = x + 1 in
-        "     Printf.printf
-        "       "o"           << here
-        "       "oeuth"       << don't touch indentation
-
-        let i = indent(v:lnum)
-        return i == 0 ? ind : i
-
-    endif
-
-    return ind
-
-endfunction
-
-" vim: sw=4 et sts=4
-
-endif