Update

.github/ISSUE_TEMPLATE/add-language.md

@@ -1,18 +0,0 @@
----
-name: Add language
-about: Add support for new language
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--- vim-polyglot accepts only lightweight, maintained github-hosted vim plugins -->
-
-**GitHub repository url**
-
-
-**Is this plugin well maintained?**
-
-
-**Is this plugin lightweight? (no advanced functionality, just indent and syntax support)**

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

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,16 +0,0 @@
----
-name: Bug report
-about: Report vim-polyglot bug
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!-- Vim-polyglot is not responsible for bugs of plugins it uses. Please report only bugs that happen when plugin is used as part of vim-polyglot and doesn't happen when just install the plugin -->
-
-**Does this bug happen when you install plugin without vim-polyglot?**
-
-**Describe the bug:**
-
-**To Reproduce:**

.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
 rvm:
-  - 2.6
+  - 1.9.3
 sudo: false
 addons:
   apt:
     packages:
       - vim-gtk
 before_script:
-  - "./build"
-script: xvfb-run bundle exec rspec --format=documentation
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+script: bundle exec rspec --format=documentation

Gemfile.lock

@@ -1,21 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    vimrunner (0.3.4)
+    diff-lcs (1.1.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    vimrunner (0.3.0)
 
 PLATFORMS
   ruby
@@ -23,6 +18,3 @@ PLATFORMS
 DEPENDENCIES
   rspec
   vimrunner
-
-BUNDLED WITH
-   1.16.2

README.md

@@ -1,6 +1,4 @@
-![vim-polyglot](https://i.imgur.com/9RxQK6k.png)
-
-[![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2019.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
@@ -10,189 +8,112 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 120+ times faster** than the <!--Package Count-->147<!--/Package Count--> 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
 
 1. Install [Pathogen](https://github.com/tpope/vim-pathogen), [Vundle](https://github.com/VundleVim/Vundle.vim), [NeoBundle](https://github.com/Shougo/neobundle.vim), or [Plug](https://github.com/junegunn/vim-plug) package manager for Vim.
 2. Use this repository as submodule or package.
 
-For example when using [Plug](https://github.com/junegunn/vim-plug):
-
-```
-Plug 'sheerun/vim-polyglot'
-```
-
 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
 
-<!--Language Packs-->
-- [acpiasl](https://github.com/martinlroth/vim-acpi-asl) (syntax)
-- [ansible](https://github.com/pearofducks/ansible-vim) (syntax, indent, ftplugin)
-- [apiblueprint](https://github.com/sheerun/apiblueprint.vim) (syntax)
-- [applescript](https://github.com/mityu/vim-applescript) (syntax, indent)
-- [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)
+- [applescript](https://github.com/vim-scripts/applescript.vim) (syntax)
+- [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, compiler, indent, 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)
-- [csv](https://github.com/chrisbra/csv.vim) (syntax, autoload, ftplugin)
-- [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin)
-- [cue](https://github.com/mgrabovsky/vim-cuesheet) (syntax)
-- [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin)
-- [dhall](https://github.com/vmchale/dhall-vim) (syntax, ftplugin)
-- [dlang](https://github.com/JesseKPhillips/d.vim) (syntax, indent)
-- [dockerfile](https://github.com/ekalinin/Dockerfile.vim) (syntax, indent, ftplugin)
-- [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)
-- [ferm](https://github.com/vim-scripts/ferm.vim) (syntax)
-- [fish](https://github.com/georgewitteman/vim-fish) (syntax, indent, compiler, autoload, ftplugin)
-- [flatbuffers](https://github.com/dcharbon/vim-flatbuffers) (syntax)
-- [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)
-- [gradle](https://github.com/tfnico/vim-gradle) (compiler)
-- [graphql](https://github.com/jparise/vim-graphql) (syntax, indent, autoload, ftplugin, after)
-- [groovy-indent](https://github.com/vim-scripts/groovyindent-unix) (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)
-- [haproxy](https://github.com/CH-DanReif/haproxy.vim) (syntax)
-- [haskell](https://github.com/neovimhaskell/haskell-vim) (syntax, indent, ftplugin)
-- [haxe](https://github.com/yaymukund/vim-haxe) (syntax)
-- [hcl](https://github.com/b4b4r07/vim-hcl) (syntax, indent, ftplugin)
-- [helm](https://github.com/towolf/vim-helm) (syntax)
-- [hive](https://github.com/zebradil/hive.vim) (syntax, ftplugin)
+- [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/mboughaba/i3config.vim) (syntax, ftplugin)
-- [idris](https://github.com/idris-hackers/idris-vim) (syntax, indent, ftplugin)
-- [ion](https://github.com/vmchale/ion-vim) (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)
-- [jinja](https://github.com/lepture/vim-jinja) (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/MaxMEllon/vim-jsx-pretty) (autoload, after)
-- [julia](https://github.com/JuliaEditorSupport/julia-vim) (syntax, indent, autoload, ftplugin)
-- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent, ftplugin)
+- [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)
-- [lilypond](https://github.com/anowlcalledjosh/vim-lilypond) (syntax, indent, compiler, ftplugin)
-- [livescript](https://github.com/gkz/vim-ls) (syntax, indent, compiler, ftplugin)
-- [llvm](https://github.com/rhysd/vim-llvm) (syntax, indent, ftplugin)
-- [log](https://github.com/MTDL9/vim-log-highlighting) (syntax)
+- [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/gabrielelana/vim-markdown) (syntax, autoload, ftplugin)
-- [mathematica](https://github.com/voldikss/vim-mma) (syntax, ftplugin)
-- [mdx](https://github.com/jxnblk/vim-mdx-js) (syntax)
-- [meson](https://github.com/mesonbuild/meson) (syntax, indent, ftplugin)
-- [moonscript](https://github.com/leafo/moonscript-vim) (syntax, indent, 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, compiler, 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/rgrinberg/vim-ocaml) (syntax, indent, compiler, ftplugin)
-- [octave](https://github.com/McSinyx/vim-octave) (syntax, indent)
-- [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/lifepillar/pgsql.vim) (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, 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)
-- [pony](https://github.com/jakwings/vim-pony) (syntax, indent, autoload, 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/rodjek/vim-puppet) (syntax, indent, autoload, ftplugin)
-- [purescript](https://github.com/purescript-contrib/purescript-vim) (syntax, indent, ftplugin)
-- [python-compiler](https://github.com/aliev/vim-compiler-python) (compiler, autoload)
-- [python-indent](https://github.com/Vimjas/vim-python-pep8-indent) (indent)
-- [python](https://github.com/vim-python/python-syntax) (syntax)
-- [qmake](https://github.com/artoj/qmake-syntax-vim) (syntax)
-- [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin)
-- [r-lang](https://github.com/vim-scripts/R.vim) (syntax)
-- [racket](https://github.com/wlangstroth/vim-racket) (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)
 - [ragel](https://github.com/jneen/ragel.vim) (syntax)
-- [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin)
-- [reason](https://github.com/reasonml-editor/vim-reason-plus) (syntax, indent)
-- [rspec](https://github.com/sheerun/rspec.vim) (syntax)
-- [rst](https://github.com/marshallward/vim-restructuredtext) (syntax, indent, autoload, ftplugin)
-- [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, indent, ftplugin)
-- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin)
-- [slime](https://github.com/slime-lang/vim-slime-syntax) (syntax, indent)
-- [smt2](https://github.com/bohlender/vim-smt2) (syntax, autoload, ftplugin)
-- [solidity](https://github.com/tomlion/vim-solidity) (syntax, indent, ftplugin)
-- [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin)
-- [svelte](https://github.com/evanleck/vim-svelte) (syntax, indent)
-- [svg-indent](https://github.com/jasonshell/vim-svg-indent) (indent)
-- [svg](https://github.com/vim-scripts/svg.vim) (syntax)
-- [swift](https://github.com/keith/swift.vim) (syntax, indent, ftplugin)
-- [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (syntax)
-- [systemd](https://github.com/wgwoods/vim-systemd-syntax) (syntax, ftplugin)
-- [terraform](https://github.com/hashivim/vim-terraform) (syntax, indent, autoload, ftplugin)
-- [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin)
-- [thrift](https://github.com/solarnz/thrift.vim) (syntax)
-- [tmux](https://github.com/ericpruitt/tmux.vim) (syntax, ftplugin)
+- [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)
-- [tptp](https://github.com/c-cube/vim-tptp) (syntax)
-- [twig](https://github.com/lumiliet/vim-twig) (syntax, indent, ftplugin)
-- [typescript](https://github.com/HerringtonDarkholme/yats.vim) (syntax, indent, compiler, ftplugin)
-- [v](https://github.com/ollykel/v-vim) (syntax, indent, ftplugin)
-- [vala](https://github.com/arrufat/vala.vim) (syntax, indent, ftplugin)
+- [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)
-- [xdc](https://github.com/amal-khailtash/vim-xdc-syntax) (syntax)
+- [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)
-- [xml](https://github.com/amadeus/vim-xml) (syntax)
 - [yaml](https://github.com/stephpy/vim-yaml) (syntax, ftplugin)
 - [yard](https://github.com/sheerun/vim-yardoc) (syntax)
-- [zephir](https://github.com/xwsoul/vim-zephir) (syntax)
-- [zig](https://github.com/ziglang/zig.vim) (syntax, autoload, ftplugin)
-<!--/Language Packs-->
 
 ## Updating
 
@@ -205,22 +126,17 @@ Please make sure you have `syntax on` in your `.vimrc`, otherwise syntax files a
 Individual language packs can be disabled by setting `g:polyglot_disabled` as follows:
 
 ```viml
-" ~/.vimrc, declare this variable before polyglot is loaded
+" ~/.vimrc
 let g:polyglot_disabled = ['css']
 ```
 
-Note that disabling languages won't make in general your vim startup any faster / slower (only for specific file type). Vim-polyglot is selection of language plugins that are loaded only on demand.
+Note that disabiling languages won't make in general your vim startup any faster / slower (only for specific file type). Vim-polyglot is selection of language plugins that are loaded only on demand.
 
 ## Contributing
 
 Language packs are periodically updated using automated `build` script.
 
-Feel free to add your language, and send pull-request.  In your pull request, please include:
-1. How you chose the particular repo from which to pull support for this language.
-2. An updated https://github.com/sheerun/vim-polyglot/blob/master/build .
-3. If at all possible, absolutely nothing else (in particular, please don't run `build` and include that in your PR).
-
-The easier it is to validate that the new language won't do anything wacky, the faster it'll be merged.  In particular, languages that utilize global plugins (loaded for every filetype), or plugins with dangerous features (like `call` based on the contents of a file being edited), will never be merged, as they will be slow or dangerous, respectively.
+Feel free to add your language, and send pull-request.
 
 ## License
 

after/ftdetect/rspec.vim

@@ -0,0 +1,6 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
+  
+autocmd BufReadPost,BufNewFile *_spec.rb set syntax=rspec
+autocmd BufReadPost,BufNewFile *_spec.rb setlocal commentstring=#\ %s
+
+endif

after/ftplugin/cabal.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-
+  
 setlocal comments=s1fl:{-,mb:-,ex:-},:--
 setlocal iskeyword+=-,.,*
 setlocal commentstring=--\ %s

after/ftplugin/coffee.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
-
+  
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
   let b:match_words = '(:),\[:\],{:},<:>,' .

after/ftplugin/haskell.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haskell') == -1
-
+  
 setlocal comments=s1fl:{-,mb:\ \ ,ex:-},:--
 setlocal iskeyword+='
 

after/ftplugin/idris.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
-
-setlocal iskeyword+='
-
-endif

after/ftplugin/javascript.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-
+  
 " Vim filetype plugin file
 " Language:     JavaScript
 " Maintainer:   vim-javascript community
@@ -7,45 +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
-
-endif
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim ftplugin file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMEllon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-" modified from html.vim
-" For matchit plugin
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words = '(:),\[:\],{:},<:>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
-
-" For andymass/vim-matchup plugin
-if exists("loaded_matchup")
-  setlocal matchpairs=(:),{:},[:],<:>
-  let b:match_words = '<\@<=\([^/][^ \t>]*\)\g{hlend}[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
-  let b:match_skip = 's:comment\|string'
-endif
-
-let b:original_commentstring = &l:commentstring
-
-augroup jsx_comment
-  autocmd! CursorMoved <buffer>
-  autocmd CursorMoved <buffer> call jsx_pretty#comment#update_commentstring(b:original_commentstring)
-augroup end
-
-setlocal suffixesadd+=.jsx
+let b:undo_ftplugin .= ' | setlocal iskeyword< suffixesadd<'
 
 endif

after/ftplugin/javascriptreact.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-source <sfile>:h/javascript.vim
-
-endif

after/ftplugin/jsx.vim

@@ -0,0 +1,20 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim ftplugin file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+" modified from html.vim
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words = '(:),\[:\],{:},<:>,' .
+        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
+endif
+
+setlocal suffixesadd+=.jsx
+
+endif

after/ftplugin/llvm.vim

@@ -1,477 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
-
-" Copyright (c) 2018 rhysd
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-
-if get(g:, 'llvm_extends_official', 1) == 0
-    finish
-endif
-
-let g:llvm_ext_no_mapping = get(g:, 'llvm_ext_no_mapping', 0)
-let g:llvm_ext_lli_executable = get(g:, 'llvm_ext_lli_executable', 'lli')
-
-let s:KIND_BLOCK_PREC = 0
-let s:KIND_BLOCK_FOLLOW = 1
-let s:KIND_FUNC_BEGIN = 2
-let s:KIND_FUNC_END = 3
-
-function! s:section_delim_at(lnum) abort
-    let line = getline(a:lnum)
-    let m = matchlist(line, '^\([^:]\+\):\%( \+; preds = \(%.\+\)\)\=$')
-    if !empty(m)
-        if m[2] ==# ''
-            return [s:KIND_BLOCK_PREC, m[1]]
-        else
-            return [s:KIND_BLOCK_FOLLOW, m[1], split(m[2], ',\s*')]
-        endif
-    endif
-    if line =~# '^}$'
-        return [s:KIND_FUNC_END]
-    endif
-    if line =~# '^define\>'
-        return [s:KIND_FUNC_BEGIN]
-    endif
-    return []
-endfunction
-
-function! s:is_section_delim(line, func_delim) abort
-    let sec = s:section_delim_at(a:line)
-    if empty(sec)
-        return 0
-    endif
-    let kind = sec[0]
-    return kind == s:KIND_BLOCK_PREC || kind == s:KIND_BLOCK_FOLLOW || kind == func_delim
-endfunction
-
-function! s:next_section(stop_func_begin) abort
-    let func_delim = a:stop_func_begin ? s:KIND_FUNC_BEGIN : s:KIND_FUNC_END
-    let last = line('$') - 1
-    let line = line('.')
-    while line < last
-        let line += 1
-        if s:is_section_delim(line, func_delim)
-            call cursor(line, col('.'))
-            return
-        endif
-    endwhile
-endfunction
-
-function! s:prev_section(stop_func_begin) abort
-    let func_delim = a:stop_func_begin ? s:KIND_FUNC_BEGIN : s:KIND_FUNC_END
-    let line = line('.')
-    while line > 1
-        let line -= 1
-        if s:is_section_delim(line, func_delim)
-            call cursor(line, col('.'))
-            return
-        endif
-    endwhile
-endfunction
-
-if !g:llvm_ext_no_mapping
-    nnoremap <buffer><silent>]] :<C-u>call <SID>next_section(1)<CR>
-    nnoremap <buffer><silent>[[ :<C-u>call <SID>prev_section(1)<CR>
-    nnoremap <buffer><silent>][ :<C-u>call <SID>next_section(0)<CR>
-    nnoremap <buffer><silent>[] :<C-u>call <SID>prev_section(0)<CR>
-endif
-
-function! s:function_range_at(linum) abort
-    let line = a:linum
-    while line >= 1
-        let s = getline(line)
-        if s =~# '^define\>'
-            let start = line
-            break
-        elseif s =~# '^}$'
-            return []
-        endif
-        let line -= 1
-    endwhile
-    if line < 1
-        return []
-    endif
-
-    let line = a:linum
-    let last = line('$')
-    while line <= last
-        let s = getline(line)
-        if s =~# '^}$'
-            let end = line
-            break
-        elseif s =~# '^define\>'
-            return []
-        endif
-        let line += 1
-    endwhile
-    if line > last
-        return []
-    endif
-
-    return [start, end]
-endfunction
-
-function! s:blocks_graph_at(linum) abort
-    let func_range = s:function_range_at(a:linum)
-    if empty(func_range)
-        return {}
-    endif
-    let line = func_range[0] + 1
-    let last = func_range[1] - 1
-    let graph = {}
-    while line <= last
-        let block = s:section_delim_at(line)
-        if empty(block)
-            let line += 1
-            continue
-        endif
-        let block_name = '%' . block[1]
-        if block[0] == s:KIND_BLOCK_PREC
-            let graph[block_name] = {'line': line, 'follows': [], 'preds': []}
-        elseif block[0] == s:KIND_BLOCK_FOLLOW
-            let graph[block_name] = {'line': line, 'follows': [], 'preds': block[2]}
-            for follow in block[2]
-                call add(graph[follow].follows, block_name)
-            endfor
-        else
-            echoerr 'unreachable'
-        endif
-        let line += 1
-    endwhile
-    return graph
-endfunction
-
-function! s:find_pred_block(linum) abort
-    let sec = s:section_delim_at(a:linum)
-    if empty(sec) || sec[0] != s:KIND_BLOCK_PREC && sec[0] != s:KIND_BLOCK_FOLLOW
-        throw 'No block is starting at line ' . a:linum
-    endif
-    if sec[0] != s:KIND_BLOCK_FOLLOW
-        throw printf("Block '%s' has no pred block", sec[1])
-    endif
-    let block_name = '%' . sec[1]
-    let pred_block = sec[2][0]
-
-    let graph = s:blocks_graph_at(a:linum)
-    if empty(graph)
-        throw 'No block is found in function at line ' . a:linum
-    endif
-
-    if !has_key(graph, pred_block)
-        throw printf("Block '%s' (pred block of '%s') not found in function", pred_block, block_name)
-    endif
-    return graph[pred_block]
-endfunction
-
-function! s:move_to_pred_block() abort
-    try
-        let b = s:find_pred_block(line('.'))
-        call cursor(b.line, col('.'))
-    catch
-        echohl ErrorMsg | echom v:exception | echohl None
-    endtry
-endfunction
-
-function! s:find_following_block(linum) abort
-    let sec = s:section_delim_at(a:linum)
-    if empty(sec) || sec[0] != s:KIND_BLOCK_PREC && sec[0] != s:KIND_BLOCK_FOLLOW
-        throw 'No block is starting at line ' . a:linum
-    endif
-    let block_name = '%' . sec[1]
-
-    let graph = s:blocks_graph_at(a:linum)
-    if empty(graph)
-        throw 'No block is found in function at line ' . a:linum
-    endif
-
-    let follows = graph[block_name].follows
-    if empty(follows)
-        throw printf("Block '%s' has no following block", block_name)
-    endif
-
-    echom printf("Block '%s' has %d following blocks: %s", block_name, len(follows), join(follows, ', '))
-
-    if !has_key(graph, follows[0])
-        throw printf("Block '%s' is not defined in function at line %d", follows[0], a:linum)
-    endif
-    return graph[follows[0]]
-endfunction
-
-function! s:move_to_following_block() abort
-    try
-        let b = s:find_following_block(line('.'))
-        call cursor(b.line, col('.'))
-    catch
-        echohl ErrorMsg | echom v:exception | echohl None
-    endtry
-endfunction
-
-if !g:llvm_ext_no_mapping
-    nnoremap <buffer><silent>[b :<C-u>call <SID>move_to_pred_block()<CR>
-    nnoremap <buffer><silent>]b :<C-u>call <SID>move_to_following_block()<CR>
-endif
-
-function! s:get_func_identifiers(line) abort
-    let idx = stridx(a:line, '@')
-    if idx == -1
-        " Invalid signature
-        return []
-    endif
-
-    " e.g. define internal i32 @foo(...) { -> @foo(...) {
-    let sig = a:line[idx:]
-
-    let idx = stridx(sig, '(')
-    if idx == -1
-        " Invalid signature
-        return []
-    endif
-
-    " @foo(...) { -> @foo
-    let idents = [sig[:idx-1]]
-
-    " @foo(...) { -> ...) {
-    let params = sig[idx+1:]
-
-    let idx = strridx(sig, ')')
-    if idx == -1
-        return idents
-    endif
-
-    " ...) { -> ...
-    let params = params[:idx-1]
-
-    " Gather parameters in function signature
-    while params !=# ''
-        let m = matchlist(params, '^[^%]*\(%\%("[^"]\+"\|[[:alnum:]_.]\+\)\)\s*\(.*\)$')
-        if empty(m)
-            break
-        endif
-        let idents += [m[1]]
-        let params = m[2]
-    endwhile
-
-    return idents
-endfunction
-
-function! s:get_identifiers(line) abort
-    " Registers and type defs
-    let m = matchlist(a:line, '^\s*\(%\S\+\)\s\+=')
-    if !empty(m)
-        return [m[1]]
-    endif
-
-    " Constants
-    let m = matchlist(a:line, '^\(@\S\+\)\s\+=.\+\<constant\>')
-    if !empty(m)
-        return [m[1]]
-    endif
-
-    " Labels for basic blocks
-    let m = matchlist(a:line, '^\([^:]\+\):\%(\s\+; preds = .\+\)\=$')
-    if !empty(m)
-        return ['%' . m[1]]
-    endif
-
-    " Meta variables
-    let m = matchlist(a:line, '^\(!\S\+\)\s\+=')
-    if !empty(m)
-        return [m[1]]
-    endif
-
-    " Attributes
-    let m = matchlist(a:line, '^attributes\s\+\(#\d\+\)\s\+=')
-    if !empty(m)
-        return [m[1]]
-    endif
-
-    if a:line =~# '^\%(declare\|define\)\>'
-        return s:get_func_identifiers(a:line)
-    endif
-
-    return []
-endfunction
-
-function! s:extract_identifier(word) abort
-    if strlen(a:word) <= 1
-        return ''
-    endif
-
-    let prefix = a:word[0]
-    if prefix ==# '@' || prefix ==# '%' || prefix ==# '!'
-        if prefix ==# '!' && a:word[1] ==# '{'
-            return ''
-        endif
-
-        if a:word[1] == '"'
-            let idx = stridx(a:word, '"', 2)
-            if idx == -1
-                return ''
-            endif
-            " @"foo" or %"foo"
-            return a:word[:idx]
-        else
-            " @foo or %foo
-            return matchstr(a:word, '^[@%!][[:alnum:]_.]\+')
-        endif
-    endif
-
-    if prefix ==# '#'
-        return matchstr(a:word, '^#\d\+')
-    endif
-
-    return ''
-endfunction
-
-function! s:jump_to_identifier_at(linum, ident) abort
-    let line = getline(a:linum)
-    let column = stridx(line, a:ident) + 1
-    if column == 0
-        let column = col('.')
-    endif
-    call cursor(a:linum, column)
-endfunction
-
-function! s:browser_open_command() abort
-    if exists('g:llvm_ext_browser_open_command')
-        return g:llvm_ext_browser_open_command
-    endif
-    if exists('s:browser_opener')
-        return s:browser_opener
-    endif
-    let s:browser_opener = ''
-    if has('mac')
-        let s:browser_opener = 'open'
-    elseif has('win32') || has('win64')
-        let s:browser_opener =  'cmd /q /c start ""'
-    else
-        for cmd in ['xdg-open', 'chromium', 'google-chrome', 'firefox']
-            if executable(cmd)
-                let s:browser_opener = cmd
-                break
-            endif
-        endfor
-    endif
-    return s:browser_opener
-endfunction
-
-function! s:open_browser(url) abort
-    let cmd = s:browser_open_command()
-    if cmd ==# ''
-        throw "Failed to open a browser. I don't know how to open a browser: Please set g:llvm_ext_browser_open_command"
-    endif
-    let cmdline = cmd . ' ' . shellescape(a:url)
-    let out = system(cmdline)
-    if v:shell_error
-        throw printf("Failed to open a browser with command '%s': %s", cmdline, out)
-    endif
-endfunction
-
-function! s:goto_definition() abort
-    " Open language reference manual under the cursor in browser
-    let syn_name = synIDattr(synID(line('.'),col('.'),1),'name')
-    if syn_name ==# 'llvmStatement'
-        let word = expand('<cword>')
-        if word !=# ''
-            try
-                " Open browser assuming a word under the cursor is an instruction
-                call s:open_browser('https://llvm.org/docs/LangRef.html#' . word . '-instruction')
-            catch /^Failed to open a browser/
-                echohl ErrorMsg | echom v:exception | echohl None
-            endtry
-        endif
-        return
-    endif
-
-    " XXX: This does not support identifiers which contains spaces
-    let word = expand('<cWORD>')
-    if word ==# ''
-        echom 'No identifier found under the cursor'
-        return
-    endif
-    let ident = s:extract_identifier(word)
-    if ident ==# ''
-        echom 'No identifier found under the cursor'
-        return
-    endif
-
-    " Definition tends to be near its usages. Look back at first.
-    let line = line('.')
-    while line > 0
-        for found in s:get_identifiers(getline(line))
-            if ident ==# found
-                call s:jump_to_identifier_at(line, ident)
-                return
-            endif
-        endfor
-        let line -= 1
-    endwhile
-
-    let line = line('.') + 1
-    let last = line('$')
-    while line <= last
-        for found in s:get_identifiers(getline(line))
-            if ident ==# found
-                call s:jump_to_identifier_at(line, ident)
-                return
-            endif
-        endfor
-        let line += 1
-    endwhile
-
-    echom "No definition for '" . ident . "' found"
-endfunction
-
-if !g:llvm_ext_no_mapping
-    nnoremap <buffer><silent>K :<C-u>call <SID>goto_definition()<CR>
-endif
-
-function! s:run_lli(...) abort
-    if !has('job') || !has('channel') || !has('terminal')
-        echohl ErrorMsg
-        echomsg ':LLI requires terminal feature. Please update your Vim to 8.0+'
-        echohl None
-        return
-    endif
-
-    if !executable(g:llvm_ext_lli_executable)
-        echohl ErrorMsg
-        echomsg g:llvm_ext_lli_executable . ' is not executable. Please set g:llvm_ext_lli_executable'
-        echohl None
-        return
-    endif
-
-    if a:0 > 0
-        let bufnr = term_start([g:llvm_ext_lli_executable, a:1])
-        echo 'Run lli in termnal buffer(' . bufnr . ')'
-        return
-    endif
-
-    let tmpfile = tempname()
-    call writefile(getline(1, '$'), tmpfile)
-    let Cleanup = {ch -> filereadable(tmpfile) ? delete(tmpfile) : 0}
-    let bufnr = term_start([g:llvm_ext_lli_executable, tmpfile], {'close_cb': Cleanup, 'exit_cb': Cleanup})
-    echo 'Run lli in termnal buffer(' . bufnr . ')'
-endfunction
-
-if !exists(':LLI')
-    command! -buffer -nargs=? -bar -complete=file LLI call <SID>run_lli(<f-args>)
-endif
-
-endif

after/ftplugin/puppet.vim

@@ -1,11 +1,20 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-
+  
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
 endif
 
-if g:puppet_align_hashes
-    inoremap <buffer> <silent> => =><Esc>:call puppet#align#AlignHashrockets()<CR>$a
+if g:puppet_align_hashes && exists(':Tabularize')
+    inoremap <buffer> <silent> > ><Esc>:call <SID>puppetalign()<CR>a
+    function! s:puppetalign()
+        let p = '^\s*\w+\s*[=+]>.*$'
+        let column = strlen(substitute(getline('.')[0:col('.')],'\([^=]\|=[^>]\)','','g'))
+        let position = strlen(matchstr(getline('.')[0:col('.')],'.*=>\s*\zs.*'))
+        Tabularize /=>/l1
+        normal! 0
+        echo repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position)
+        call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
+    endfunction
 endif
 
 endif

after/ftplugin/typescript.vim

@@ -1,32 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-" modified from html.vim
-" For matchit plugin
-
-if get(g:, 'vim_jsx_pretty_disable_tsx', 0)
-  finish
-endif
-
-if exists("loaded_matchit")
-  let b:match_ignorecase = 0
-  let b:match_words = '(:),\[:\],{:},<:>,' .
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
-endif
-
-" For andymass/vim-matchup plugin
-if exists("loaded_matchup")
-  setlocal matchpairs=(:),{:},[:],<:>
-  let b:match_words = '<\@<=\([^/][^ \t>]*\)\g{hlend}[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
-  let b:match_skip = 's:comment\|string'
-endif
-
-let b:original_commentstring = &l:commentstring
-
-augroup jsx_comment
-  autocmd! CursorMoved <buffer>
-  autocmd CursorMoved <buffer> call jsx_pretty#comment#update_commentstring(b:original_commentstring)
-augroup end
-
-setlocal suffixesadd+=.tsx
-
-endif

after/ftplugin/typescriptreact.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-source <sfile>:h/typescript.vim
-
-endif

after/ftplugin/yaml.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-
+  
 " Vim indent file
 " Language: Yaml
 " Author: Henrique Barcelos

after/indent/html.vim

@@ -0,0 +1,37 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
+" Language:    CoffeeScript
+" Maintainer:  Mick Koch <mick@kochm.co>
+" URL:         http://github.com/kchmck/vim-coffee-script
+" License:     WTFPL
+
+" Load the coffee and html indent functions.
+silent! unlet b:did_indent
+runtime indent/coffee.vim
+let s:coffeeIndentExpr = &l:indentexpr
+
+" Load html last so it can overwrite coffee settings.
+silent! unlet b:did_indent
+runtime indent/html.vim
+let s:htmlIndentExpr = &l:indentexpr
+
+" Inject our wrapper indent function.
+setlocal indentexpr=GetCoffeeHtmlIndent(v:lnum)
+
+function! GetCoffeeHtmlIndent(curlinenum)
+  " See if we're inside a coffeescript block.
+  let scriptlnum = searchpair('<script [^>]*type="text/coffeescript"[^>]*>', '',
+  \                           '</script>', 'bWn')
+  let prevlnum = prevnonblank(a:curlinenum)
+
+  " If we're in the script block and the previous line isn't the script tag
+  " itself, use coffee indenting.
+  if scriptlnum && scriptlnum != prevlnum
+    exec 'return ' s:coffeeIndentExpr
+  endif
+
+  " Otherwise use html indenting.
+  exec 'return ' s:htmlIndentExpr
+endfunction
+
+endif

after/indent/javascript.vim

@@ -1,33 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim indent file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-if exists('b:did_indent')
-  let s:did_indent = b:did_indent
-  unlet b:did_indent
-endif
-
-let s:keepcpo = &cpo
-set cpo&vim
-
-if exists('s:did_indent')
-  let b:did_indent = s:did_indent
-endif
-
-setlocal indentexpr=GetJsxIndent()
-setlocal indentkeys=0.,0{,0},0),0],0?,0\*,0\,,!^F,:,<:>,o,O,e,<>>,=*/
-
-function! GetJsxIndent()
-  return jsx_pretty#indent#get(function('GetJavascriptIndent'))
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-endif

after/indent/javascriptreact.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-source <sfile>:h/javascript.vim
-
-endif

after/indent/jsx.vim

@@ -1,8 +1,15 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim indent file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-exe 'runtime! indent/typescript.vim'
 " Save the current JavaScript indentexpr.
-let b:tsx_ts_indentexpr = &indentexpr
+let b:jsx_js_indentexpr = &indentexpr
 
 " Prologue; load in XML indentation.
 if exists('b:did_indent')
@@ -14,7 +21,7 @@ if exists('s:did_indent')
   let b:did_indent=s:did_indent
 endif
 
-setlocal indentexpr=GetTsxIndent()
+setlocal indentexpr=GetJsxIndent()
 
 " JS indentkeys
 setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
@@ -23,7 +30,6 @@ setlocal indentkeys+=*<Return>,<>>,<<>,/
 
 " Multiline end tag regex (line beginning with '>' or '/>')
 let s:endtag = '^\s*\/\?>\s*;\='
-let s:startexp = '[\{\(]\s*$'
 
 " Get all syntax types at the beginning of a given line.
 fu! SynSOL(lnum)
@@ -39,7 +45,7 @@ endfu
 
 " Check if a syntax attribute is XMLish.
 fu! SynAttrXMLish(synattr)
-  return a:synattr =~ "^xml" || a:synattr =~ "^tsx"
+  return a:synattr =~ "^xml" || a:synattr =~ "^jsx"
 endfu
 
 " Check if a synstack is XMLish (i.e., has an XMLish last attribute).
@@ -47,63 +53,60 @@ fu! SynXMLish(syns)
   return SynAttrXMLish(get(a:syns, -1))
 endfu
 
-" Check if a synstack denotes the end of a TSX block.
-fu! SynTSXBlockEnd(syns)
-  return get(a:syns, -1) =~ '\%(ts\|typescript\)Braces' &&
+" Check if a synstack denotes the end of a JSX block.
+fu! SynJSXBlockEnd(syns)
+  return get(a:syns, -1) =~ '\%(js\|javascript\)Braces' &&
        \ SynAttrXMLish(get(a:syns, -2))
 endfu
 
-" Determine how many tsxRegions deep a synstack is.
-fu! SynTSXDepth(syns)
-  return len(filter(copy(a:syns), 'v:val ==# "tsxRegion"'))
+" Determine how many jsxRegions deep a synstack is.
+fu! SynJSXDepth(syns)
+  return len(filter(copy(a:syns), 'v:val ==# "jsxRegion"'))
 endfu
 
-" Check whether `cursyn' continues the same tsxRegion as `prevsyn'.
-fu! SynTSXContinues(cursyn, prevsyn)
-  let curdepth = SynTSXDepth(a:cursyn)
-  let prevdepth = SynTSXDepth(a:prevsyn)
+" Check whether `cursyn' continues the same jsxRegion as `prevsyn'.
+fu! SynJSXContinues(cursyn, prevsyn)
+  let curdepth = SynJSXDepth(a:cursyn)
+  let prevdepth = SynJSXDepth(a:prevsyn)
 
   " In most places, we expect the nesting depths to be the same between any
-  " two consecutive positions within a tsxRegion (e.g., between a parent and
-  " child node, between two TSX attributes, etc.).  The exception is between
+  " two consecutive positions within a jsxRegion (e.g., between a parent and
+  " child node, between two JSX attributes, etc.).  The exception is between
   " sibling nodes, where after a completed element (with depth N), we return
   " to the parent's nesting (depth N - 1).  This case is easily detected,
   " since it is the only time when the top syntax element in the synstack is
-  " tsxRegion---specifically, the tsxRegion corresponding to the parent.
+  " jsxRegion---specifically, the jsxRegion corresponding to the parent.
   return prevdepth == curdepth ||
-      \ (prevdepth == curdepth + 1 && get(a:cursyn, -1) ==# 'tsxRegion')
+      \ (prevdepth == curdepth + 1 && get(a:cursyn, -1) ==# 'jsxRegion')
 endfu
 
 " Cleverly mix JS and XML indentation.
-fu! GetTsxIndent()
+fu! GetJsxIndent()
   let cursyn  = SynSOL(v:lnum)
   let prevsyn = SynEOL(v:lnum - 1)
 
   " Use XML indenting iff:
-  "   - the syntax at the end of the previous line was either TSX or was the
-  "     closing brace of a jsBlock whose parent syntax was TSX; and
-  "   - the current line continues the same tsxRegion as the previous line.
-  if (SynXMLish(prevsyn) || SynTSXBlockEnd(prevsyn)) &&
-        \ SynTSXContinues(cursyn, prevsyn)
+  "   - the syntax at the end of the previous line was either JSX or was the
+  "     closing brace of a jsBlock whose parent syntax was JSX; and
+  "   - the current line continues the same jsxRegion as the previous line.
+  if (SynXMLish(prevsyn) || SynJSXBlockEnd(prevsyn)) &&
+        \ SynJSXContinues(cursyn, prevsyn)
     let ind = XmlIndentGet(v:lnum, 0)
-    let l:line = getline(v:lnum)
-    let l:pline = getline(v:lnum - 1)
 
     " Align '/>' and '>' with '<' for multiline tags.
-    " Align end of expression ')' or '}'.
-    if l:line =~? s:endtag
-      let ind = ind - shiftwidth()
+    if getline(v:lnum) =~? s:endtag
+      let ind = ind - &sw
     endif
 
-    " Then correct the indentation of any TSX following '/>' or '>'.
-    " Align start of expression '(' or '{'
-    if l:pline =~? s:endtag || l:pline =~? s:startexp
-      let ind = ind + shiftwidth()
+    " Then correct the indentation of any JSX following '/>' or '>'.
+    if getline(v:lnum - 1) =~? s:endtag
+      let ind = ind + &sw
     endif
   else
-    if len(b:tsx_ts_indentexpr)
-      " Invoke the base TS package's custom indenter
-      let ind = eval(b:tsx_ts_indentexpr)
+    if len(b:jsx_js_indentexpr)
+      " Invoke the base JS package's custom indenter.  (For vim-javascript,
+      " e.g., this will be GetJavascriptIndent().)
+      let ind = eval(b:jsx_js_indentexpr)
     else
       let ind = cindent(v:lnum)
     endif
@@ -111,4 +114,5 @@ fu! GetTsxIndent()
 
   return ind
 endfu
+
 endif

after/indent/objc.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
-
+  
 " Vim indent file
 " Language:	Objective-C
 " Maintainer:	Bjorn Winckler <bjorn.winckler@gmail.com>

after/indent/typescript.vim

@@ -1,38 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim indent file
-"
-" Language: typescript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-" Depends: leafgarland/typescript-vim
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-if get(g:, 'vim_jsx_pretty_disable_tsx', 0)
-  finish
-endif
-
-if exists('b:did_indent')
-  let s:did_indent = b:did_indent
-  unlet b:did_indent
-endif
-
-let s:keepcpo = &cpo
-set cpo&vim
-
-if exists('s:did_indent')
-  let b:did_indent = s:did_indent
-endif
-
-setlocal indentexpr=GetJsxIndent()
-setlocal indentkeys=0.,0{,0},0),0],0?,0\*,0\,,!^F,:,<:>,o,O,e,<>>,=*/
-
-function! GetJsxIndent()
-  return jsx_pretty#indent#get(function('GetTypescriptIndent'))
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
-
-endif

after/indent/typescriptreact.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-source <sfile>:h/typescript.vim
-
-endif

after/syntax/c.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
-
+  
 " Vim syntax file
 " Language: C Additions
 " Maintainer: Jon Haggblad <jon@haeggblad.com>
@@ -20,34 +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    transparent "(" 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 "\(\.\|->\)\h\w*" contains=cCustomDot,cCustomPtr
-    hi def link cCustomMemVar Function
-endif
-
-" -----------------------------------------------------------------------------
-"  Highlight POSIX functions.
-" -----------------------------------------------------------------------------
-if exists('g:cpp_posix_standard') && g:cpp_posix_standard
-	syn keyword cPOSIXFunction 	socket accept bind connect getsockname
-	syn keyword cPOSIXFunction 	listen recv recvfrom recvmsg
-	syn keyword cPOSIXFunction 	send sendto sendmsg setsockopt socketpair
-	syn keyword cPOSIXFunction 	htonl htons ntohl ntohs
-	syn keyword cPOSIXFunction 	inet_ntop inet_pton getaddrinfo
-	syn keyword cPOSIXFunction 	poll select pselect
-	hi def link cPOSIXFunction 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/coffee.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
-
+  
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
   unlet b:current_syntax

after/syntax/haml.vim

@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
+" Language:    CoffeeScript
+" Maintainer:  Sven Felix Oberquelle <Svelix.Github@gmail.com>
+" URL:         http://github.com/kchmck/vim-coffee-script
+" License:     WTFPL
+
+" Inherit coffee from html so coffeeComment isn't redefined and given higher
+" priority than hamlInterpolation.
+syn cluster hamlCoffeescript contains=@htmlCoffeeScript
+syn region  hamlCoffeescriptFilter matchgroup=hamlFilter
+\                                  start="^\z(\s*\):coffee\z(script\)\?\s*$"
+\                                  end="^\%(\z1 \| *$\)\@!"
+\                                  contains=@hamlCoffeeScript,hamlInterpolation
+\                                  keepend
+
+endif

after/syntax/haskell.vim

@@ -1,17 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dhall') == -1
-
-" store and remove current syntax value
-let old_syntax = b:current_syntax
-unlet b:current_syntax
-
-syn include @dhall syntax/dhall.vim
-unlet b:current_syntax
-
-syn region dhallBlock matchgroup=quasiQuote start=/\[\$\?staticDhallExpression|/       end=/|\]/ contains=@dhall
-
-hi def link quasiQuote Underlined
-
-" restore current syntax value
-let b:current_syntax = old_syntax
-
-endif

after/syntax/help.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
-
+  
 " Extends standard help syntax with highlighting of Scala code.
 "
 " Place code between !sc! and !/sc! delimiters. These will be hidden if Vim is

after/syntax/html.vim

@@ -1,16 +1,58 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
+" Language:    CoffeeScript
+" Maintainer:  Mick Koch <mick@kochm.co>
+" URL:         http://github.com/kchmck/vim-coffee-script
+" License:     WTFPL
 
-" 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=+>+
+" Syntax highlighting for text/coffeescript script tags
+syn include @htmlCoffeeScript syntax/coffee.vim
+syn region coffeeScript start=#<script [^>]*type="text/coffeescript"[^>]*>#
+\                       end=#</script>#me=s-1 keepend
+\                       contains=@htmlCoffeeScript,htmlScriptTag,@htmlPreproc
+\                       containedin=htmlHead
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
+  
+" Language: OpenGL Shading Language
+" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
+
+syn include @GLSL syntax/glsl.vim
+syn region ShaderScript
+      \ start="<script [^>]*type=\('\|\"\)x-shader/x-\(vertex\|fragment\)\('\|\"\)[^>]*>"
+      \ keepend
+      \ end="</script>"me=s-1
+      \ contains=@GLSL,htmlScriptTag,@htmlPreproc
+
+endif
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'less') == -1
+  
+if !exists("g:less_html_style_tags")
+  let g:less_html_style_tags = 1
+endif
+
+if !g:less_html_style_tags
+  finish
+endif
+
+" Unset (but preserve) so that less will run.
+if exists("b:current_syntax")
+   let s:pre_less_cur_syn = b:current_syntax
+   unlet b:current_syntax
+endif
+
+" Inspired by code from github.com/kchmck/vim-coffee-script
+" and the html syntax file included with vim 7.4.
+
+syn include @htmlLess syntax/less.vim
+
+" We have to explicitly add to htmlHead (containedin) as that region specifies 'contains'.
+syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end=+</style>+ contains=@htmlLess,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc containedin=htmlHead
+
+" Reset since 'less' isn't really the current_syntax.
+if exists("s:pre_less_cur_syn")
+   let b:current_syntax = s:pre_less_cur_syn
+endif
 
 endif

after/syntax/idris.vim

@@ -1,82 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris') == -1
-
-" This script allows for unicode concealing of certain characters
-" For instance -> goes to →
-"
-" It needs vim >= 7.3, set nocompatible, set enc=utf-8
-"
-" If you want to turn this on, let g:idris_conceal = 1
-
-if !exists('g:idris_conceal') || !has('conceal') || &enc != 'utf-8'
-    finish
-endif
-
-" vim: set fenc=utf-8:
-syntax match idrNiceOperator "\\\ze[[:alpha:][:space:]_([]" conceal cchar=λ
-syntax match idrNiceOperator "<-" conceal cchar=←
-syntax match idrNiceOperator "->" conceal cchar=→
-syntax match idrNiceOperator "\<sum\>" conceal cchar=∑
-syntax match idrNiceOperator "\<product\>" conceal cchar=∏
-syntax match idrNiceOperator "\<sqrt\>" conceal cchar=√
-syntax match idrNiceOperator "\<pi\>" conceal cchar=π
-syntax match idrNiceOperator "==" conceal cchar=≡
-syntax match idrNiceOperator "\/=" conceal cchar=≠
-
-
-let s:extraConceal = 1
-
-let s:doubleArrow = 1
-" Set this to 0 to use the more technically correct arrow from bar
-
-" Some windows font don't support some of the characters,
-" so if they are the main font, we don't load them :)
-if has("win32")
-    let s:incompleteFont = [ 'Consolas'
-                        \ , 'Lucida Console'
-                        \ , 'Courier New'
-                        \ ]
-    let s:mainfont = substitute( &guifont, '^\([^:,]\+\).*', '\1', '')
-    for s:fontName in s:incompleteFont
-        if s:mainfont ==? s:fontName
-            let s:extraConceal = 0
-            break
-        endif
-    endfor
-endif
-
-if s:extraConceal
-    syntax match idrNiceOperator "Void" conceal cchar=⊥
-
-    " Match greater than and lower than w/o messing with Kleisli composition
-    syntax match idrNiceOperator "<=\ze[^<]" conceal cchar=≤
-    syntax match idrNiceOperator ">=\ze[^>]" conceal cchar=≥
-
-    if s:doubleArrow
-      syntax match idrNiceOperator "=>" conceal cchar=⇒
-    else
-      syntax match idrNiceOperator "=>" conceal cchar=↦
-    endif
-
-    syntax match idrNiceOperator "=\zs<<" conceal cchar=«
-
-    syntax match idrNiceOperator "++" conceal cchar=⧺
-    syntax match idrNiceOperator "::" conceal cchar=∷
-    syntax match idrNiceOperator "-<" conceal cchar=↢
-    syntax match idrNiceOperator ">-" conceal cchar=↣
-    syntax match idrNiceOperator "-<<" conceal cchar=⤛
-    syntax match idrNiceOperator ">>-" conceal cchar=⤜
-
-    " Only replace the dot, avoid taking spaces around.
-    syntax match idrNiceOperator /\s\.\s/ms=s+1,me=e-1 conceal cchar=∘
-    syntax match idrNiceOperator "\.\." conceal cchar=‥
-
-    syntax match idrNiceOperator "`elem`" conceal cchar=∈
-    syntax match idrNiceOperator "`notElem`" conceal cchar=∉
-endif
-
-hi link idrNiceOperator Operator
-hi! link Conceal Operator
-setlocal conceallevel=2
-
-
-endif

after/syntax/javascript.vim

@@ -1,59 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim syntax file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-let s:jsx_cpo = &cpo
-set cpo&vim
-
-syntax case match
-
-if exists('b:current_syntax')
-  let s:current_syntax = b:current_syntax
-  unlet b:current_syntax
-endif
-
-if exists('s:current_syntax')
-  let b:current_syntax = s:current_syntax
-endif
-
-if hlexists("jsDebugger") || hlexists("jsNoise")    " yuezk/vim-js or pangloss/vim-javascript
-  syntax cluster jsExpression add=jsxRegion
-elseif hlexists("javascriptOpSymbols")    " othree/yajs.vim
-  " refine the javascript line comment
-  syntax region javascriptLineComment start=+//+ end=/$/ contains=@Spell,javascriptCommentTodo extend keepend
-  syntax cluster javascriptValue add=jsxRegion
-  syntax cluster javascriptNoReserved add=jsxElement,jsxTag
-else    " build-in javascript syntax
-  " refine the javascript line comment
-  syntax region javaScriptLineComment start=+//+ end=/$/ contains=@Spell,javascriptCommentTodo extend keepend
-
-  " refine the template string syntax
-  syntax region javaScriptEmbed matchgroup=javaScriptEmbedBraces start=+\${+ end=+}+ contained contains=@javaScriptEmbededExpr
-
-  " add a javaScriptBlock group for build-in syntax
-  syntax region javaScriptBlock
-        \ matchgroup=javaScriptBraces
-        \ start="{"
-        \ end="}"
-        \ contained
-        \ extend
-        \ contains=javaScriptBlock,@javaScriptEmbededExpr,javaScript.*
-        \ fold
-
-  syntax cluster javaScriptEmbededExpr add=jsxRegion,javaScript.*
-endif
-
-runtime syntax/jsx_pretty.vim
-
-let b:current_syntax = 'javascript.jsx'
-
-let &cpo = s:jsx_cpo
-unlet s:jsx_cpo
-
-endif

after/syntax/javascript/graphql.vim

@@ -1,27 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-if exists('b:current_syntax')
-  let s:current_syntax = b:current_syntax
-  unlet b:current_syntax
-endif
-syn include @GraphQLSyntax syntax/graphql.vim
-if exists('s:current_syntax')
-  let b:current_syntax = s:current_syntax
-endif
-
-let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'
-
-exec 'syntax region graphqlTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\`+ end=+`+ contains=@GraphQLSyntax,jsTemplateExpression,jsSpecial extend'
-exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
-
-" Support expression interpolation ((${...})) inside template strings.
-syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=jsTemplateExpression containedin=graphqlFold keepend
-
-hi def link graphqlTemplateString jsTemplateString
-hi def link graphqlTaggedTemplate jsTaggedTemplate
-hi def link graphqlTemplateExpression jsTemplateExpression
-
-syn cluster jsExpression add=graphqlTaggedTemplate
-syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif

after/syntax/javascriptreact.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-source <sfile>:h/javascript.vim
-
-endif

after/syntax/jsx.vim

@@ -1,8 +1,17 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mdx') == -1
-
-
-" based on mxw/vim-jsx
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+  
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" Vim syntax file
+"
+" Language: JSX (JavaScript)
+" Maintainer: Max Wang <mxawng@gmail.com>
+" Depends: pangloss/vim-javascript
+"
+" CREDITS: Inspired by Facebook.
+"
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+" Prologue; load in XML syntax.
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
   unlet b:current_syntax
@@ -12,6 +21,17 @@ if exists('s:current_syntax')
   let b:current_syntax=s:current_syntax
 endif
 
+" Officially, vim-jsx depends on the pangloss/vim-javascript syntax package
+" (and is tested against it exclusively).  However, in practice, we make some
+" effort towards compatibility with other packages.
+"
+" These are the plugin-to-syntax-element correspondences:
+"
+"   - pangloss/vim-javascript:      jsBlock, jsExpression
+"   - jelera/vim-javascript-syntax: javascriptBlock
+"   - othree/yajs.vim:              javascriptNoReserved
+
+
 " JSX attributes should color as JS.  Note the trivial end pattern; we let
 " jsBlock take care of ending the region.
 syn region xmlString contained start=+{+ end=++ contains=jsBlock,javascriptBlock

after/syntax/jsx_pretty.vim

@@ -1,225 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-let s:highlight_close_tag = get(g:, 'vim_jsx_pretty_highlight_close_tag', 0)
-
-" detect jsx region
-syntax region jsxRegion
-      \ start=+\%(\%(\_[([,?:=+\-*/>{}]\|<\s\+\|&&\|||\|=>\|\<return\|\<default\|\<await\|\<yield\)\_s*\)\@<=<\_s*\%(>\|\z(\%(script\|T\s*>\s*(\)\@!\<[_$A-Za-z][-:._$A-Za-z0-9]*\>\)\%(\_s*\%([-+*)\]}&|?,]\|/\%([/*]\|\_s*>\)\@!\)\)\@!\)+
-      \ end=++
-      \ contains=jsxElement
-
-" <tag id="sample">
-" ~~~~~~~~~~~~~~~~~
-" and self close tag
-" <tag id="sample"   />
-" ~~~~~~~~~~~~~~~~~~~
-syntax region jsxTag
-      \ start=+<+
-      \ matchgroup=jsxOpenPunct
-      \ end=+>+
-      \ matchgroup=NONE
-      \ end=+\%(/\_s*>\)\@=+
-      \ contained
-      \ contains=jsxOpenTag,jsxAttrib,jsxExpressionBlock,jsxSpreadOperator,jsComment,@javascriptComments,javaScriptLineComment,javaScriptComment,typescriptLineComment,typescriptComment
-      \ keepend
-      \ extend
-      \ skipwhite
-      \ skipempty
-      \ nextgroup=jsxCloseString
-
-" <tag></tag>
-" ~~~~~~~~~~~
-" and fragment
-" <></>
-" ~~~~~
-" and self close tag
-" <tag />
-" ~~~~~~~
-syntax region jsxElement
-      \ start=+<\_s*\%(>\|\${\|\z(\<[-:._$A-Za-z0-9]\+\>\)\)+
-      \ end=+/\_s*>+
-      \ end=+<\_s*/\_s*\z1\_s*>+
-      \ contains=jsxElement,jsxTag,jsxExpressionBlock,jsxComment,jsxCloseTag,@Spell
-      \ keepend
-      \ extend
-      \ contained
-      \ fold
-
-" <tag key={this.props.key}>
-" ~~~~
-" and fragment start tag
-" <>
-" ~~
-exe 'syntax region jsxOpenTag
-      \ matchgroup=jsxOpenPunct
-      \ start=+<+
-      \ end=+>+
-      \ matchgroup=NONE
-      \ end=+\>+
-      \ contained
-      \ contains=jsxTagName
-      \ nextgroup=jsxAttrib
-      \ skipwhite
-      \ skipempty
-      \ ' .(s:highlight_close_tag ? 'transparent' : '')
-
-
-" <tag key={this.props.key}>
-"          ~~~~~~~~~~~~~~~~
-syntax region jsxExpressionBlock
-      \ matchgroup=jsxBraces
-      \ start=+{+
-      \ end=+}+
-      \ contained
-      \ extend
-      \ contains=@jsExpression,jsSpreadExpression,@javascriptExpression,javascriptSpreadOp,@javaScriptEmbededExpr,@typescriptExpression,typescriptObjectSpread
-
-" <foo.bar>
-"     ~
-syntax match jsxDot +\.+ contained
-
-" <foo:bar>
-"     ~
-syntax match jsxNamespace +:+ contained
-
-" <tag id="sample">
-"        ~
-syntax match jsxEqual +=+ contained skipwhite skipempty nextgroup=jsxString,jsxExpressionBlock,jsxRegion
-
-" <tag />
-"      ~~
-syntax match jsxCloseString +/\_s*>+ contained
-
-" </tag>
-" ~~~~~~
-" and fragment close tag
-" </>
-" ~~~
-syntax region jsxCloseTag
-      \ matchgroup=jsxClosePunct
-      \ start=+<\_s*/+
-      \ end=+>+
-      \ contained
-      \ contains=jsxTagName
-
-" <tag key={this.props.key}>
-"      ~~~
-syntax match jsxAttrib
-      \ +\<[_$A-Za-z][-:_$A-Za-z0-9]*\>+
-      \ contained
-      \ nextgroup=jsxEqual
-      \ skipwhite
-      \ skipempty
-      \ contains=jsxAttribKeyword,jsxNamespace
-
-" <MyComponent ...>
-"  ~~~~~~~~~~~
-" NOT
-" <someCamel ...>
-"      ~~~~~
-exe 'syntax match jsxComponentName
-      \ +\<[_$]\?[A-Z][-_$A-Za-z0-9]*\>+
-      \ contained
-      \ ' .(s:highlight_close_tag ? 'transparent' : '')
-
-" <tag key={this.props.key}>
-"  ~~~
-exe 'syntax match jsxTagName
-      \ +\<[-:._$A-Za-z0-9]\+\>+
-      \ contained
-      \ contains=jsxComponentName,jsxDot,jsxNamespace
-      \ nextgroup=jsxAttrib
-      \ skipempty
-      \ skipwhite
-      \ ' .(s:highlight_close_tag ? 'transparent' : '')
-
-" <tag id="sample">
-"         ~~~~~~~~
-" and
-" <tag id='sample'>
-"         ~~~~~~~~
-syntax region jsxString start=+\z(["']\)+  skip=+\\\\\|\\\z1\|\\\n+  end=+\z1+ contained contains=@Spell
-
-let s:tags = get(g:, 'vim_jsx_pretty_template_tags', ['html', 'jsx'])
-let s:enable_tagged_jsx = !empty(s:tags)
-
-" add support to JSX inside the tagged template string
-" https://github.com/developit/htm
-if s:enable_tagged_jsx
-  exe 'syntax match jsxRegion +\%(' . join(s:tags, '\|') . '\)\%(\_s*`\)\@=+ contains=jsTemplateStringTag,jsTaggedTemplate,javascriptTagRef skipwhite skipempty nextgroup=jsxTaggedRegion'
-
-  syntax region jsxTaggedRegion
-        \ matchgroup=jsxBackticks
-        \ start=+`+
-        \ end=+`+
-        \ extend
-        \ contained
-        \ contains=jsxElement,jsxExpressionBlock
-        \ transparent
-
-  syntax region jsxExpressionBlock
-        \ matchgroup=jsxBraces
-        \ start=+\${+
-        \ end=+}+
-        \ extend
-        \ contained
-        \ contains=@jsExpression,jsSpreadExpression,@javascriptExpression,javascriptSpreadOp,@javaScriptEmbededExpr,@typescriptExpression,typescriptObjectSpread
-
-  syntax region jsxOpenTag
-        \ matchgroup=jsxOpenPunct
-        \ start=+<\%(\${\)\@=+
-        \ matchgroup=NONE
-        \ end=+}\@1<=+
-        \ contained
-        \ contains=jsxExpressionBlock
-        \ skipwhite
-        \ skipempty
-        \ nextgroup=jsxAttrib,jsxSpreadOperator
-
-  syntax keyword jsxAttribKeyword class contained
-
-  syntax match jsxSpreadOperator +\.\.\.+ contained nextgroup=jsxExpressionBlock skipwhite
-
-  syntax match jsxCloseTag +<//>+ contained
-
-  syntax match jsxComment +<!--\_.\{-}-->+
-endif
-
-" Highlight the tag name
-highlight def link jsxTag Function
-highlight def link jsxTagName Identifier
-highlight def link jsxComponentName Function
-
-highlight def link jsxAttrib Type
-highlight def link jsxAttribKeyword jsxAttrib
-highlight def link jsxString String
-highlight def link jsxComment Comment
-
-highlight def link jsxDot Operator
-highlight def link jsxNamespace Operator
-highlight def link jsxEqual Operator
-highlight def link jsxSpreadOperator Operator
-highlight def link jsxBraces Special
-
-if s:highlight_close_tag
-  highlight def link jsxCloseString Identifier
-  highlight def link jsxOpenPunct jsxTag
-else
-  " Highlight the jsxCloseString (i.e. />), jsxPunct (i.e. <,>) and jsxCloseTag (i.e. <//>)
-  highlight def link jsxCloseString Comment
-  highlight def link jsxOpenPunct jsxPunct
-endif
-
-highlight def link jsxPunct jsxCloseString
-highlight def link jsxClosePunct jsxPunct
-highlight def link jsxCloseTag jsxCloseString
-
-let s:vim_jsx_pretty_colorful_config = get(g:, 'vim_jsx_pretty_colorful_config', 0)
-
-if s:vim_jsx_pretty_colorful_config == 1
-  highlight def link jsObjectKey Label
-  highlight def link jsArrowFuncArgs Type
-  highlight def link jsFuncArgs Type
-endif
-
-endif

after/syntax/llvm.vim

@@ -1,26 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'llvm') == -1
-
-" Copyright (c) 2018 rhysd
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to deal
-" in the Software without restriction, including without limitation the rights
-" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-" copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-" THE SOFTWARE.
-
-syn keyword llvmKeyword attributes
-syn match llvmNoName /#\d\+\>/
-
-endif

after/syntax/objc.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
-
+  
 " ARC type modifiers
 syn keyword objcTypeModifier __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak __unsafe_unretained
 

after/syntax/reason.vim

@@ -1,4 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'reason') == -1
-
-
-endif

after/syntax/rspec.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
-
+  
 "
 " An rspec syntax file
 " Originally from http://www.vim.org/scripts/script.php?script_id=2286

after/syntax/ruby.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
-
+  
 " Ruby syntax extensions for highlighting YARD documentation.
 "
 " Author: Joel Holdbrooks <https://github.com/noprompt>

after/syntax/rust.vim

@@ -1,14 +1,12 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-scriptencoding utf-8
-
-if !get(g:, 'rust_conceal', 0) || !has('conceal') || &encoding !=# 'utf-8'
-    finish
+  
+if !exists('g:rust_conceal') || g:rust_conceal == 0 || !has('conceal') || &enc != 'utf-8'
+	finish
 endif
 
 " For those who don't want to see `::`...
-if get(g:, 'rust_conceal_mod_path', 0)
-    syn match rustNiceOperator "::" conceal cchar=ㆍ
+if exists('g:rust_conceal_mod_path') && g:rust_conceal_mod_path != 0
+	syn match rustNiceOperator "::" conceal cchar=ㆍ
 endif
 
 syn match rustRightArrowHead contained ">" conceal cchar= 
@@ -22,7 +20,7 @@ syn match rustNiceOperator "=>" contains=rustFatRightArrowHead,rustFatRightArrow
 syn match rustNiceOperator /\<\@!_\(_*\>\)\@=/ conceal cchar=′
 
 " For those who don't want to see `pub`...
-if get(g:, 'rust_conceal_pub', 0)
+if exists('g:rust_conceal_pub') && g:rust_conceal_pub != 0
     syn match rustPublicSigil contained "pu" conceal cchar=＊
     syn match rustPublicRest contained "b" conceal cchar= 
     syn match rustNiceOperator "pub " contains=rustPublicSigil,rustPublicRest
@@ -30,16 +28,11 @@ endif
 
 hi link rustNiceOperator Operator
 
-if !get(g:, 'rust_conceal_mod_path', 0)
+if !(exists('g:rust_conceal_mod_path') && g:rust_conceal_mod_path != 0)
     hi! link Conceal Operator
 
-    augroup rust.vim.after
-        autocmd!
-        " And keep it after a colorscheme change
-        autocmd ColorScheme <buffer> hi! link Conceal Operator
-    augroup END
+    " And keep it after a colorscheme change
+    au ColorScheme <buffer> hi! link Conceal Operator
 endif
 
-" vim: set et sw=4 sts=4 ts=8:
-
 endif

after/syntax/tex.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
-
+  
 " adds support for cleverref package
 " \Cref, \cref, \cpageref, \labelcref, \labelcpageref
 syn region texRefZone		matchgroup=texStatement start="\\Cref{"				end="}\|%stopzone\>"	contains=@texRefGroup

after/syntax/tsx.vim

@@ -1,28 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-" GraphQL Support 
-if exists('b:current_syntax')
-  let s:current_syntax = b:current_syntax
-  unlet b:current_syntax
-endif
-syn include @GraphQLSyntax syntax/graphql.vim
-if exists('s:current_syntax')
-  let b:current_syntax = s:current_syntax
-endif
-
-let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'
-
-exec 'syntax region graphqlTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\`+ end=+`+ contains=@GraphQLSyntax,typescriptTemplateSubstitution extend'
-exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
-
-" Support expression interpolation ((${...})) inside template strings.
-syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=typescriptTemplateSubstitution containedin=graphqlFold keepend
-
-hi def link graphqlTemplateString typescriptTemplate
-hi def link graphqlTemplateExpression typescriptTemplateSubstitution
-
-syn cluster typescriptExpression add=graphqlTaggedTemplate
-syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-
-endif

after/syntax/typescript.vim

@@ -1,60 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim syntax file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-" Depends:  leafgarland/typescript-vim
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-if get(g:, 'vim_jsx_pretty_disable_tsx', 0)
-  finish
-endif
-
-let s:jsx_cpo = &cpo
-set cpo&vim
-
-syntax case match
-
-if exists('b:current_syntax')
-  let s:current_syntax = b:current_syntax
-  unlet b:current_syntax
-endif
-
-if exists('s:current_syntax')
-  let b:current_syntax = s:current_syntax
-endif
-
-" refine the typescript line comment
-syntax region typescriptLineComment start=+//+ end=/$/ contains=@Spell,typescriptCommentTodo,typescriptRef extend keepend
-
-for syntax_name in ['tsxRegion', 'tsxFragment']
-  if hlexists(syntax_name)
-    exe 'syntax clear ' . syntax_name
-  endif
-endfor
-
-if !hlexists('typescriptTypeCast')
-  " add a typescriptBlock group for typescript
-  syntax region typescriptBlock
-        \ matchgroup=typescriptBraces
-        \ start="{"
-        \ end="}"
-        \ contained
-        \ extend
-        \ contains=@typescriptExpression,typescriptBlock
-        \ fold
-endif
-
-syntax cluster typescriptExpression add=jsxRegion,typescriptParens
-
-runtime syntax/jsx_pretty.vim
-
-let b:current_syntax = 'typescript.tsx'
-
-let &cpo = s:jsx_cpo
-unlet s:jsx_cpo
-
-endif

after/syntax/typescript/graphql.vim

@@ -1,26 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-if exists('b:current_syntax')
-  let s:current_syntax = b:current_syntax
-  unlet b:current_syntax
-endif
-syn include @GraphQLSyntax syntax/graphql.vim
-if exists('s:current_syntax')
-  let b:current_syntax = s:current_syntax
-endif
-
-let s:tags = '\%(' . join(graphql#javascript_tags(), '\|') . '\)'
-
-exec 'syntax region graphqlTemplateString start=+' . s:tags . '\@20<=`+ skip=+\\`+ end=+`+ contains=@GraphQLSyntax,typescriptTemplateSubstitution extend'
-exec 'syntax match graphqlTaggedTemplate +' . s:tags . '\ze`+ nextgroup=graphqlTemplateString'
-
-" Support expression interpolation ((${...})) inside template strings.
-syntax region graphqlTemplateExpression start=+${+ end=+}+ contained contains=typescriptTemplateSubstitution containedin=graphqlFold keepend
-
-hi def link graphqlTemplateString typescriptTemplate
-hi def link graphqlTemplateExpression typescriptTemplateSubstitution
-
-syn cluster typescriptExpression add=graphqlTaggedTemplate
-syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif

after/syntax/typescriptreact.vim

@@ -1,5 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-source <sfile>:h/typescript.vim
-
-endif

after/syntax/yaml.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-
+  
 " To make this file do stuff, add something like the following (without the
 " leading ") to your ~/.vimrc:
 " au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim
@@ -21,17 +21,15 @@ if version < 600
 endif
 syntax clear
 
-syn match yamlInline "[\[\]\{\}]"
-syn match yamlBlock "[>|]\d\?[+-]"
+syn match yamlDelimiter	"[:,-]"
+syn match yamlBlock "[\[\]\{\}\|\>]"
+syn match yamlOperator "[?^+-]\|=>"
 
 syn region yamlComment	start="\#" end="$"
 syn match yamlIndicator	"#YAML:\S\+"
 
-syn region yamlString	start="\(^\|\s\|\[\|\,\|\-\)\@<='" end="'" skip="\\'"
+syn region yamlString	start="'" end="'" skip="\\'"
 syn region yamlString	start='"' end='"' skip='\\"' contains=yamlEscape
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\s*\n\+\z(\s\+\)\S/rs=s+1 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+2 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\d\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+3 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
 syn match  yamlEscape	+\\[abfnrtv'"\\]+ contained
 syn match  yamlEscape	"\\\o\o\=\o\=" contained
 syn match  yamlEscape	"\\x\x\+" contained
@@ -42,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
@@ -57,9 +54,11 @@ hi link yamlKey		Identifier
 hi link yamlType	Type
 
 hi link yamlComment	Comment
-hi link yamlInline	Operator
 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,654 +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
-  if !has_key(b:, "l2u_keymap_set")
-    let b:l2u_keymap_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")
-    let s:l2u_esc_sequence = "\u0006"
-  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 that performs the substitution in command-line mode
-function! LaTeXtoUnicode#CmdTab(triggeredbytab)
-  " 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
-    if a:triggeredbytab
-      call feedkeys("\<Tab>", 'nt') " fall-back to the default <Tab>
-    endif
-    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
-    if a:triggeredbytab
-      call feedkeys("\<Tab>", 'nt') " fall-back to the default <Tab>
-    endif
-    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
-    let b:l2u_cmdtab_keys = get(g:, "latex_to_unicode_cmd_mapping", ['<Tab>','<S-Tab>'])
-    if type(b:l2u_cmdtab_keys) != type([]) " avoid using v:t_list for backward compatibility
-      let b:l2u_cmdtab_keys = [b:l2u_cmdtab_keys]
-    endif
-    for k in b:l2u_cmdtab_keys
-      exec 'cnoremap <buffer> '.k.' <C-\>eLaTeXtoUnicode#CmdTab('.(k ==? '<Tab>').')<CR>'
-    endfor
-    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
-    for k in b:l2u_cmdtab_keys
-      exec 'cunmap <buffer> '.k
-    endfor
-    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
-
-function! s:L2U_SetKeymap()
-  if !b:l2u_keymap_set && get(g:, "latex_to_unicode_keymap", 0) && b:l2u_enabled
-    setlocal keymap=latex2unicode
-    let b:l2u_keymap_set = 1
-  endif
-endfunction
-
-function! s:L2U_UnsetKeymap()
-  if !b:l2u_keymap_set
-    return
-  endif
-  setlocal keymap=
-  let b:l2u_keymap_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_UnsetKeymap()
-
-  call s:L2U_SetTab(wait_insert_enter)
-  call s:L2U_SetAutoSub(wait_insert_enter)
-  call s:L2U_SetKeymap()
-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/RstFold.vim

@@ -1,66 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
-
-" Author: Antony Lee <anntzer.lee@gmail.com>
-" Description: Helper functions for reStructuredText syntax folding
-" Last Modified: 2018-12-29
-
-function s:CacheRstFold()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  let closure = {'header_types': {}, 'max_level': 0, 'levels': {}}
-  function closure.Process(match) dict
-    let curline = getcurpos()[1]
-    if has_key(self.levels, curline - 1)
-      " For over+under-lined headers, the regex will match both at the
-      " overline and at the title itself; in that case, skip the second match.
-      return
-    endif
-    let lines = split(a:match, '\n')
-    let key = repeat(lines[-1][0], len(lines))
-    if !has_key(self.header_types, key)
-      let self.max_level += 1
-      let self.header_types[key] = self.max_level
-    endif
-    let self.levels[curline] = self.header_types[key]
-  endfunction
-  let save_cursor = getcurpos()
-  let save_mark = getpos("'[")
-  silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn
-  call setpos('.', save_cursor)
-  call setpos("'[", save_mark)
-  let b:RstFoldCache = closure.levels
-endfunction
-
-function RstFold#GetRstFold()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  if !has_key(b:, 'RstFoldCache')
-    call s:CacheRstFold()
-  endif
-  if has_key(b:RstFoldCache, v:lnum)
-    return '>' . b:RstFoldCache[v:lnum]
-  else
-    return '='
-  endif
-endfunction
-
-function RstFold#GetRstFoldText()
-  if !g:rst_fold_enabled
-    return
-  endif
-
-  if !has_key(b:, 'RstFoldCache')
-    call s:CacheRstFold()
-  endif
-  let indent = repeat('  ', b:RstFoldCache[v:foldstart] - 1)
-  let thisline = getline(v:foldstart)
-  " For over+under-lined headers, skip the overline.
-  let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
-  return indent . text
-endfunction
-
-endif

autoload/cargo.vim

@@ -1,129 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-function! cargo#Load() 
-    " Utility call to get this script loaded, for debugging
-endfunction
-
-function! cargo#cmd(args)
-    " Trim trailing spaces. This is necessary since :terminal command parses
-    " trailing spaces as an empty argument.
-    let args = substitute(a:args, '\s\+$', '', '')
-    if has('terminal')
-        let cmd = 'terminal'
-    elseif has('nvim')
-        let cmd = 'noautocmd new | terminal'
-    else
-        let cmd = '!'
-    endif
-    execute cmd 'cargo' args
-endfunction
-
-function! s:nearest_cargo(...) abort
-    " If the second argument is not specified, the first argument determines
-    " whether we will start from the current directory or the directory of the
-    " current buffer, otherwise, we start with the provided path on the 
-    " second argument.
-
-    let l:is_getcwd = get(a:, 1, 0)
-    if l:is_getcwd 
-        let l:starting_path = get(a:, 2, getcwd())
-    else
-        let l:starting_path = get(a:, 2, expand('%:p:h'))
-    endif
-
-    return findfile('Cargo.toml', l:starting_path . ';')
-endfunction
-
-function! cargo#nearestCargo(is_getcwd) abort
-    return s:nearest_cargo(a:is_getcwd)
-endfunction
-
-function! cargo#nearestWorkspaceCargo(is_getcwd) abort
-    let l:nearest = s:nearest_cargo(a:is_getcwd)
-    while l:nearest !=# ''
-        for l:line in readfile(l:nearest, '', 0x100)
-            if l:line =~# '\V[workspace]'
-                return l:nearest
-            endif
-        endfor
-        let l:next = fnamemodify(l:nearest, ':p:h:h')
-        let l:nearest = s:nearest_cargo(0, l:next)
-    endwhile
-    return ''
-endfunction
-
-function! cargo#nearestRootCargo(is_getcwd) abort
-    " Try to find a workspace Cargo.toml, and if not found, take the nearest
-    " regular Cargo.toml
-    let l:workspace_cargo = cargo#nearestWorkspaceCargo(a:is_getcwd)
-    if l:workspace_cargo !=# ''
-        return l:workspace_cargo
-    endif
-    return s:nearest_cargo(a:is_getcwd)
-endfunction
-
-
-function! cargo#build(args)
-    call cargo#cmd("build " . a:args)
-endfunction
-
-function! cargo#clean(args)
-    call cargo#cmd("clean " . a:args)
-endfunction
-
-function! cargo#doc(args)
-    call cargo#cmd("doc " . a:args)
-endfunction
-
-function! cargo#new(args)
-    call cargo#cmd("new " . a:args)
-    cd `=a:args`
-endfunction
-
-function! cargo#init(args)
-    call cargo#cmd("init " . a:args)
-endfunction
-
-function! cargo#run(args)
-    call cargo#cmd("run " . a:args)
-endfunction
-
-function! cargo#test(args)
-    call cargo#cmd("test " . a:args)
-endfunction
-
-function! cargo#bench(args)
-    call cargo#cmd("bench " . a:args)
-endfunction
-
-function! cargo#runtarget(args)
-    let l:filename = expand('%:p')
-    let l:read_manifest = system('cargo read-manifest')
-    let l:metadata = json_decode(l:read_manifest)
-    let l:targets = get(l:metadata, 'targets', [])
-    let l:did_run = 0
-    for l:target in l:targets
-        let l:src_path = get(l:target, 'src_path', '')
-        let l:kinds = get(l:target, 'kind', [])
-        let l:name = get(l:target, 'name', '')
-        if l:src_path == l:filename
-        if index(l:kinds, 'example') != -1
-            let l:did_run = 1
-            call cargo#run("--example " . shellescape(l:name) . " " . a:args)
-            return
-        elseif index(l:kinds, 'bin') != -1
-            let l:did_run = 1
-            call cargo#run("--bin " . shellescape(l:name) . " " . a:args)
-            return
-        endif
-        endif
-    endfor
-    if l:did_run != 1
-        call cargo#run(a:args)
-        return
-    endif
-endfunction
-
-" vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/cargo/quickfix.vim

@@ -1,30 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-function! cargo#quickfix#CmdPre() abort
-    if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
-        " Preserve the current directory, and 'lcd' to the nearest Cargo file.
-        let b:rust_compiler_cargo_qf_has_lcd = haslocaldir()
-        let b:rust_compiler_cargo_qf_prev_cd = getcwd()
-        let b:rust_compiler_cargo_qf_prev_cd_saved = 1
-        let l:nearest = fnamemodify(cargo#nearestRootCargo(0), ':h')
-        execute 'lchdir! '.l:nearest
-    else
-        let b:rust_compiler_cargo_qf_prev_cd_saved = 0
-    endif
-endfunction
-
-function! cargo#quickfix#CmdPost() abort
-    if exists("b:rust_compiler_cargo_qf_prev_cd_saved") && b:rust_compiler_cargo_qf_prev_cd_saved
-        " Restore the current directory.
-        if b:rust_compiler_cargo_qf_has_lcd
-            execute 'lchdir! '.b:rust_compiler_cargo_qf_prev_cd
-        else
-            execute 'chdir! '.b:rust_compiler_cargo_qf_prev_cd
-        endif
-        let b:rust_compiler_cargo_qf_prev_cd_saved = 0
-    endif
-endfunction
-
-" vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/clojurecomplete.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
-
+  
 " Vim completion script
 " Language:     Clojure
 " Maintainer:   Sung Pae <self@sungpae.com>

autoload/coffee.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
-
+  
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
 " URL:         http://github.com/kchmck/vim-coffee-script

autoload/crystal_lang.vim

@@ -1,23 +1,13 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-
+  
 let s:save_cpo = &cpo
 set cpo&vim
 
-let s:V = vital#crystal#new()
+let s:V = vital#of('crystal')
 let s:P = s:V.import('Process')
+let s:J = s:V.import('Web.JSON')
 let s:C = s:V.import('ColorEcho')
 
-if exists('*json_decode')
-    function! s:decode_json(text) abort
-        return json_decode(a:text)
-    endfunction
-else
-    let s:J = s:V.import('Web.JSON')
-    function! s:decode_json(text) abort
-        return s:J.decode(a:text)
-    endfunction
-endif
-
 function! s:echo_error(msg, ...) abort
     echohl ErrorMsg
     if a:0 == 0
@@ -35,59 +25,28 @@ function! s:run_cmd(cmd) abort
     return s:P.system(a:cmd)
 endfunction
 
-function! s:find_root_by(search_dir, d) abort
-    let found_dir = finddir(a:search_dir, a:d . ';')
-    if found_dir ==# ''
+function! s:find_root_by_spec(d) abort
+    let dir = finddir('spec', a:d . ';')
+    if dir ==# ''
         return ''
     endif
 
-    " Note: ':h:h' for {root}/{search_dir}/ -> {root}/{search_dir} -> {root}
-    return fnamemodify(found_dir, ':p:h:h')
-endfunction
-
-" Search the root directory containing a 'spec/' and a 'src/' directories.
-"
-" Searching for the 'spec/' directory is not enough: for example the crystal
-" compiler has a 'cr_sources/src/spec/' directory that would otherwise give the root
-" directory as 'cr_source/src/' instead of 'cr_sources/'.
-function! s:find_root_by_spec_and_src(d) abort
-    " Search for 'spec/'
-    let root = s:find_root_by('spec', a:d)
-    " Check that 'src/' is also there
-    if root !=# '' && isdirectory(root . '/src')
-        return root
-    endif
-
-    " Search for 'src/'
-    let root = s:find_root_by('src', a:d)
-    " Check that 'spec/' is also there
-    if root !=# '' && isdirectory(root . '/spec')
-        return root
-    endif
-
-    " Cannot find a directory containing both 'src/' and 'spec/'
-    return ''
+    " Note: ':h:h' for {root}/spec/ -> {root}/spec -> {root}
+    return fnamemodify(dir, ':p:h:h')
 endfunction
 
 function! crystal_lang#entrypoint_for(file_path) abort
     let parent_dir = fnamemodify(a:file_path, ':p:h')
-    let root_dir = s:find_root_by_spec_and_src(parent_dir)
+    let root_dir = s:find_root_by_spec(parent_dir)
     if root_dir ==# ''
-        " No spec directory found. No need to make temporary file
+        " No spec diretory found. No need to make temporary file
         return a:file_path
     endif
 
-    let required_spec_path = get(b:, 'crystal_required_spec_path', get(g:, 'crystal_required_spec_path', ''))
-    if required_spec_path !=# ''
-      let require_spec_str = './' . required_spec_path
-    else
-      let require_spec_str = './spec/**'
-    endif
-
     let temp_name = root_dir . '/__vim-crystal-temporary-entrypoint-' . fnamemodify(a:file_path, ':t')
     let contents = [
                 \   'require "spec"',
-                \   'require "' . require_spec_str . '"',
+                \   'require "./spec/**"',
                 \   printf('require "./%s"', fnamemodify(a:file_path, ':p')[strlen(root_dir)+1 : ])
                 \ ]
 
@@ -143,7 +102,7 @@ function! crystal_lang#jump_to_definition(file, pos) abort
         return s:echo_error(cmd_result.output)
     endif
 
-    let impl = s:decode_json(cmd_result.output)
+    let impl = s:J.decode(cmd_result.output)
     if impl.status !=# 'ok'
         return s:echo_error(impl.message)
     endif
@@ -190,6 +149,7 @@ endfunction
 
 function! crystal_lang#complete(findstart, base) abort
     if a:findstart
+        echom 'find start'
         return s:find_completion_start()
     endif
 
@@ -198,7 +158,7 @@ function! crystal_lang#complete(findstart, base) abort
         return
     endif
 
-    let contexts = s:decode_json(cmd_result.output)
+    let contexts = s:J.decode(cmd_result.output)
     if contexts.status !=# 'ok'
         return
     endif
@@ -261,7 +221,7 @@ endfunction
 
 function! crystal_lang#run_all_spec(...) abort
     let path = a:0 == 0 ? expand('%:p:h') : a:1
-    let root_path = s:find_root_by_spec_and_src(path)
+    let root_path = s:find_root_by_spec(path)
     if root_path ==# ''
         return s:echo_error("'spec' directory is not found")
     endif
@@ -279,9 +239,9 @@ function! crystal_lang#run_current_spec(...) abort
     let source_dir = fnamemodify(path, ':h')
 
     " /foo/bar
-    let root_dir = s:find_root_by_spec_and_src(source_dir)
+    let root_dir = s:find_root_by_spec(source_dir)
     if root_dir ==# ''
-        return s:echo_error("Root directory with 'src/' and 'spec/' not found")
+        return s:echo_error("'spec' directory is not found")
     endif
 
     " src
@@ -311,38 +271,59 @@ function! crystal_lang#format_string(code, ...) abort
     return output
 endfunction
 
-" crystal_lang#format(option_str [, on_save])
-function! crystal_lang#format(option_str, ...) abort
+function! s:get_saved_states() abort
+    let result = {}
+    let fname = bufname('%')
+    let current_winnr = winnr()
+    for i in range(1, winnr('$'))
+        let bufnr = winbufnr(i)
+        if bufnr == -1
+            continue
+        endif
+        if bufname(bufnr) ==# fname
+            execute i 'wincmd w'
+            let result[i] = {
+                \     'pos': getpos('.'),
+                \     'screen': winsaveview()
+                \ }
+        endif
+    endfor
+    execute current_winnr 'wincmd w'
+    return result
+endfunction
+
+function! crystal_lang#format(option_str) abort
     if !executable(g:crystal_compiler_command)
         " Finish command silently
         return
     endif
 
-    let on_save = a:0 > 0 ? a:1 : 0
+    let formatted = crystal_lang#format_string(join(getline(1, '$'), "\n"), a:option_str)
+    let formatted = substitute(formatted, '\n$', '', '')
 
-    let before = join(getline(1, '$'), "\n")
-    let formatted = crystal_lang#format_string(before, a:option_str)
-    if !on_save
-        let after = substitute(formatted, '\n$', '', '')
-        if before ==# after
-            return
-        endif
-    endif
+    let sel_save = &l:selection
+    let ve_save = &virtualedit
+    let &l:selection = 'inclusive'
+    let &virtualedit = ''
+    let [save_g_reg, save_g_regtype] = [getreg('g'), getregtype('g')]
+    let windows_save = s:get_saved_states()
 
-    let view_save = winsaveview()
-    let pos_save = getpos('.')
-    let lines = split(formatted, '\n')
-    silent! undojoin
-    if line('$') > len(lines)
-        execute len(lines) . ',$delete' '_'
-    endif
-    call setline(1, lines)
-    call winrestview(view_save)
-    call setpos('.', pos_save)
-endfunction
-
-function! crystal_lang#expand(file, pos, ...) abort
-    return crystal_lang#tool('expand', a:file, a:pos, get(a:, 1, ''))
+    try
+        call setreg('g', formatted, 'v')
+        silent normal! ggvG$"gp
+    finally
+        call setreg('g', save_g_reg, save_g_regtype)
+        let &l:selection = sel_save
+        let &virtualedit = ve_save
+        let winnr = winnr()
+        for winnr in keys(windows_save)
+            let w = windows_save[winnr]
+            execute winnr 'wincmd w'
+            call setpos('.', w.pos)
+            call winrestview(w.screen)
+        endfor
+        execute winnr 'wincmd w'
+    endtry
 endfunction
 
 let &cpo = s:save_cpo

autoload/dart.vim

@@ -1,5 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
-
+  
 
 function! s:error(text) abort
   echohl Error
@@ -7,177 +7,64 @@ function! s:error(text) abort
   echohl None
 endfunction
 
-function! s:cexpr(errorformat, lines, reason) abort
-  call setqflist([], ' ', {
-      \ 'lines': a:lines,
-      \ 'efm': a:errorformat,
-      \ 'context': {'reason': a:reason},
-      \})
-  copen
-endfunction
-
-" If the quickfix list has a context matching [reason], clear and close it.
-function! s:clearQfList(reason) abort
-  let context = get(getqflist({'context': 1}), 'context', {})
-  if type(context) == v:t_dict &&
-      \ has_key(context, 'reason') &&
-      \ context.reason == a:reason
-    call setqflist([], 'r')
-    cclose
-  endif
+function! s:cexpr(errorformat, joined_lines) abort
+  let temp_errorfomat = &errorformat
+  try
+    let &errorformat = a:errorformat
+    cexpr a:joined_lines
+    copen
+  finally
+    let &errorformat = temp_errorfomat
+  endtry
 endfunction
 
 function! dart#fmt(q_args) abort
-  let cmd = s:FindDartFmt()
-  if type(cmd) != type('') | return | endif
-  let buffer_content = getline(1, '$')
-  let args = '--stdin-name '.expand('%').' '.a:q_args
-  let lines = systemlist(printf('%s %s', cmd, args), join(buffer_content, "\n"))
-  " TODO(https://github.com/dart-lang/sdk/issues/38507) - Remove once the
-  " tool no longer emits this line on SDK upgrades.
-  if lines[-1] ==# 'Isolate creation failed'
-    let lines = lines[:-2]
-  endif
-  if buffer_content == lines
-    call s:clearQfList('dartfmt')
-    return
-  endif
-  if 0 == v:shell_error
-    let win_view = winsaveview()
-    silent keepjumps call setline(1, lines)
-    if line('$') > len(lines)
-      silent keepjumps execute string(len(lines)+1).',$ delete'
+  if executable('dartfmt')
+    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
+    else
+      call s:error(printf('cannot read a file: "%s"', path))
     endif
-    call winrestview(win_view)
-    call s:clearQfList('dartfmt')
   else
-    let errors = lines[2:]
-    let error_format = '%Aline %l\, column %c of %f: %m,%C%.%#'
-    call s:cexpr(error_format, errors, 'dartfmt')
+    call s:error('cannot execute binary file: dartfmt')
   endif
 endfunction
 
-function! s:FindDartFmt() abort
-  if executable('dartfmt') | return 'dartfmt' | endif
-  if executable('flutter')
-    let l:flutter_cmd = resolve(exepath('flutter'))
-    let l:bin = fnamemodify(l:flutter_cmd, ':h')
-    let l:dartfmt = l:bin.'/cache/dart-sdk/bin/dartfmt'
-    if executable(l:dartfmt) | return l:dartfmt | endif
-  endif
-  call s:error('Cannot find a `dartfmt` command')
-endfunction
-
 function! dart#analyzer(q_args) abort
-  call s:error('DartAnalyzer support has been removed. '.
-      \'If this broke your workflow please comment on '.
-      \'https://github.com/dart-lang/dart-vim-plugin/issues/89')
+  if executable('dartanalyzer')
+    let path = expand('%:p:gs:\:/:')
+    if filereadable(path)
+      let joined_lines = system(printf('dartanalyzer %s %s', a:q_args, shellescape(path)))
+      call s:cexpr('%m (%f\, line %l\, col %c)', joined_lines)
+    else
+      call s:error(printf('cannot read a file: "%s"', path))
+    endif
+  else
+    call s:error('cannot execute binary file: dartanalyzer')
+  endif
 endfunction
 
 function! dart#tojs(q_args) abort
-  call s:error('Dart2JS support has been removed. '.
-      \'If this broke your workflow please comment on '.
-      \'https://github.com/dart-lang/dart-vim-plugin/issues/89')
-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
+  if executable('dart2js')
+    let path = expand('%:p:gs:\:/:')
+    if filereadable(path)
+      let joined_lines = system(printf('dart2js %s %s', a:q_args, shellescape(path)))
+      call s:cexpr('%m (%f\, line %l\, col %c)', joined_lines)
     else
-      let lib_dir = resolve(dot_packages_dir.'/'.lib_dir)
+      call s:error(printf('cannot read a file: "%s"', path))
     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
-
-" Toggle whether dartfmt is run on save or not.
-function! dart#ToggleFormatOnSave() abort
-  if get(g:, "dart_format_on_save", 0)
-    let g:dart_format_on_save = 0
-    return
-  endif
-  let g:dart_format_on_save = 1
-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
+  else
+    call s:error('cannot execute binary file: dartanalyzer')
   endif
 endfunction
 
+
 endif

autoload/db/adapter/ecto.vim

@@ -1,24 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
-
-let s:path = expand('<sfile>:h')
-let s:cmd = join(['mix', 'run', '--no-start', '--no-compile', shellescape(s:path.'/get_repos.exs')])
-
-function! s:repo_list() abort
-    return map(systemlist(s:cmd), 'split(v:val)')
-endfunction
-
-function! db#adapter#ecto#canonicalize(url) abort
-    for l:item in s:repo_list()
-        let l:name = get(l:item, 0)
-        let l:url = get(l:item, 1)
-        if !empty(l:name) && 'ecto:'.l:name ==# a:url
-            return l:url
-        endif
-    endfor
-endfunction
-
-function! db#adapter#ecto#complete_opaque(url) abort
-    return map(s:repo_list(), 'v:val[0]')
-endfunction
-
-endif

autoload/elixir/indent.vim

@@ -1,365 +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 [_, curs_lnum, curs_col, _] = getpos('.')
-  call cursor(lnum, 0)
-
-  let handlers = [
-        \'top_of_file',
-        \'starts_with_string_continuation',
-        \'following_trailing_binary_operator',
-        \'starts_with_pipe',
-        \'starts_with_binary_operator',
-        \'inside_block',
-        \'starts_with_end',
-        \'inside_generic_block',
-        \'follow_prev_nb'
-        \]
-  for handler in handlers
-    call s:debug('testing handler elixir#indent#handle_'.handler)
-    let context = {'lnum': lnum, 'text': text, 'first_nb_char_idx': match(text, '\w'), 'prev_nb_lnum': prev_nb_lnum, 'prev_nb_text': prev_nb_text}
-    let indent = function('elixir#indent#handle_'.handler)(context)
-    if indent == -2
-      " Keep indent the same
-      call s:debug('line '.lnum.': elixir#indent#handle_'.handler.' returned -2; returning indent of -1')
-      call cursor(curs_lnum, curs_col)
-      return -1
-    elseif indent != -1
-      call s:debug('line '.lnum.': elixir#indent#handle_'.handler.' returned '.indent)
-      call cursor(curs_lnum, curs_col)
-      return indent
-    endif
-  endfor
-
-  call s:debug("defaulting")
-  call cursor(curs_lnum, curs_col)
-  return 0
-endfunction
-
-function! s:debug(str)
-  if exists("g:elixir_indent_debug") && g:elixir_indent_debug
-    echom a:str
-  endif
-endfunction
-
-function! s:starts_with(context, expr)
-  return s:_starts_with(a:context.text, a:expr, a:context.lnum)
-endfunction
-
-function! s:prev_starts_with(context, expr)
-  return s:_starts_with(a:context.prev_nb_text, a:expr, a:context.prev_nb_lnum)
-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
-
-function! s:prev_ends_with(context, expr)
-  return s:_ends_with(a:context.prev_nb_text, a:expr, a:context.prev_nb_lnum)
-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 s:syntax_name(a:line, a:col) =~ '\%(String\|Comment\)'
-endfunction
-
-function! s:syntax_name(line, col)
-  return synIDattr(synID(a:line, a:col, 1), "name")
-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(context)
-  if a:context.prev_nb_lnum == 0
-    return 0
-  else
-    return -1
-  end
-endfunction
-
-function! elixir#indent#handle_starts_with_string_continuation(context)
-  if s:syntax_name(a:context.lnum, a:context.first_nb_char_idx) =~ '\(String\|Comment\)$'
-    return -2
-  else
-    return -1
-  end
-endfunction
-
-function! elixir#indent#handle_follow_prev_nb(context)
-  return s:get_base_indent(a:context.prev_nb_lnum, a:context.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*$')
-    call 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
-
-function! elixir#indent#handle_following_trailing_binary_operator(context)
-  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
-
-  if s:prev_ends_with(a:context, binary_operator)
-    return indent(a:context.prev_nb_lnum) + s:sw()
-  else
-    return -1
-  endif
-endfunction
-
-function! elixir#indent#handle_starts_with_pipe(context)
-  if s:starts_with(a:context, '|>')
-    let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'
-    let pos = s:find_last_pos(a:context.prev_nb_lnum, a:context.prev_nb_text, match_operator)
-    if pos == -1
-      return indent(a:context.prev_nb_lnum)
-    else
-      let next_word_pos = match(strpart(a:context.prev_nb_text, pos+1, len(a:context.prev_nb_text)-1), '\S')
-      if next_word_pos == -1
-        return indent(a:context.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_end(context)
-  if s:starts_with(a:context, s:keyword('end'))
-    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_binary_operator(context)
-  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
-
-  if s:starts_with(a:context, binary_operator)
-    let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'
-    let pos = s:find_last_pos(a:context.prev_nb_lnum, a:context.prev_nb_text, match_operator)
-    if pos == -1
-      return indent(a:context.prev_nb_lnum)
-    else
-      let next_word_pos = match(strpart(a:context.prev_nb_text, pos+1, len(a:context.prev_nb_text)-1), '\S')
-      if next_word_pos == -1
-        return indent(a:context.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_block(context)
-  let start_pattern = '\C\%(\<with\>\|\<if\>\|\<case\>\|\<cond\>\|\<try\>\|\<receive\>\|\<fn\>\|{\|\[\|(\)'
-  let end_pattern = '\C\%(\<end\>\|\]\|}\|)\)'
-  " hack - handle do: better
-  let block_info = searchpairpos(start_pattern, '', end_pattern, 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip() || getline(line('.')) =~ 'do:'", max([0, a:context.lnum - g:elixir_indent_max_lookbehind]))
-  let block_start_lnum = block_info[0]
-  let block_start_col = block_info[1]
-  if block_start_lnum != 0 || block_start_col != 0
-    let block_text = getline(block_start_lnum)
-    let block_start_char = block_text[block_start_col - 1]
-
-    let never_match = '\(a\)\@=b'
-    let config = {
-          \'f': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
-          \'c': {'aligned_clauses': s:keyword('end'), 'pattern_match_clauses': never_match},
-          \'t': {'aligned_clauses': s:keyword('end\|catch\|rescue\|after\|else'), 'pattern_match_clauses': s:keyword('catch\|rescue\|else')},
-          \'r': {'aligned_clauses': s:keyword('end\|after'), 'pattern_match_clauses': s:keyword('after')},
-          \'i': {'aligned_clauses': s:keyword('end\|else'), 'pattern_match_clauses': never_match},
-          \'[': {'aligned_clauses': ']', 'pattern_match_clauses': never_match},
-          \'{': {'aligned_clauses': '}', 'pattern_match_clauses': never_match},
-          \'(': {'aligned_clauses': ')', 'pattern_match_clauses': never_match}
-          \}
-
-    if block_start_char == 'w'
-      call s:debug("testing s:handle_with")
-      return s:handle_with(block_start_lnum, block_start_col, a:context)
-    else
-      let block_config = config[block_start_char]
-      if s:starts_with(a:context, block_config.aligned_clauses)
-        call s:debug("clause")
-        return indent(block_start_lnum)
-      else
-        let clause_lnum = searchpair(block_config.pattern_match_clauses, '', '*', 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()", block_start_lnum)
-        let relative_lnum = max([clause_lnum, block_start_lnum])
-        call s:debug("pattern matching relative to lnum " . relative_lnum)
-        return s:do_handle_pattern_match_block(relative_lnum, a:context)
-      endif
-    end
-  else
-    return -1
-  end
-endfunction
-
-function! s:handle_with(start_lnum, start_col, context)
-  let block_info = searchpairpos('\C\%(\<with\>\|\<do\>\|\<else\>\)', '', s:keyword('end'), 'bnW', "line('.') == " . line('.') . " || elixir#indent#searchpair_back_skip()")
-  let block_start_lnum = block_info[0]
-  let block_start_col = block_info[1]
-
-  let block_start_text = getline(block_start_lnum)
-  let block_start_char = block_start_text[block_start_col - 1]
-
-  if s:starts_with(a:context, s:keyword('do\|else\|end'))
-    return indent(a:start_lnum)
-  elseif block_start_char == 'w' || s:starts_with(a:context, '\C\(do\|else\):')
-    return indent(a:start_lnum) + 5
-  elseif s:_starts_with(block_start_text, '\C\(do\|else\):', a:start_lnum)
-    return indent(block_start_lnum) + s:sw()
-  else
-    return s:do_handle_pattern_match_block(a:start_lnum, a:context)
-  end
-endfunction
-
-function! s:do_handle_pattern_match_block(relative_line, context)
-  let relative_indent = indent(a:relative_line)
-  " hack!
-  if a:context.text =~ '\(fn.*\)\@<!->'
-    call s:debug("current line contains ->; assuming match definition")
-    return relative_indent + s:sw()
-  elseif search('\(fn.*\)\@<!->', 'bnW', a:relative_line) != 0
-    call s:debug("a previous line contains ->; assuming match handler")
-    return relative_indent + 2 * s:sw()
-  else
-    call s:debug("couldn't find any previous ->; assuming body text")
-    return relative_indent + s:sw()
-  end
-endfunction
-
-function! elixir#indent#handle_inside_generic_block(context)
-  let pair_lnum = searchpair(s:keyword('do\|fn'), '', s:keyword('end'), 'bW', "line('.') == ".a:context.lnum." || s:is_string_or_comment(line('.'), col('.'))", max([0, a:context.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:prev_ends_with(a:context, ',')
-      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,385 +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:old_match = findfile('elm-package.json', l:dir_current_file . ';')
-		let l:new_match = findfile('elm.json', l:dir_current_file . ';')
-		if !empty(l:new_match)
-			let l:elm_root = fnamemodify(l:new_match, ':p:h')
-		elseif !empty(l:old_match)
-			let l:elm_root = fnamemodify(l:old_match, ':p:h')
-		else
-			let l:elm_root = ''
-		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,184 +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:old_match = findfile('elm-package.json', a:root . ';')
-  let l:new_match = findfile('elm.json', a:root . ';')
-  if !empty(l:new_match)
-    let l:package_json = l:new_match
-  elseif !empty(l:old_match)
-    let l:package_json = l:old_match
-  endif
-  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>'
-        return indent(l:prevlnum) + l:shiftwidth
+        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(l:prevlnum) - (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(l:prevlnum) - l:shiftwidth
+        return indent(v:lnum) - &shiftwidth
     endif
     return indent(l:prevlnum) + l:indent
 endfunction

autoload/go/config.vim

@@ -1,539 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
-
-" don't spam the user when Vim is started in Vi compatibility mode
-let s:cpo_save = &cpo
-set cpo&vim
-
-function! go#config#AutodetectGopath() abort
-	return get(g:, 'go_autodetect_gopath', 0)
-endfunction
-
-function! go#config#ListTypeCommands() abort
-  return get(g:, 'go_list_type_commands', {})
-endfunction
-
-function! go#config#VersionWarning() abort
-  return get(g:, 'go_version_warning', 1)
-endfunction
-
-function! go#config#BuildTags() abort
-  return get(g:, 'go_build_tags', '')
-endfunction
-
-function! go#config#SetBuildTags(value) abort
-  if a:value is ''
-    silent! unlet g:go_build_tags
-    call go#lsp#ResetWorkspaceDirectories()
-    return
-  endif
-
-  let g:go_build_tags = a:value
-  call go#lsp#ResetWorkspaceDirectories()
-endfunction
-
-function! go#config#TestTimeout() abort
- return get(g:, 'go_test_timeout', '10s')
-endfunction
-
-function! go#config#TestShowName() abort
-  return get(g:, 'go_test_show_name', 0)
-endfunction
-
-function! go#config#TermHeight() abort
-  return get(g:, 'go_term_height', winheight(0))
-endfunction
-
-function! go#config#TermWidth() abort
-  return get(g:, 'go_term_width', winwidth(0))
-endfunction
-
-function! go#config#TermMode() abort
-  return get(g:, 'go_term_mode', 'vsplit')
-endfunction
-
-function! go#config#TermCloseOnExit() abort
-  return get(g:, 'go_term_close_on_exit', 1)
-endfunction
-
-function! go#config#SetTermCloseOnExit(value) abort
-  let g:go_term_close_on_exit = a:value
-endfunction
-
-function! go#config#TermEnabled() abort
-  return has('nvim') && get(g:, 'go_term_enabled', 0)
-endfunction
-
-function! go#config#SetTermEnabled(value) abort
-  let g:go_term_enabled = a:value
-endfunction
-
-function! go#config#TemplateUsePkg() abort
-  return get(g:, 'go_template_use_pkg', 0)
-endfunction
-
-function! go#config#TemplateTestFile() abort
-  return get(g:, 'go_template_test_file', "hello_world_test.go")
-endfunction
-
-function! go#config#TemplateFile() abort
-  return get(g:, 'go_template_file', "hello_world.go")
-endfunction
-
-function! go#config#StatuslineDuration() abort
-  return get(g:, 'go_statusline_duration', 60000)
-endfunction
-
-function! go#config#SnippetEngine() abort
-  return get(g:, 'go_snippet_engine', 'automatic')
-endfunction
-
-function! go#config#PlayBrowserCommand() abort
-    if go#util#IsWin()
-        let go_play_browser_command = '!start rundll32 url.dll,FileProtocolHandler %URL%'
-    elseif go#util#IsMac()
-        let go_play_browser_command = 'open %URL%'
-    elseif executable('xdg-open')
-        let go_play_browser_command = 'xdg-open %URL%'
-    elseif executable('firefox')
-        let go_play_browser_command = 'firefox %URL% &'
-    elseif executable('chromium')
-        let go_play_browser_command = 'chromium %URL% &'
-    else
-        let go_play_browser_command = ''
-    endif
-
-    return get(g:, 'go_play_browser_command', go_play_browser_command)
-endfunction
-
-function! go#config#MetalinterDeadline() abort
-  " gometalinter has a default deadline of 5 seconds only when asynchronous
-  " jobs are not supported.
-
-  let deadline = '5s'
-  if go#util#has_job() && has('lambda')
-    let deadline = ''
-  endif
-
-  return get(g:, 'go_metalinter_deadline', deadline)
-endfunction
-
-function! go#config#ListType() abort
-  return get(g:, 'go_list_type', '')
-endfunction
-
-function! go#config#ListAutoclose() abort
-  return get(g:, 'go_list_autoclose', 1)
-endfunction
-
-function! go#config#InfoMode() abort
-  return get(g:, 'go_info_mode', 'gopls')
-endfunction
-
-function! go#config#GuruScope() abort
-  let scope = get(g:, 'go_guru_scope', [])
-
-  if !empty(scope)
-    " strip trailing slashes for each path in scope. bug:
-    " https://github.com/golang/go/issues/14584
-    let scopes = go#util#StripTrailingSlash(scope)
-  endif
-
-  return scope
-endfunction
-
-function! go#config#SetGuruScope(scope) abort
-  if empty(a:scope)
-    if exists('g:go_guru_scope')
-      unlet g:go_guru_scope
-    endif
-  else
-    let g:go_guru_scope = a:scope
-  endif
-endfunction
-
-function! go#config#GocodeUnimportedPackages() abort
-  return get(g:, 'go_gocode_unimported_packages', 0)
-endfunction
-
-let s:sock_type = (has('win32') || has('win64')) ? 'tcp' : 'unix'
-function! go#config#GocodeSocketType() abort
-  return get(g:, 'go_gocode_socket_type', s:sock_type)
-endfunction
-
-function! go#config#GocodeProposeBuiltins() abort
-  return get(g:, 'go_gocode_propose_builtins', 1)
-endfunction
-
-function! go#config#GocodeProposeSource() abort
-  return get(g:, 'go_gocode_propose_source', 0)
-endfunction
-
-function! go#config#EchoCommandInfo() abort
-  return get(g:, 'go_echo_command_info', 1)
-endfunction
-
-function! go#config#DocUrl() abort
-  let godoc_url = get(g:, 'go_doc_url', 'https://godoc.org')
-  if godoc_url isnot 'https://godoc.org'
-    " strip last '/' character if available
-    let last_char = strlen(godoc_url) - 1
-    if godoc_url[last_char] == '/'
-      let godoc_url = strpart(godoc_url, 0, last_char)
-    endif
-    " custom godoc installations expect /pkg before package names
-    let godoc_url .= "/pkg"
-  endif
-  return godoc_url
-endfunction
-
-function! go#config#DocPopupWindow() abort
-  return get(g:, 'go_doc_popup_window', 0)
-endfunction
-function! go#config#DefReuseBuffer() abort
-  return get(g:, 'go_def_reuse_buffer', 0)
-endfunction
-
-function! go#config#DefMode() abort
-  return get(g:, 'go_def_mode', 'gopls')
-endfunction
-
-function! go#config#DeclsIncludes() abort
-  return get(g:, 'go_decls_includes', 'func,type')
-endfunction
-
-function! go#config#Debug() abort
-  return get(g:, 'go_debug', [])
-endfunction
-
-function! go#config#DebugWindows() abort
-  return get(g:, 'go_debug_windows', {
-            \ 'vars':  'leftabove 30vnew',
-            \ 'stack': 'leftabove 20new',
-            \ 'goroutines': 'botright 10new',
-            \ 'out':        'botright 5new',
-            \ }
-         \ )
-
-endfunction
-
-function! go#config#DebugAddress() abort
-  return get(g:, 'go_debug_address', '127.0.0.1:8181')
-endfunction
-
-function! go#config#DebugCommands() abort
-  " make sure g:go_debug_commands is set so that it can be added to easily.
-  let g:go_debug_commands = get(g:, 'go_debug_commands', [])
-  return g:go_debug_commands
-endfunction
-
-function! go#config#DebugLogOutput() abort
-  return get(g:, 'go_debug_log_output', 'debugger,rpc')
-endfunction
-
-function! go#config#LspLog() abort
-  " make sure g:go_lsp_log is set so that it can be added to easily.
-  let g:go_lsp_log = get(g:, 'go_lsp_log', [])
-  return g:go_lsp_log
-endfunction
-
-function! go#config#SetDebugDiag(value) abort
-  let g:go_debug_diag = a:value
-endfunction
-
-function! go#config#AutoSameids() abort
-    return get(g:, 'go_auto_sameids', 0)
-endfunction
-
-function! go#config#SetAutoSameids(value) abort
-  let g:go_auto_sameids = a:value
-endfunction
-
-function! go#config#AddtagsTransform() abort
-  return get(g:, 'go_addtags_transform', "snakecase")
-endfunction
-
-function! go#config#TemplateAutocreate() abort
-  return get(g:, "go_template_autocreate", 1)
-endfunction
-
-function! go#config#SetTemplateAutocreate(value) abort
-  let g:go_template_autocreate = a:value
-endfunction
-
-function! go#config#MetalinterCommand() abort
-  return get(g:, "go_metalinter_command", "golangci-lint")
-endfunction
-
-function! go#config#MetalinterAutosaveEnabled() abort
-  let l:default_enabled = ["vet", "golint"]
-
-  if go#config#MetalinterCommand() == "golangci-lint"
-    let l:default_enabled = ["govet", "golint"]
-  endif
-
-  return get(g:, "go_metalinter_autosave_enabled", default_enabled)
-endfunction
-
-function! go#config#MetalinterEnabled() abort
-  let l:default_enabled = ["vet", "golint", "errcheck"]
-
-  if go#config#MetalinterCommand() == "golangci-lint"
-    let l:default_enabled = ["govet", "golint"]
-  endif
-
-  return get(g:, "go_metalinter_enabled", default_enabled)
-endfunction
-
-function! go#config#GolintBin() abort
-  return get(g:, "go_golint_bin", "golint")
-endfunction
-
-function! go#config#ErrcheckBin() abort
-  return get(g:, "go_errcheck_bin", "errcheck")
-endfunction
-
-function! go#config#MetalinterAutosave() abort
-  return get(g:, "go_metalinter_autosave", 0)
-endfunction
-
-function! go#config#SetMetalinterAutosave(value) abort
-  let g:go_metalinter_autosave = a:value
-endfunction
-
-function! go#config#ListHeight() abort
-  return get(g:, "go_list_height", 0)
-endfunction
-
-function! go#config#FmtAutosave() abort
-	return get(g:, "go_fmt_autosave", 1)
-endfunction
-
-function! go#config#SetFmtAutosave(value) abort
-  let g:go_fmt_autosave = a:value
-endfunction
-
-function! go#config#AsmfmtAutosave() abort
-  return get(g:, "go_asmfmt_autosave", 0)
-endfunction
-
-function! go#config#SetAsmfmtAutosave(value) abort
-  let g:go_asmfmt_autosave = a:value
-endfunction
-
-function! go#config#ModFmtAutosave() abort
-	return get(g:, "go_mod_fmt_autosave", 1)
-endfunction
-
-function! go#config#SetModFmtAutosave(value) abort
-  let g:go_mod_fmt_autosave = a:value
-endfunction
-
-function! go#config#DocMaxHeight() abort
-  return get(g:, "go_doc_max_height", 20)
-endfunction
-
-function! go#config#AutoTypeInfo() abort
-  return get(g:, "go_auto_type_info", 0)
-endfunction
-
-function! go#config#SetAutoTypeInfo(value) abort
-  let g:go_auto_type_info = a:value
-endfunction
-
-function! go#config#AlternateMode() abort
-  return get(g:, "go_alternate_mode", "edit")
-endfunction
-
-function! go#config#DeclsMode() abort
-  return get(g:, "go_decls_mode", "")
-endfunction
-
-function! go#config#FmtCommand() abort
-  return get(g:, "go_fmt_command", "gofmt")
-endfunction
-
-function! go#config#FmtOptions() abort
-  return get(b:, "go_fmt_options", get(g:, "go_fmt_options", {}))
-endfunction
-
-function! go#config#FmtFailSilently() abort
-  return get(g:, "go_fmt_fail_silently", 0)
-endfunction
-
-function! go#config#FmtExperimental() abort
-  return get(g:, "go_fmt_experimental", 0 )
-endfunction
-
-function! go#config#PlayOpenBrowser() abort
-  return get(g:, "go_play_open_browser", 1)
-endfunction
-
-function! go#config#RenameCommand() abort
-  " delegate to go#config#GorenameBin for backwards compatability.
-  return get(g:, "go_rename_command", go#config#GorenameBin())
-endfunction
-
-function! go#config#GorenameBin() abort
-  return get(g:, "go_gorename_bin", "gorename")
-endfunction
-
-function! go#config#GorenamePrefill() abort
-  return get(g:, "go_gorename_prefill", 'expand("<cword>") =~# "^[A-Z]"' .
-          \ '? go#util#pascalcase(expand("<cword>"))' .
-          \ ': go#util#camelcase(expand("<cword>"))')
-endfunction
-
-function! go#config#TextobjIncludeFunctionDoc() abort
-  return get(g:, "go_textobj_include_function_doc", 1)
-endfunction
-
-function! go#config#TextobjIncludeVariable() abort
-  return get(g:, "go_textobj_include_variable", 1)
-endfunction
-
-function! go#config#BinPath() abort
-  return get(g:, "go_bin_path", "")
-endfunction
-
-function! go#config#SearchBinPathFirst() abort
-  return get(g:, 'go_search_bin_path_first', 1)
-endfunction
-
-function! go#config#HighlightArrayWhitespaceError() abort
-  return get(g:, 'go_highlight_array_whitespace_error', 0)
-endfunction
-
-function! go#config#HighlightChanWhitespaceError() abort
-  return get(g:, 'go_highlight_chan_whitespace_error', 0)
-endfunction
-
-function! go#config#HighlightExtraTypes() abort
-  return get(g:, 'go_highlight_extra_types', 0)
-endfunction
-
-function! go#config#HighlightSpaceTabError() abort
-  return get(g:, 'go_highlight_space_tab_error', 0)
-endfunction
-
-function! go#config#HighlightTrailingWhitespaceError() abort
-  return get(g:, 'go_highlight_trailing_whitespace_error', 0)
-endfunction
-
-function! go#config#HighlightOperators() abort
-  return get(g:, 'go_highlight_operators', 0)
-endfunction
-
-function! go#config#HighlightFunctions() abort
-  return get(g:, 'go_highlight_functions', 0)
-endfunction
-
-function! go#config#HighlightFunctionParameters() abort
-  " fallback to highlight_function_arguments for backwards compatibility
-  return get(g:, 'go_highlight_function_parameters', get(g:, 'go_highlight_function_arguments', 0))
-endfunction
-
-function! go#config#HighlightFunctionCalls() abort
-  return get(g:, 'go_highlight_function_calls', 0)
-endfunction
-
-function! go#config#HighlightFields() abort
-  return get(g:, 'go_highlight_fields', 0)
-endfunction
-
-function! go#config#HighlightTypes() abort
-  return get(g:, 'go_highlight_types', 0)
-endfunction
-
-function! go#config#HighlightBuildConstraints() abort
-  return get(g:, 'go_highlight_build_constraints', 0)
-endfunction
-
-function! go#config#HighlightStringSpellcheck() abort
-  return get(g:, 'go_highlight_string_spellcheck', 1)
-endfunction
-
-function! go#config#HighlightFormatStrings() abort
-  return get(g:, 'go_highlight_format_strings', 1)
-endfunction
-
-function! go#config#HighlightGenerateTags() abort
-  return get(g:, 'go_highlight_generate_tags', 0)
-endfunction
-
-function! go#config#HighlightVariableAssignments() abort
-  return get(g:, 'go_highlight_variable_assignments', 0)
-endfunction
-
-function! go#config#HighlightVariableDeclarations() abort
-  return get(g:, 'go_highlight_variable_declarations', 0)
-endfunction
-
-function! go#config#HighlightDiagnosticErrors() abort
-  return get(g:, 'go_highlight_diagnostic_errors', 1)
-endfunction
-
-function! go#config#HighlightDiagnosticWarnings() abort
-  return get(g:, 'go_highlight_diagnostic_warnings', 1)
-endfunction
-
-function! go#config#HighlightDebug() abort
-  return get(g:, 'go_highlight_debug', 1)
-endfunction
-
-function! go#config#FoldEnable(...) abort
-  if a:0 > 0
-    return index(go#config#FoldEnable(), a:1) > -1
-  endif
-  return get(g:, 'go_fold_enable', ['block', 'import', 'varconst', 'package_comment'])
-endfunction
-
-function! go#config#EchoGoInfo() abort
-  return get(g:, "go_echo_go_info", 1)
-endfunction
-
-function! go#config#CodeCompletionEnabled() abort
-  return get(g:, "go_code_completion_enabled", 1)
-endfunction
-
-function! go#config#Updatetime() abort
-  let go_updatetime = get(g:, 'go_updatetime', 800)
-  return go_updatetime == 0 ? &updatetime : go_updatetime
-endfunction
-
-function! go#config#ReferrersMode() abort
-  return get(g:, 'go_referrers_mode', 'gopls')
-endfunction
-
-function! go#config#GoplsCompleteUnimported() abort
-  return get(g:, 'go_gopls_complete_unimported', 0)
-endfunction
-
-function! go#config#GoplsDeepCompletion() abort
-  return get(g:, 'go_gopls_deep_completion', 1)
-endfunction
-
-function! go#config#GoplsFuzzyMatching() abort
-  return get(g:, 'go_gopls_fuzzy_matching', 1)
-endfunction
-
-function! go#config#GoplsUsePlaceholders() abort
-  return get(g:, 'go_gopls_use_placeholders', 0)
-endfunction
-
-function! go#config#GoplsEnabled() abort
-  return get(g:, 'go_gopls_enabled', 1)
-endfunction
-
-" Set the default value. A value of "1" is a shortcut for this, for
-" compatibility reasons.
-if exists("g:go_gorename_prefill") && g:go_gorename_prefill == 1
-  unlet g:go_gorename_prefill
-endif
-
-" restore Vi compatibility settings
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim: sw=2 ts=2 et
-
-endif

autoload/graphql.vim

@@ -1,16 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-" Vim plugin
-" Language: GraphQL
-" Maintainer: Jon Parise <jon@indelible.org>
-
-if exists('g:autoloaded_graphql')
-  finish
-endif
-let g:autoloaded_graphql = 1
-
-function! graphql#javascript_tags() abort
-  return get(g:, 'graphql_javascript_tags', ['gql', 'graphql', 'Relay.QL'])
-endfunction
-
-endif

autoload/jsx_pretty/comment.vim

@@ -1,41 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-function! jsx_pretty#comment#update_commentstring(original)
-  let syn_current = s:syn_name(line('.'), col('.'))
-  let syn_start = s:syn_name(line('.'), 1)
-  let save_cursor = getcurpos()
-
-  if syn_start =~? '^jsx'
-    let line = getline(".")
-    let start = len(matchstr(line, '^\s*'))
-    let syn_name = s:syn_name(line('.'), start + 1)
-
-    if line =~ '^\s*//'
-      let &l:commentstring = '// %s'
-    elseif s:syn_contains(line('.'), col('.'), 'jsxTaggedRegion')
-      let &l:commentstring = '<!-- %s -->'
-    elseif syn_name =~? '^jsxAttrib'
-      let &l:commentstring = '// %s'
-    else
-      let &l:commentstring = '{/* %s */}'
-    endif
-  else
-    let &l:commentstring = a:original
-  endif
-
-  " Restore the cursor position
-  call setpos('.', save_cursor)
-endfunction
-
-function! s:syn_name(lnum, cnum)
-  let syn_id = get(synstack(a:lnum, a:cnum), -1)
-  return synIDattr(syn_id, "name")
-endfunction
-
-function! s:syn_contains(lnum, cnum, syn_name)
-  let stack = synstack(a:lnum, a:cnum)
-  let syn_names = map(stack, 'synIDattr(v:val, "name")')
-  return index(syn_names, a:syn_name) >= 0
-endfunction
-
-endif

autoload/jsx_pretty/indent.vim

@@ -1,306 +0,0 @@
-if !exists('g:polyglot_disabled') || !(index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'typescript') != -1 || index(g:polyglot_disabled, 'jsx') != -1)
-
-if exists('*shiftwidth')
-  function! s:sw()
-    return shiftwidth()
-  endfunction
-else
-  function! s:sw()
-    return &sw
-  endfunction
-endif
-
-" Regexp for the start tag
-let s:start_tag = '<\_s*\%(>\|\${\|\%(\<[-:._$A-Za-z0-9]\+\>\)\)'
-" Regexp for the end tag
-let s:end_tag = '\%(<\_s*/\_s*\%(\<[-:._$A-Za-z0-9]\+\>\)\_s*>\|/\_s*>\)'
-
-function s:trim(line)
-  return substitute(a:line, '^\s*\|\s*$', '', 'g')
-endfunction
-
-" Get the syntax stack at the given position
-function s:syntax_stack_at(lnum, col)
-  return map(synstack(a:lnum, a:col), 'synIDattr(v:val, "name")')
-endfunction
-
-" Get the syntax at the given position
-function s:syntax_at(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name')
-endfunction
-
-" Get the start col of the non-space charactor
-function s:start_col(lnum)
-  return len(matchstr(getline(a:lnum), '^\s*')) + 1
-endfunction
-
-" Get the start syntax of a given line number
-function s:start_syntax(lnum)
-  return s:syntax_at(a:lnum, s:start_col(a:lnum))
-endfunction
-
-" The skip function for searchpair
-function s:skip_if_not(current_lnum, ...)
-  " Skip the match in current line
-  if line('.') == a:current_lnum
-    return 1
-  endif
-
-  let syntax = s:syntax_at(line('.'), col('.'))
-  return syntax !~? join(a:000, '\|')
-endfunction
-
-" Whether the specified stytax group is the opening tag
-function s:is_opening_tag(syntax)
-  return a:syntax =~? 'jsxOpenPunct'
-endfunction
-
-" Whether the specified stytax group is the closing tag
-function s:is_closing_tag(syntax)
-  return a:syntax =~? 'jsxClose'
-endfunction
-
-" Whether the specified syntax group is the jsxRegion
-function s:is_jsx_region(syntax)
-  return a:syntax =~? 'jsxRegion'
-endfunction
-
-" Whether the specified syntax group is the jsxElement
-function s:is_jsx_element(syntax)
-  return a:syntax =~? 'jsxElement'
-endfunction
-
-" Whether the specified syntax group is the jsxExpressionBlock
-function s:is_jsx_expression(syntax)
-  return a:syntax =~? 'jsxExpressionBlock'
-endfunction
-
-" Whether the specified syntax group is the jsxBraces
-function s:is_jsx_brace(syntax)
-  return a:syntax =~? 'jsxBraces'
-endfunction
-
-" Whether the specified syntax group is the jsxComment
-function s:is_jsx_comment(syntax)
-  return a:syntax =~? 'jsxComment'
-endfunction
-
-" Whether the specified line is comment related syntax
-function s:is_comment(syntax)
-  return a:syntax =~? 'comment'
-endfunction
-
-" Whether the specified syntax group is the jsxComment
-function s:is_jsx_backticks(syntax)
-  return a:syntax =~? 'jsxBackticks'
-endfunction
-
-" Get the prvious line number
-function s:prev_lnum(lnum)
-  return prevnonblank(a:lnum - 1)
-endfunction
-
-" Whether the given pos is the parent of the given element who has
-" element_count jsxElement syntax
-function s:is_parent_element(pos, element_count)
-  let syntax_stack = s:syntax_stack_at(a:pos[0], a:pos[1])
-  return s:is_opening_tag(syntax_stack[-1]) &&
-        \ count(syntax_stack, 'jsxElement') <= a:element_count
-endfunction
-
-" Compute the indention of the trail punct
-function s:jsx_indent_trail_punct(lnum)
-  let pair_line = searchpair('<', '', '>', 'bW', 's:skip_if_not(a:lnum, "jsxOpenPunct", "jsxClose")')
-  return indent(pair_line)
-endfunction
-
-" Compute the indention of the closing tag
-function s:jsx_indent_closing_tag(lnum)
-  let pair_line = searchpair(s:start_tag, '', s:end_tag, 'bW', 's:skip_if_not(a:lnum, "jsxOpenPunct", "jsxClose")')
-  return pair_line ? indent(pair_line) : indent(a:lnum)
-endfunction
-
-" Compute the indentation of the jsxElement
-function s:jsx_indent_element(lnum)
-  let syntax_stack = s:syntax_stack_at(a:lnum, s:start_col(a:lnum))
-  let syntax_name = syntax_stack[-1]
-  let element_count = count(syntax_stack, 'jsxElement')
-
-  if s:trim(getline(a:lnum)) =~ '^>'
-    return s:jsx_indent_trail_punct(a:lnum)
-  endif
-
-  " If current tag is closing tag
-  if s:is_closing_tag(syntax_name)
-    return s:jsx_indent_closing_tag(a:lnum)
-  endif
-
-  " Normalize the jsxElement count for opening tag
-  if s:is_opening_tag(syntax_name)
-    " <div>
-    "   <div></div> <-- jsxRegion->jsxElement->jsxElement->jsxTag->jsxOpenTag->jsxOpenPunct
-    " </div>
-    if s:is_jsx_element(syntax_stack[-4]) && s:is_jsx_element(syntax_stack[-5])
-      let element_count = element_count - 1
-    endif
-  endif
-
-  let start_time = localtime()
-  let pos = searchpos(s:start_tag, 'bW')
-
-  while !s:is_parent_element(pos, element_count)
-    if localtime() - start_time >= 0.5
-      return -1
-    endif
-    let pos = searchpos(s:start_tag, 'bW')
-  endwhile
-
-  return indent(pos[0]) + s:sw()
-endfunction
-
-" Compute the indentation of the comment
-function s:jsx_indent_comment(lnum)
-  let line = s:trim(getline(a:lnum))
-
-  if s:is_jsx_comment(s:start_syntax(a:lnum))
-    if line =~ '^<!--' || line =~ '^-->'
-      return s:jsx_indent_element(a:lnum)
-    else
-      return s:jsx_indent_element(a:lnum) + s:sw()
-    endif
-  else
-    if line =~ '^/\*' || line =~ '^//'
-      return s:jsx_indent_element(a:lnum)
-    else
-      return s:jsx_indent_element(a:lnum) + 1
-    endif
-  endif
-endfunction
-
-" Compute the indentation of jsxBackticks
-function s:jsx_indent_backticks(lnum)
-  let tags = get(g:, 'vim_jsx_pretty_template_tags', ['html', 'jsx'])
-  let start_tag = '\%(' . join(tags, '\|') . '\)`'
-  let end_tag = '\%(' . join(tags, '\|') . '\)\@<!`'
-  let pair_line = searchpair(start_tag, '', end_tag, 'bW', 's:skip_if_not(a:lnum)')
-
-  return indent(pair_line)
-endfunction
-
-" Syntax context types:
-" - jsxRegion
-" - jsxTaggedRegion
-" - jsxElement
-" - jsxExpressionBlock
-" - Other
-function s:syntax_context(lnum)
-  let start_col = s:start_col(a:lnum)
-  let syntax_stack = s:syntax_stack_at(a:lnum, start_col)
-  let start_syntax = syntax_stack[-1]
-  let reversed = reverse(syntax_stack)
-  let i = 0
-
-  for syntax_name in reversed
-    " If the current line is jsxExpressionBlock and not starts with jsxBraces
-    if s:is_jsx_expression(syntax_name)
-      return 'jsxExpressionBlock'
-    endif
-
-    if s:is_jsx_region(syntax_name)
-      return 'jsxRegion'
-    endif
-
-    if s:is_jsx_element(syntax_name)
-      " If current line starts with the opening tag
-      if s:is_opening_tag(start_syntax) || s:is_closing_tag(start_syntax)
-        " And the next syntax is jsxRegion
-        if s:is_jsx_region(reversed[i+1])
-          return 'jsxRegion'
-        elseif reversed[i+1] =~ 'jsxTaggedRegion'
-          return 'jsxTaggedRegion'
-        else
-          return 'jsxElement'
-        endif
-      elseif reversed[i+1] =~ 'jsxTaggedRegion'
-        return 'jsxTaggedRegion'
-      else
-        return 'jsxElement'
-      endif
-    endif
-
-    let i = i + 1
-  endfor
-  
-  return 'Other'
-endfunction
-
-
-function! jsx_pretty#indent#get(js_indent)
-  let line = s:trim(getline(v:lnum))
-  let start_syntax = s:start_syntax(v:lnum)
-
-  if s:is_jsx_backticks(start_syntax)
-    return s:jsx_indent_backticks(v:lnum)
-  endif
-
-  if s:is_jsx_brace(start_syntax)
-    return s:jsx_indent_element(v:lnum)
-  endif
-
-  if s:is_opening_tag(start_syntax) && line =~ '^>'
-    return s:jsx_indent_trail_punct(v:lnum)
-  endif
-
-  let syntax_context = s:syntax_context(v:lnum)
-
-  if syntax_context == 'jsxRegion'
-    if s:is_closing_tag(start_syntax)
-      return s:jsx_indent_closing_tag(v:lnum)
-    endif
-
-    let prev_lnum = s:prev_lnum(v:lnum)
-    let prev_line = s:trim(getline(prev_lnum))
-
-    if prev_line =~ '[([{=?]$'
-      return indent(prev_lnum) + s:sw()
-    elseif prev_line =~ '[:|&<>]$' &&
-          \ s:trim(getline(s:prev_lnum(prev_lnum))) !~ '[?:|&<>]$'
-      return indent(prev_lnum) + s:sw()
-    else
-      return indent(prev_lnum)
-    endif
-  elseif syntax_context == 'jsxTaggedRegion'
-    if s:is_closing_tag(start_syntax)
-      return s:jsx_indent_closing_tag(v:lnum)
-    elseif s:is_jsx_comment(start_syntax)
-      return s:jsx_indent_comment(v:lnum)
-    else
-      return indent(s:prev_lnum(v:lnum)) + s:sw()
-    endif
-  elseif syntax_context == 'jsxElement'
-    if s:is_jsx_comment(start_syntax)
-      return s:jsx_indent_comment(v:lnum)
-    endif
-
-    if s:is_comment(start_syntax)
-      return s:jsx_indent_comment(v:lnum)
-    endif
-
-    return s:jsx_indent_element(v:lnum)
-  elseif syntax_context == 'jsxExpressionBlock'
-    let prev_lnum = s:prev_lnum(v:lnum)
-    let prev_line = s:trim(getline(prev_lnum))
-
-    if line =~ '^?'
-      return indent(prev_lnum) + s:sw()
-    elseif line =~ '^:'
-      return indent(prev_lnum)
-    else
-      return a:js_indent()
-    endif
-  endif
-
-  return a:js_indent()
-endfunction
-
-endif

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/doc.vim

@@ -1,246 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
-
-" path to the julia binary to communicate with
-if has('win32') || has('win64')
-  if exists('g:julia#doc#juliapath')
-    " use assigned g:julia#doc#juliapath
-  elseif executable('julia')
-    " use julia command in PATH
-    let g:julia#doc#juliapath = 'julia'
-  else
-    " search julia binary in the default installation paths
-    let pathlist = sort(glob($LOCALAPPDATA . '\Julia-*\bin\julia.exe', 1, 1))
-    let g:julia#doc#juliapath = get(pathlist, -1, 'julia')
-  endif
-else
-  let g:julia#doc#juliapath = get(g:, 'julia#doc#juliapath', 'julia')
-endif
-
-function! s:version() abort
-  let VERSION = {'major': 0, 'minor': 0}
-  if !executable(g:julia#doc#juliapath)
-    return VERSION
-  endif
-
-  let cmd = printf('%s -v', g:julia#doc#juliapath)
-  let output = system(cmd)
-  let versionstr = matchstr(output, '\C^julia version \zs\d\+\.\d\+\ze')
-  let [major, minor] = map(split(versionstr, '\.'), 'str2nr(v:val)')
-  let VERSION.major = major
-  let VERSION.minor = minor
-  return VERSION
-endfunction
-
-let s:VERSION = s:version()
-let s:NODOCPATTERN = '\C\VNo documentation found.'
-
-function! julia#doc#lookup(keyword, ...) abort
-  let juliapath = get(a:000, 0, g:julia#doc#juliapath)
-  let keyword = escape(a:keyword, '"\')
-  let cmd = printf('%s -E "@doc %s"', juliapath, keyword)
-  return systemlist(cmd)
-endfunction
-
-function! julia#doc#open(keyword) abort
-  if empty(a:keyword)
-    call s:warn('Not an appropriate keyword.')
-    return
-  endif
-
-  if !executable(g:julia#doc#juliapath)
-    call s:warn('%s command is not executable', g:julia#doc#juliapath)
-    return
-  endif
-
-  let doc = julia#doc#lookup(a:keyword, g:julia#doc#juliapath)
-  if empty(doc) || match(doc[0], s:NODOCPATTERN) > -1
-    call s:warn('No documentation found for "%s".', a:keyword)
-    return
-  endif
-
-  " workaround for * and ? since a buffername cannot include them
-  let keyword = a:keyword
-  let keyword = substitute(keyword, '\*', ':asterisk:', 'g')
-  let keyword = substitute(keyword, '?', ':question:', 'g')
-  let buffername = printf('juliadoc: %s', keyword)
-
-  call s:write_to_preview_window(doc, "juliadoc", buffername)
-
-  call filter(s:HELPHISTORY, 'v:val isnot# a:keyword')
-  call add(s:HELPHISTORY, a:keyword)
-endfunction
-
-function! s:write_to_preview_window(content, ftype, buffername)
-  " Are we in the preview window from the outset? If not, best to close any
-  " preview windows that might exist.
-  let pvw = &previewwindow
-  if !pvw
-    silent! pclose!
-  endif
-  execute "silent! pedit +setlocal\\ nobuflisted\\ noswapfile\\"
-        \ "buftype=nofile\\ bufhidden=wipe" a:buffername
-  silent! wincmd P
-  if &previewwindow
-    setlocal modifiable noreadonly
-    silent! %delete _
-    call append(0, a:content)
-    silent! $delete _
-    normal! ggj
-    setlocal nomodified readonly nomodifiable
-    execute "setfiletype" a:ftype
-    " Only return to a normal window if we didn't start in a preview window.
-    if !pvw
-      silent! wincmd p
-    endif
-  else
-    " We couldn't make it to the preview window, so as a fallback we dump the
-    " contents in the status area.
-    execute printf("echo '%s'", join(a:content, "\n"))
-  endif
-endfunction
-
-function! s:warn(...) abort
-  if a:0 == 0
-    return
-  endif
-
-  echohl WarningMsg
-  try
-    if a:0 == 1
-      echo a:1
-    else
-      echo call('printf', a:000)
-    endif
-  finally
-    echohl None
-  endtry
-endfunction
-
-
-
-let s:KEYWORDPATTERN = '\m@\?\h\k*!\?'
-
-" This function is called in normal mode or visual mode.
-function! julia#doc#keywordprg(word) abort
-  if a:word is# ''
-    return
-  endif
-
-  let word = s:unfnameescape(a:word)
-  if word is# expand('<cword>')
-    " 'K' in normal mode
-    " NOTE: Because ! and @ is not in 'iskeyword' option, this func ignore
-    "       the argument to recognize keywords like "@time" and "push!"
-    let view = winsaveview()
-    let lnum = line('.')
-    let tail = searchpos(s:KEYWORDPATTERN, 'ce', lnum)
-    let head = searchpos(s:KEYWORDPATTERN, 'bc', lnum)
-    call winrestview(view)
-    if head == [0, 0] || tail == [0, 0]
-      return
-    else
-      let start = head[1] - 1
-      let end = tail[1] - 1
-      let word = getline(lnum)[start : end]
-    endif
-  endif
-  call julia#doc#open(word)
-endfunction
-
-if exists('+shellslash')
-  let s:ESCAPEDCHARS = " \t\n\"#%'*<?`|"
-else
-  let s:ESCAPEDCHARS = " \t\n*?[{`$\\%#'\"|!<"
-endif
-let s:FNAMEESCAPEPATTERN = '\\\ze[' . escape(s:ESCAPEDCHARS, ']^-\') . ']'
-
-" this function reproduces an original string escaped by fnameescape()
-function! s:unfnameescape(str) abort
-  if a:str is# ''
-    return ''
-  endif
-
-  " NOTE: We cannot determine the original string if a:str starts from '\-',
-  "       '\+' or '\>' because fnameescape('-') ==# fnameescape('\-').
-  if a:str is# '\-'
-    " Remove escape anyway.
-    return '-'
-  endif
-
-  if a:str =~# '^\\[+>]'
-    let str = a:str[1:]
-  else
-    let str = a:str
-  endif
-  return substitute(str, s:FNAMEESCAPEPATTERN, '', 'g')
-endfunction
-
-
-
-let s:HELPPROMPT = 'help?> '
-let s:HELPHISTORY = []
-
-function! julia#doc#prompt() abort
-  let inputhist = s:savehistory('input')
-  echohl MoreMsg
-  try
-    call s:restorehistory('input', s:HELPHISTORY)
-    let keyword = input(s:HELPPROMPT, '', 'customlist,julia#doc#complete')
-
-    " Clear the last prompt
-    normal! :
-  finally
-    echohl None
-    call s:restorehistory('input', inputhist)
-  endtry
-
-  if empty(keyword)
-    return
-  endif
-
-  call julia#doc#open(keyword)
-endfunction
-
-function! s:savehistory(name) abort
-  if histnr(a:name) == -1
-    return []
-  endif
-
-  let history = []
-  for i in range(1, histnr(a:name))
-    let item = histget(a:name, i)
-    if !empty(item)
-      call add(history, item)
-    endif
-  endfor
-  return history
-endfunction
-
-function! s:restorehistory(name, history) abort
-  call histdel(a:name)
-  for item in a:history
-    call histadd(a:name, item)
-  endfor
-endfunction
-
-
-
-if s:VERSION.major == 0 && s:VERSION.minor <= 6
-  let s:REPL_SEARCH = 'Base.Docs.repl_search'
-else
-  let s:REPL_SEARCH = 'import REPL.repl_search; repl_search'
-endif
-
-function! julia#doc#complete(ArgLead, CmdLine, CursorPos) abort
-  return s:likely(a:ArgLead)
-endfunction
-
-function! s:likely(str) abort
-  " escape twice
-  let str = escape(escape(a:str, '"\'), '"\')
-  let cmd = printf('%s -E "%s(\"%s\")"', g:julia#doc#juliapath, s:REPL_SEARCH, str)
-  let output = systemlist(cmd)
-  return split(matchstr(output[0], '\C^search: \zs.*'))
-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 <buffer> call julia_blocks#select_reset()
-    au CursorMoved <buffer> 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/markdown.vim

@@ -1,532 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'markdown') == -1
-
-
-" {{{ FOLDING
-
-function! markdown#FoldLevelOfLine(lnum)
-  let currentline = getline(a:lnum)
-  let nextline = getline(a:lnum + 1)
-
-  " an empty line is not going to change the indentation level
-  if match(currentline, '^\s*$') >= 0
-    return '='
-  endif
-
-  " folding lists
-  if s:SyntaxGroupOfLineIs(a:lnum, '^markdownListItem')
-    if s:SyntaxGroupOfLineIs(a:lnum - 1, '^markdownListItem')
-      return 'a1'
-    endif
-    if s:SyntaxGroupOfLineIs(a:lnum + 1, '^markdownListItem')
-      return 's1'
-    endif
-    return '='
-  endif
-
-  " we are not going to fold things inside list items, too hairy
-  let is_inside_a_list_item = s:SyntaxGroupOfLineIs(a:lnum, '^markdownListItem')
-  if is_inside_a_list_item
-    return '='
-  endif
-
-  " folding atx headers
-  if match(currentline, '^#\{1,6}\s') >= 0
-    let header_level = strlen(substitute(currentline, '^\(#\{1,6}\).*', '\1', ''))
-    return '>' . header_level
-  endif
-
-  " folding fenced code blocks
-  let next_line_syntax_group = synIDattr(synID(a:lnum + 1, 1, 1), 'name')
-  if match(currentline, '^\s*```') >= 0
-    if next_line_syntax_group ==# 'markdownFencedCodeBlock'
-      return 'a1'
-    endif
-    return 's1'
-  endif
-
-  " folding code blocks
-  let current_line_syntax_group = synIDattr(synID(a:lnum, 1, 1), 'name')
-  let prev_line_syntax_group = synIDattr(synID(a:lnum - 1, 1, 1), 'name')
-  if match(currentline, '^\s\{4,}') >= 0
-    if current_line_syntax_group ==# 'markdownCodeBlock'
-      if prev_line_syntax_group !=# 'markdownCodeBlock'
-        return 'a1'
-      endif
-      if next_line_syntax_group !=# 'markdownCodeBlock'
-        return 's1'
-      endif
-    endif
-    return '='
-  endif
-
-  " folding setex headers
-  if (match(currentline, '^.*$') >= 0)
-    if (match(nextline, '^=\+$') >= 0)
-      return '>1'
-    endif
-    if (match(nextline, '^-\+$') >= 0)
-      return '>2'
-    endif
-  endif
-
-  return '='
-endfunction
-
-function! s:SyntaxGroupOfLineIs(lnum, pattern)
-  let stack = synstack(a:lnum, a:cnum)
-  if len(stack) > 0
-    return synIDattr(stack[0], 'name') =~# a:pattern
-  endif
-  return 0
-endfunction
-
-" }}}
-
-" {{{ EDIT
-
-function! markdown#EditBlock() range abort
-  if exists('b:markdown_temporary_buffer') && b:markdown_temporary_buffer
-    echo 'Sorry, you cannot edit a code block inside a temporary buffer'
-    return
-  endif
-  " Github fenced code blocks like ```ruby
-  let code_block = s:LocateFencedCodeBlock(a:firstline,
-    \ '^\s*`\{3,}\(\w\+\)\%(\s.*$\|$\)',
-    \ '^\s*`\{3,}\s*$'
-    \ )
-  if code_block['from'] == 0 || code_block['to'] == 0
-    " Github fenced code blocks with metadata like ```{ruby, <WHATEVER>}
-    let code_block = s:LocateFencedCodeBlock(a:firstline,
-      \ '^\s*`\{3,}{\(\w\+\),[^}]\+}\%(\s.*$\|$\)',
-      \ '^\s*`\{3,}\s*$'
-      \ )
-  endif
-  if code_block['from'] == 0 || code_block['to'] == 0
-    " Github fenced code blocks alternate style like ~~~ruby
-    let code_block = s:LocateFencedCodeBlock(a:firstline,
-      \ '^\s*\~\{3,}\(\w\+\)\%(\s.*$\|$\)',
-      \ '^\s*\~\{3,}\s*$'
-      \ )
-  endif
-  if code_block['from'] == 0 || code_block['to'] == 0
-    " Liquid fenced code blocks {% highlight ruby %}
-    " (since we support some liquid/jekyll tags, why not?)
-    let code_block = s:LocateFencedCodeBlock(a:firstline,
-      \ '^\s*{%\s*highlight\s\+\(\w\+\)\s*%}\%(\s.*$\|$\)',
-      \ '^\s*{%\s*endhighlight\s*%}\%(\s.*$\|$\)'
-      \ )
-  endif
-  if code_block['from'] == 0 || code_block['to'] == 0
-    let code_block = s:LocateRangeBlock(a:firstline, a:lastline)
-  endif
-  if code_block['from'] == 0 || code_block['to'] == 0
-    echo 'Sorry, I did not find any suitable code block to edit or create'
-    return
-  endif
-
-  let code_block['file_extension'] = '.' . code_block['language']
-  if has_key(s:known_file_extensions, code_block['language'])
-    let code_block['file_extension'] = s:known_file_extensions[code_block['language']]
-  endif
-  let code_block['file_path'] = tempname() . code_block['file_extension']
-  let code_block['content'] = getline(code_block['from'], code_block['to'])
-  let code_block['content'] = s:UnindentBlock(code_block['content'], code_block['indentation'])
-
-  call writefile(code_block['content'], code_block['file_path'])
-  augroup MarkdownReplaceEditedBlock
-    autocmd BufEnter <buffer> call s:ReplaceEditedBlock()
-  augroup END
-
-  let b:code_block = code_block
-  execute 'split ' . code_block['file_path']
-  let b:markdown_temporary_buffer = 1
-  autocmd BufLeave <buffer> wq
-endfunction
-
-function! s:ReplaceEditedBlock()
-  augroup MarkdownReplaceEditedBlock
-    autocmd!
-  augroup END
-  augroup! MarkdownReplaceEditedBlock
-
-  if b:code_block['to'] - b:code_block['from'] >= 0
-    execute b:code_block['from'] . ',' b:code_block['to'] . ' delete _'
-  endif
-  let content = readfile(b:code_block['file_path'])
-  let content = s:IndentBlock(l:content, b:code_block['indentation'])
-  let content = s:SurroundWithFencedCodeBlock(l:content, b:code_block)
-  call append(b:code_block['from']-1, content)
-  call setpos('.', b:code_block['back_to_position'])
-
-  execute 'silent bwipeout! ' . b:code_block['file_path']
-  call delete(b:code_block['file_path'])
-  unlet! b:code_block
-endfunction
-
-function! s:UnindentBlock(content, indentation)
-  return map(a:content, 'substitute(v:val, ''^' . a:indentation . ''', '''', ''g'')')
-endfunction
-
-function! s:IndentBlock(content, indentation)
-  return map(a:content, 'substitute(v:val, ''^'', ''' . a:indentation . ''', ''g'')')
-endfunction
-
-function! s:SurroundWithFencedCodeBlock(code, editing)
-  if !a:editing['surround'] | return a:code | endif
-  if a:editing['language'] =~# 'markdown' | return a:code | endif
-  let before =
-    \ (a:editing['make_room_before'] ? [''] : []) +
-    \ [a:editing['indentation'] . '```' . a:editing['language']]
-  let after =
-    \ [a:editing['indentation'] . '```'] +
-    \ (a:editing['make_room_after'] ? [''] : [])
-  return l:before + a:code + l:after
-endfunction
-
-function! s:LocateRangeBlock(from, to)
-  " TODO: extract initialize_code_block
-  let code_block = {'from': 0, 'to': 0, 'language': 'txt', 'indentation': '', 'surround': 0}
-  if a:to >= a:from
-    let code_block['from'] = a:from
-    let code_block['to'] = a:to
-    let code_block['back_to_position'] = getpos('.')
-    let code_block['language'] = 'markdown'
-
-    if a:from == a:to && getline(a:from) =~ '^\s*$'
-      let code_block['surround'] = 1
-      let code_block['make_room_before'] = getline(a:from - 1) !~ '^\s*$'
-      let code_block['make_room_after'] = getline(a:to + 1) !~ '^\s*$'
-      let code_block['language'] = input('filetype? (default: markdown) ', '', 'filetype')
-      if code_block['language'] =~ '^\s*$'
-        let code_block['language'] = 'markdown'
-      endif
-    endif
-  endif
-  return code_block
-endfunction
-
-function! s:LocateFencedCodeBlock(starting_from, upper_delimiter, lower_delimiter)
-  " TODO: extract initialize_code_block
-  let code_block = {'from': 0, 'to': 0, 'language': 'txt', 'indentation': '', 'surround': 0}
-  let initial_position = getpos('.')
-  let search_position = copy(initial_position)
-  let search_position[1] = a:starting_from
-  let search_position[2] = 0
-  cal setpos('.', search_position)
-
-  let start_code_block_backward = search(a:upper_delimiter, 'cbnW')
-  let end_code_block_backward = search(a:lower_delimiter, 'cbnW')
-  let end_code_block_forward = search(a:lower_delimiter, 'cnW')
-
-  let found_code_block =
-        \ start_code_block_backward > 0 &&
-        \ end_code_block_forward > 0
-  let between_two_code_blocks =
-        \ start_code_block_backward < end_code_block_backward &&
-        \ end_code_block_backward <= a:starting_from
-  let starting_inside_code_block =
-        \ found_code_block &&
-        \ !between_two_code_blocks &&
-        \ start_code_block_backward <= a:starting_from &&
-        \ end_code_block_forward >= a:starting_from
-
-  if starting_inside_code_block
-    let code_block['language'] = s:ExtractLanguage(start_code_block_backward, a:upper_delimiter)
-    let code_block['indentation'] = s:ExtractIndentation(start_code_block_backward)
-    let code_block['back_to_position'] = initial_position
-    let code_block['back_to_position'][1] = start_code_block_backward
-    let code_block['back_to_position'][2] = 0
-    let code_block['from'] = start_code_block_backward + 1
-    let code_block['to'] = end_code_block_forward - 1
-  endif
-  return code_block
-endfunction
-
-function! s:ExtractLanguage(start_at, upper_delimiter)
-  return substitute(getline(a:start_at), a:upper_delimiter, '\1', '')
-endfunction
-
-function! s:ExtractIndentation(start_at)
-  return substitute(getline(a:start_at), '\(^\s*\).\+$', '\1', '')
-endfunction
-
-let s:known_file_extensions = {
-  \ 'abap': '.abap',
-  \ 'antlr': '.g4',
-  \ 'asp': '.asp',
-  \ 'ats': '.dats',
-  \ 'actionscript': '.as',
-  \ 'ada': '.adb',
-  \ 'agda': '.agda',
-  \ 'apacheconf': '.apacheconf',
-  \ 'apex': '.cls',
-  \ 'applescript': '.applescript',
-  \ 'arc': '.arc',
-  \ 'arduino': '.ino',
-  \ 'asciidoc': '.asciidoc',
-  \ 'assembly': '.asm',
-  \ 'augeas': '.aug',
-  \ 'autohotkey': '.ahk',
-  \ 'autoit': '.au3',
-  \ 'awk': '.awk',
-  \ 'batchfile': '.bat',
-  \ 'befunge': '.befunge',
-  \ 'blitzbasic': '.bb',
-  \ 'blitzmax': '.bmx',
-  \ 'bluespec': '.bsv',
-  \ 'boo': '.boo',
-  \ 'brainfuck': '.b',
-  \ 'brightscript': '.brs',
-  \ 'bro': '.bro',
-  \ 'c': '.c',
-  \ 'c++': '.cpp',
-  \ 'cpp': '.cpp',
-  \ 'clips': '.clp',
-  \ 'cmake': '.cmake',
-  \ 'cobol': '.cob',
-  \ 'css': '.css',
-  \ 'ceylon': '.ceylon',
-  \ 'chuck': '.ck',
-  \ 'cirru': '.cirru',
-  \ 'clean': '.icl',
-  \ 'clojure': '.clj',
-  \ 'coffeescript': '.coffee',
-  \ 'coldfusion': '.cfm',
-  \ 'coq': '.coq',
-  \ 'creole': '.creole',
-  \ 'crystal': '.cr',
-  \ 'cucumber': '.feature',
-  \ 'cuda': '.cu',
-  \ 'cython': '.pyx',
-  \ 'd': '.d',
-  \ 'dm': '.dm',
-  \ 'dot': '.dot',
-  \ 'dart': '.dart',
-  \ 'diff': '.diff',
-  \ 'dylan': '.dylan',
-  \ 'ecl': '.ecl',
-  \ 'eiffel': '.e',
-  \ 'elixir': '.ex',
-  \ 'elm': '.elm',
-  \ 'erlang': '.erl',
-  \ 'flux': '.fx',
-  \ 'fortran': '.f90',
-  \ 'factor': '.factor',
-  \ 'fancy': '.fy',
-  \ 'fantom': '.fan',
-  \ 'forth': '.fth',
-  \ 'gas': '.s',
-  \ 'glsl': '.glsl',
-  \ 'genshi': '.kid',
-  \ 'glyph': '.glf',
-  \ 'go': '.go',
-  \ 'gosu': '.gs',
-  \ 'groff': '.man',
-  \ 'groovy': '.groovy',
-  \ 'html': '.html',
-  \ 'http': '.http',
-  \ 'haml': '.haml',
-  \ 'handlebars': '.handlebars',
-  \ 'harbour': '.hb',
-  \ 'haskell': '.hs',
-  \ 'haxe': '.hx',
-  \ 'hy': '.hy',
-  \ 'idl': '.pro',
-  \ 'ini': '.ini',
-  \ 'idris': '.idr',
-  \ 'io': '.io',
-  \ 'ioke': '.ik',
-  \ 'j': '.ijs',
-  \ 'json': '.json',
-  \ 'json5': '.json5',
-  \ 'jsonld': '.jsonld',
-  \ 'jade': '.jade',
-  \ 'java': '.java',
-  \ 'javascript': '.js',
-  \ 'julia': '.jl',
-  \ 'krl': '.krl',
-  \ 'kotlin': '.kt',
-  \ 'lfe': '.lfe',
-  \ 'llvm': '.ll',
-  \ 'lasso': '.lasso',
-  \ 'less': '.less',
-  \ 'lilypond': '.ly',
-  \ 'livescript': '.ls',
-  \ 'logos': '.xm',
-  \ 'logtalk': '.lgt',
-  \ 'lua': '.lua',
-  \ 'm': '.mumps',
-  \ 'makefile': '.mak',
-  \ 'mako': '.mako',
-  \ 'markdown': '.md',
-  \ 'mask': '.mask',
-  \ 'matlab': '.matlab',
-  \ 'max': '.maxpat',
-  \ 'mediawiki': '.mediawiki',
-  \ 'mirah': '.druby',
-  \ 'monkey': '.monkey',
-  \ 'moocode': '.moo',
-  \ 'moonscript': '.moon',
-  \ 'myghty': '.myt',
-  \ 'nsis': '.nsi',
-  \ 'nemerle': '.n',
-  \ 'netlogo': '.nlogo',
-  \ 'nginx': '.nginxconf',
-  \ 'nimrod': '.nim',
-  \ 'nu': '.nu',
-  \ 'numpy': '.numpy',
-  \ 'ocaml': '.ml',
-  \ 'objdump': '.objdump',
-  \ 'omgrofl': '.omgrofl',
-  \ 'opa': '.opa',
-  \ 'opencl': '.cl',
-  \ 'org': '.org',
-  \ 'oxygene': '.oxygene',
-  \ 'pawn': '.pwn',
-  \ 'php': '.php',
-  \ 'parrot': '.parrot',
-  \ 'pascal': '.pas',
-  \ 'perl': '.pl',
-  \ 'perl6': '.p6',
-  \ 'pike': '.pike',
-  \ 'pod': '.pod',
-  \ 'pogoscript': '.pogo',
-  \ 'postscript': '.ps',
-  \ 'powershell': '.ps1',
-  \ 'processing': '.pde',
-  \ 'prolog': '.prolog',
-  \ 'puppet': '.pp',
-  \ 'python': '.py',
-  \ 'qml': '.qml',
-  \ 'r': '.r',
-  \ 'rdoc': '.rdoc',
-  \ 'realbasic': '.rbbas',
-  \ 'rhtml': '.rhtml',
-  \ 'rmarkdown': '.rmd',
-  \ 'racket': '.rkt',
-  \ 'rebol': '.rebol',
-  \ 'redcode': '.cw',
-  \ 'robotframework': '.robot',
-  \ 'rouge': '.rg',
-  \ 'ruby': '.rb',
-  \ 'rust': '.rs',
-  \ 'scss': '.scss',
-  \ 'sql': '.sql',
-  \ 'sage': '.sage',
-  \ 'sass': '.sass',
-  \ 'scala': '.scala',
-  \ 'scaml': '.scaml',
-  \ 'scheme': '.scm',
-  \ 'scilab': '.sci',
-  \ 'self': '.self',
-  \ 'shell': '.sh',
-  \ 'shen': '.shen',
-  \ 'slash': '.sl',
-  \ 'smalltalk': '.st',
-  \ 'smarty': '.tpl',
-  \ 'squirrel': '.nut',
-  \ 'stylus': '.styl',
-  \ 'supercollider': '.scd',
-  \ 'toml': '.toml',
-  \ 'txl': '.txl',
-  \ 'tcl': '.tcl',
-  \ 'tcsh': '.tcsh',
-  \ 'tex': '.tex',
-  \ 'tea': '.tea',
-  \ 'textile': '.textile',
-  \ 'turing': '.t',
-  \ 'twig': '.twig',
-  \ 'typescript': '.ts',
-  \ 'unrealscript': '.uc',
-  \ 'vhdl': '.vhdl',
-  \ 'vala': '.vala',
-  \ 'verilog': '.v',
-  \ 'viml': '.vim',
-  \ 'volt': '.volt',
-  \ 'xc': '.xc',
-  \ 'xml': '.xml',
-  \ 'xproc': '.xpl',
-  \ 'xquery': '.xquery',
-  \ 'xs': '.xs',
-  \ 'xslt': '.xslt',
-  \ 'xtend': '.xtend',
-  \ 'yaml': '.yml',
-  \ 'ec': '.ec',
-  \ 'edn': '.edn',
-  \ 'fish': '.fish',
-  \ 'mupad': '.mu',
-  \ 'nesc': '.nc',
-  \ 'ooc': '.ooc',
-  \ 'restructuredtext': '.rst',
-  \ 'wisp': '.wisp',
-  \ 'xbase': '.prg',
-\ }
-
-" }}}
-
-" {{{ FORMAT
-function! markdown#FormatTable()
-  let p = '^\s*|\s.*\s|\s*$'
-  if exists(':Tabularize') && getline('.') =~# '^\s*|' && (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.*'))
-    let separator_line_number = search('^\s*|\s*-\{3,}', 'cbnW')
-
-    call s:ShrinkTableHeaderSeparator(separator_line_number)
-    Tabularize/|/l1
-    call s:ExpandTableHeaderSeparator(separator_line_number)
-    normal! 0
-
-    call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
-  endif
-endfunction
-
-function! s:ShrinkTableHeaderSeparator(separator_line_number)
-  if a:separator_line_number > 0
-    let separator_line = getline(a:separator_line_number)
-    let separator_line = substitute(separator_line, '-\+', '---', 'g')
-    call setline(a:separator_line_number, separator_line)
-  endif
-endfunction
-
-function! s:ExpandTableHeaderSeparator(separator_line_number)
-  if a:separator_line_number > 0
-    let separator_line = getline(a:separator_line_number)
-    let separator_line = substitute(
-      \ separator_line,
-      \ '|\([^|]*\)',
-      \ '\="| " . repeat("-", strlen(submatch(1)) - 2) . " "',
-      \ 'g')
-    let separator_line = substitute(separator_line, '\s*$', '', '')
-    call setline(a:separator_line_number, separator_line)
-  endif
-endfunction
-" }}}
-
-" {{{ SWITCH STATUS
-function! markdown#SwitchStatus()
-  let current_line = getline('.')
-  if match(current_line, '^\s*[*\-+] \[ \]') >= 0
-    call setline('.', substitute(current_line, '^\(\s*[*\-+]\) \[ \]', '\1 [x]', ''))
-    return
-  endif
-  if match(current_line, '^\s*[*\-+] \[x\]') >= 0
-    call setline('.', substitute(current_line, '^\(\s*[*\-+]\) \[x\]', '\1', ''))
-    return
-  endif
-  if match(current_line, '^\s*[*\-+] \(\[[x ]\]\)\@!') >= 0
-    call setline('.', substitute(current_line, '^\(\s*[*\-+]\)', '\1 [ ]', ''))
-    return
-  endif
-  if match(current_line, '^\s*#\{1,5}\s') >= 0
-    call setline('.', substitute(current_line, '^\(\s*#\{1,5}\) \(.*$\)', '\1# \2', ''))
-    return
-  endif
-  if match(current_line, '^\s*#\{6}\s') >= 0
-    call setline('.', substitute(current_line, '^\(\s*\)#\{6} \(.*$\)', '\1# \2', ''))
-    return
-  endif
-endfunction
-" }}}
-
-endif

autoload/pony.vim

@@ -1,536 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
-
-" Vim plugin file
-" Language:     Pony
-" Maintainer:   Jak Wings
-
-" TODO: Make sure echomsg is off for release.
-let s:cpo_save = &cpo
-set cpo&vim
-
-
-"let s:skip = '<SID>InCommentOrLiteral(line("."), col("."))'
-let s:skip2 = '<SID>InLiteral(line("."), col(".")) || <SID>InComment(line("."), col(".")) == 1'
-let s:skip3 = '!<SID>InKeyword(line("."), col("."))'
-let s:skip4 = '!<SID>InBracket(line("."), col("."))'
-let s:cfstart = '\v<%(ifdef|if|match|while|for|repeat|try|with|recover|object|lambda|iftype)>'
-let s:cfmiddle = '\v<%(then|elseif|else|until|do|in|elseiftype)>|\|'
-let s:cfend = '\v<end>'
-let s:bstartp = '\v<%(ifdef|if|then|elseif|else|(match)|while|for|in|do|try|with|recover|repeat|until|(object)|lambda|iftype|elseiftype)>'
-
-function! pony#Indent()
-  if v:lnum <= 1
-    return 0
-  endif
-
-  call cursor(v:lnum, 1)
-  let l:pnzpos = searchpos('.', 'cbnW')
-  if l:pnzpos == [0, 0]
-    return 0
-  endif
-
-  if s:InComment2(l:pnzpos) > 1
-    "echomsg 'Comment' (l:pnzpos[0] . '-' . v:lnum) -1
-    return cindent(v:lnum)
-  endif
-
-  if s:InLiteral2(l:pnzpos)
-    "echomsg 'String' (l:pnzpos[0] . '-' . v:lnum) -1
-    return -1
-  endif
-
-  unlet! l:pnzpos
-
-  " NOTE: Lines started in comments and strings are checked already.
-
-  let l:pnblnum = s:PrevNonblank(v:lnum - 1)
-  if l:pnblnum < 1
-    return 0
-  endif
-
-  let l:pnbline = getline(l:pnblnum)
-  let l:pnbindent = indent(l:pnblnum)
-
-  let l:line = getline(v:lnum)
-  let l:indent = l:pnbindent
-  let l:shiftwidth = shiftwidth()
-
-  " FIXME?
-  let l:continuing = 0
-  " If the previous line ends with a unary or binary operator,
-  if s:IsContinued(l:pnblnum)
-    let l:contlnum = l:pnblnum
-    let l:ppcontinued = 0
-    let l:ppnblnum = s:PrevNonblank(l:pnblnum - 1)
-    while s:IsContinued(l:ppnblnum)
-      let l:ppcontinued += 1
-      let l:contlnum = l:ppnblnum
-      let l:ppnblnum = s:PrevNonblank(l:ppnblnum - 1)
-    endwhile
-    "echomsg 'Continued1' l:pnblnum l:contlnum
-    " If the previous line is also continuing another line,
-    if l:ppcontinued
-      let l:continuing = 1
-      if getline(l:contlnum) =~# '\v^\s*%(actor|class|struct|primitive|trait|type|interface)>'
-        " reset the indent level.
-        "echomsg 'Continuing0' (l:contlnum . '-' . v:lnum) (l:shiftwidth * 2)
-        let l:indent = l:shiftwidth * 2
-      else
-        " keep using the previous indent.
-        "echomsg 'Continuing1' (l:pnblnum . '-' . v:lnum) l:pnbindent
-        let l:indent = l:pnbindent
-      endif
-    " if the previous line is part of the definition of a class,
-    elseif l:pnbline =~# '\v^\s*%(actor|class|struct|primitive|trait|type|interface)>'
-      " reset the indent level.
-      "echomsg 'Continuing2' (l:pnblnum . '-' . v:lnum) (l:shiftwidth * 2)
-      let l:continuing = 1
-      let l:indent = l:shiftwidth * 2
-    " if the previous line is part of the definition of a method,
-    elseif l:pnbline =~# '\v^\s*%(fun|new|be)>'
-      " reset the indent level.
-      "echomsg 'Continuing3' (l:pnblnum . '-' . v:lnum) (l:pnbindent + l:shiftwidth)
-      let l:continuing = 1
-      let l:indent = l:pnbindent + l:shiftwidth
-    " if the previous line is the start of a definition body,
-    elseif l:pnbline =~# '=>\s*$'
-      " indent this line.
-      "echomsg 'Continuing4' (l:pnblnum . '-' . v:lnum) (l:pnbindent + l:shiftwidth)
-      let l:continuing = 1
-      let l:indent = l:pnbindent + l:shiftwidth
-    else
-      " indent this line twice as far.
-      "echomsg 'Continuing5' (l:pnblnum . '-' . v:lnum) (l:pnbindent + l:shiftwidth * 2)
-      let l:continuing = 1
-      let l:indent = l:pnbindent + l:shiftwidth * 2
-    endif
-
-    unlet! l:contlnum l:ppnblnum l:ppcontinued
-  endif
-
-  " If this line starts a document string,
-  if !l:continuing && l:line =~# '^\s*"""'
-    let l:ppnblnum = s:PrevNonblank(l:pnblnum - 1)
-    if s:IsContinued(l:ppnblnum)
-      let l:contlnum = l:ppnblnum
-      while s:IsContinued(l:ppnblnum)
-        let l:contlnum = l:ppnblnum
-        let l:ppnblnum = s:PrevNonblank(l:ppnblnum - 1)
-      endwhile
-      if getline(l:contlnum) =~# '\v^\s*%(actor|class|struct|primitive|trait|type|interface)>'
-        " reset the indent level.
-        "echomsg 'DocString' (l:contlnum . '-' . v:lnum) l:shiftwidth
-        return l:shiftwidth
-      endif
-    endif
-
-    unlet! l:contlnum l:ppnblnum
-  endif
-
-  " If the previous line contains an unmatched opening bracket
-  if !l:continuing && l:pnbline =~# '[{[(]'
-    " if the line ends with an opening bracket,
-    if l:pnbline =~# '[{[(]\s*$' && !s:InCommentOrLiteral(l:pnblnum, col([l:pnblnum, '$']) - 1)
-      " indent this line.
-      let l:indent += l:shiftwidth
-    else
-      " find the unmatched opening bracket,
-      let l:start = [0, 0]
-      let l:end = col([l:pnblnum, '$']) - 1
-      call cursor(l:pnblnum, l:end)
-      while l:end > 0
-        let l:start = s:OuterPos(l:start, searchpairpos('(', '', ')', 'bnW', s:skip4, l:pnblnum))
-        let l:start = s:OuterPos(l:start, searchpairpos('\[', '', '\]', 'bnW', s:skip4, l:pnblnum))
-        let l:start = s:OuterPos(l:start, searchpairpos('{', '', '}', 'bnW', s:skip4, l:pnblnum))
-        if l:start == [0, 0]
-          break
-        endif
-        " find the matched closing bracket on the same line,
-        call cursor(l:start[0], l:start[1])
-        let l:c = s:CharAtCursor(l:start[0], l:start[1])
-        if searchpair(escape(l:c, '['), '', escape(tr(l:c, '([{', ')]}'), ']'),
-              \ 'znW', s:skip4, l:pnblnum) < 1
-          " the unmatched opening bracket is found,
-          break
-        endif
-        let l:end = l:start[1]
-        let l:start = [0, 0]
-      endwhile
-      if l:start != [0, 0]
-        " indent this line.
-        "echomsg 'Open bracket' (l:pnblnum . '-' . v:lnum) (l:indent + l:shiftwidth)
-        let l:indent += l:shiftwidth
-      endif
-    endif
-
-    unlet! l:start l:end l:c
-  endif
-
-  " If there is a matched closing bracket on the previous line,
-  " NOTE:
-  " >|[
-  "  |  (1 -
-  "  |      1) * 2]
-  "  |  command
-  "   ^
-  if !l:continuing
-    call cursor(l:pnblnum, 1)
-    " find the last closing bracket,
-    let l:end = [0, 0]
-    let l:end = s:OuterPos(l:end, searchpairpos('(', '', ')', 'zncr', s:skip4, l:pnblnum))
-    let l:end = s:OuterPos(l:end, searchpairpos('\[', '', '\]', 'zncr', s:skip4, l:pnblnum))
-    let l:end = s:OuterPos(l:end, searchpairpos('{', '', '}', 'zncr', s:skip4, l:pnblnum))
-    if l:end != [0, 0]
-      " find the matched opening bracket on another line,
-      let l:c = s:CharAtCursor(l:end[0], l:end[1])
-      let l:start = searchpairpos(escape(tr(l:c, ')]}', '([{'), '['), '', escape(l:c, ']'), 'nbW', s:skip4)
-      if l:start[0] != l:end[0]
-        " and then this line has the same indent as the line the matched bracket stays.
-        "echomsg 'Matched bracket' (l:start[0] . '-' . v:lnum) indent(l:start[0])
-        let l:indent = indent(l:start[0])
-      endif
-    endif
-
-    unlet! l:start l:end l:c
-  endif
-
-  " If there is a matched closing bracket on this line,
-  " NOTE:
-  "  |[
-  " >|  (1 -
-  "  |      1) * 2
-  "  |]
-  "   ^     ^
-  if l:line =~# '^\s*[)\]}]'
-    " find the first closing bracket,
-    call cursor(v:lnum, 1)
-    let l:end = [0, 0]
-    let l:end = s:InnerPos(l:end, searchpairpos('(', '', ')', 'zncW', s:skip4, v:lnum))
-    let l:end = s:InnerPos(l:end, searchpairpos('\[', '', '\]', 'zncW', s:skip4, v:lnum))
-    let l:end = s:InnerPos(l:end, searchpairpos('{', '', '}', 'zncW', s:skip4, v:lnum))
-    if l:end != [0, 0]
-      " find the matched opening bracket on another line,
-      let l:c = s:CharAtCursor(l:end[0], l:end[1])
-      let l:start = searchpairpos(escape(tr(l:c, ')]}', '([{'), '['), '', escape(l:c, ']'), 'nbW', s:skip4)
-      if l:start[0] != l:end[0]
-        " and then this line has the same indent as the line the matched bracket stays.
-        "echomsg 'Closing Bracket' (l:start[0] . '-' . v:lnum) indent(l:start[0])
-        let l:indent = indent(l:start[0])
-      endif
-    endif
-
-    unlet! l:start l:end l:c
-  endif
-
-  " If this line starts the definition of a method, closure or match case,
-  if l:line =~# '^\s*=>'
-    " find the start of the definition,
-    call cursor(v:lnum, 1)
-    let l:start = searchpairpos('\v<%(new|be|fun|lambda)>|\|', '', '=>\zs', 'bnW', s:skip3)
-    if l:start != [0, 0]
-      " then this line has the same indent as the start.
-      "echomsg 'Method body' (l:start[0] . '-' . v:lnum) indent(l:start[0])
-      return indent(l:start[0])
-    endif
-
-    unlet! l:start
-  endif
-
-  " If this line starts a class definition or starts an alias,
-  if l:line =~# '\v^\s*%(actor|class|struct|primitive|trait|interface|use|type)>'
-    " reset the indent level.
-    return 0
-  endif
-
-  " If this line starts a method definition,
-  if l:line =~# '\v^\s*%(new|be|fun)>'
-    call cursor(v:lnum, 1)
-    let l:start = searchpairpos(s:cfstart, s:cfmiddle, s:cfend, 'bW', s:skip3)
-    if l:start != [0, 0]
-      let l:start = searchpos(s:bstartp, 'zcnpW', l:start[0])
-      " see if it is in an object block,
-      if l:start[2] == 3
-        "echomsg 'Method in object' (l:start[0] . '-' . v:lnum) (l:shiftwidth + indent(l:start[0]))
-        return l:shiftwidth + indent(l:start[0])
-      endif
-    endif
-    return l:shiftwidth
-  endif
-
-  " If this line starts a match case,
-  call cursor(v:lnum, 1)
-  if l:line =~# '^\s*|' && s:InKeyword(searchpos('|', 'znW', v:lnum))
-    " find the start or the previous case of the match block,
-    let l:start = searchpairpos(s:cfstart, s:cfmiddle, s:cfend, 'bnW', s:skip3)
-    if l:start != [0, 0]
-      " then this line has the same indent as the start.
-      "echomsg 'Match case' (l:start[0] . '-' . v:lnum) indent(l:start[0])
-      return indent(l:start[0])
-    endif
-
-    unlet! l:start
-  endif
-
-  " If this line ends (part of) a control flow,
-  if l:line =~# '\v^\s*%(end|elseif|else|then|in|do|until|elseiftype)>'
-    " find the start or middle of the control block,
-    call cursor(v:lnum, 1)
-    let l:start = searchpairpos(s:cfstart, s:cfmiddle, s:cfend, 'bnW', s:skip3)
-    if l:start != [0, 0]
-      " then this line has the same indent as the start.
-      "echomsg 'Block end' (l:start[0] . '-' . v:lnum) indent(l:start[0])
-      return indent(l:start[0])
-    endif
-
-    unlet! l:start
-  endif
-
-  " If the previous line starts a class definition,
-  if l:pnbline =~# '\v^\s*%(actor|class|struct|primitive|trait|type|interface)>'
-    " reset the indent level.
-    if s:IsContinued(l:pnblnum)
-      return l:shiftwidth * 2
-    else
-      return l:shiftwidth
-    endif
-  endif
-
-  " If the previous line starts a method definition,
-  if l:pnbline =~# '\v^\s*%(new|be|fun)>'
-    return l:pnbindent + l:shiftwidth
-  endif
-
-  " If the previous line starts (part of) a control flow,
-  call cursor(l:pnblnum, 1)
-  while 1
-    " find the start of the control block,
-    let l:start = searchpos(s:bstartp, 'zcepW', l:pnblnum)
-    if l:start[2] == 0
-      break
-    endif
-    if !s:InKeyword(l:start[0:1])
-      call cursor(l:pnblnum, l:start[1] + 3)
-      continue
-    endif
-    let l:index = l:start[2]
-    " find the end of the control block on the same line,
-    let l:end = searchpair(s:cfstart, '', s:cfend, 'znW', s:skip3, l:pnblnum)
-    " if the control block is not ended,
-    if l:end < 1
-      " if this line is a case for a match,
-      if l:index == 2 && l:line =~# '^\s*|'
-        " then this line has the same indent as the start of the match block.
-        return l:pnbindent
-      else
-        " then indent this line.
-        "echomsg 'Block start' (l:pnblnum . '-' . v:lnum) (l:pnbindent + l:shiftwidth)
-        return l:pnbindent + l:shiftwidth
-      endif
-    endif
-  endwhile
-
-  unlet! l:start l:end l:index
-
-  return l:indent
-endfunction
-
-function! s:PrevNonblank(lnum)
-  let l:lnum = prevnonblank(a:lnum)
-  while l:lnum > 0 && (s:InComment2(l:lnum, 1) || s:InLiteral2(l:lnum, 1))
-    let l:lnum = prevnonblank(l:lnum - 1)
-  endwhile
-  return l:lnum
-endfunction
-
-" NOTE:
-"                 v
-"  |1 /* comment */
-"  |2
-function! s:IsContinued(lnum)
-  let l:lnum = s:PrevNonblank(a:lnum)
-  if l:lnum < 1
-    return 0
-  endif
-  let l:line = getline(l:lnum)
-  let l:width = strwidth(substitute(l:line, '\s*$', '', ''))
-  " FIXME?
-  "  | 1 + //
-  "  | //
-  "  |     2
-  return !s:InCommentOrLiteral(a:lnum, l:width)
-        \ && (l:line =~# '\v<%(and|or|xor|is|isnt|as|not|consume|addressof|digestof)\s*$'
-        \ || l:line =~# '\v%([=\-.]\>|[<!=>]\=\~?|\<\<\~?|\>\>\~?|\<:|[+\-*/%<>]\~?|[.,|:@~])\s*$'
-        \ )
-endfunction
-
-function! s:InCommentOrLiteral(...)
-  return call('s:InComment', a:000) || call('s:InLiteral', a:000)
-endfunction
-
-function! s:InKeyword(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  for id in s:Or(synstack(l:lnum, l:col), [])
-    if synIDattr(id, 'name') =~# '^ponyKw'
-      return 1
-    endif
-  endfor
-  return 0
-endfunction
-
-function! s:InBracket(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  for id in s:Or(synstack(l:lnum, l:col), [])
-    if synIDattr(id, 'name') ==# 'ponyBracket'
-      return 1
-    endif
-  endfor
-  return 0
-endfunction
-
-function! s:InComment(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  let l:stack = synstack(l:lnum, l:col)
-  let l:i = len(l:stack)
-  while l:i > 0
-    let l:sname = synIDattr(l:stack[l:i - 1], 'name')
-    if l:sname =~# '^ponyNestedCommentX\?$'
-      return 1 + l:i - (l:sname =~# 'X$')
-    elseif l:sname =~# '^ponyCommentX\?$'
-      return 1
-    endif
-    let l:i -= 1
-  endwhile
-  return 0
-endfunction
-
-function! s:InLiteral(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  let l:stack = synstack(l:lnum, l:col)
-  let l:i = len(l:stack)
-  while l:i > 0
-    let l:sname = synIDattr(l:stack[l:i - 1], 'name')
-    if l:sname =~# '^ponyDocumentStringX\?$'
-      return 3
-    elseif l:sname =~# '^ponyStringX\?$'
-      return 2
-    elseif l:sname =~# '^ponyCharacterX\?$'
-      return 1
-    endif
-    let l:i -= 1
-  endwhile
-  return 0
-endfunction
-
-" NOTE:
-" |// //inside
-"   ^^^^^^^^^^
-" |/* /*inside*/ */
-"   ^^^^^^^^^^^^^^
-function! s:InComment2(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  let l:stack = synstack(l:lnum, l:col)
-  let l:i = len(l:stack)
-  while l:i > 0
-    let l:sname = synIDattr(l:stack[l:i - 1], 'name')
-    if l:sname ==# 'ponyNestedComment'
-      return 1 + l:i
-    elseif l:sname ==# 'ponyComment'
-      return 1
-    elseif l:sname =~# '\v^pony%(Nested)?CommentX$'
-      return 0
-    endif
-    let l:i -= 1
-  endwhile
-  return 0
-endfunction
-
-" NOTE:
-" |"inside"
-"   ^^^^^^
-" |"""inside"""""
-"   ^^^^^^^^^^^^
-function! s:InLiteral2(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  let l:stack = synstack(l:lnum, l:col)
-  let l:i = len(l:stack)
-  while l:i > 0
-    let l:sname = synIDattr(l:stack[l:i - 1], 'name')
-    if l:sname ==# 'ponyDocumentString'
-      return 3
-    elseif l:sname ==# 'ponyString'
-      return 2
-    elseif l:sname ==# 'ponyCharacter'
-      return 1
-    elseif l:sname =~# '\v^pony%(DocumentString|String|Character)X$'
-      return 0
-    endif
-    let l:i -= 1
-  endwhile
-  return 0
-endfunction
-
-function! s:CharAtCursor(...)
-  let [l:lnum, l:col] = (type(a:1) == type([]) ? a:1 : a:000)
-  return matchstr(getline(l:lnum), '\%' . l:col . 'c.')
-endfunction
-
-function! s:Or(x, y)
-  return !empty(a:x) ? a:x : a:y
-endfunction
-
-function! s:InnerPos(x, y)
-  if a:x == [0, 0]
-    return a:y
-  elseif a:y == [0, 0]
-    return a:x
-  else
-    return a:x[1] < a:y[1] ? a:x : a:y
-  end
-endfunction
-
-function! s:OuterPos(x, y)
-  if a:x == [0, 0]
-    return a:y
-  elseif a:y == [0, 0]
-    return a:x
-  else
-    return a:x[1] > a:y[1] ? a:x : a:y
-  end
-endfunction
-
-function! pony#ClearTrailingSpace(all, alt, ...)
-  let l:force = (a:0 > 0 ? a:1 : 0)
-  if !l:force && (&readonly || !&modifiable || !&modified)
-    return
-  endif
-  if a:all
-    for lnum in range(1, line('$'))
-      let l:line = getline(lnum)
-      let l:end = col([lnum, '$']) - 1
-      if l:end > 0 && l:line =~# '\s$' && !s:InLiteral(lnum, l:end)
-        if a:alt
-          call setline(lnum, substitute(l:line, '\S\@<=\s\s*$', '', ''))
-        else
-          call setline(lnum, substitute(l:line, '\s\+$', '', ''))
-        endif
-      endif
-    endfor
-  else
-    let l:lnum = line('.')
-    let l:end = col('$') - 1
-    let l:line = getline(l:lnum)
-    if l:line =~# '\s$' && !s:InLiteral(l:lnum, l:end)
-      if a:alt
-        call setline(l:lnum, substitute(l:line, '\s\+$', '', ''))
-      else
-        call setline(l:lnum, substitute(l:line, '\S\@<=\s\s*$', '', ''))
-      endif
-    endif
-  endif
-endfunction
-
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-endif

autoload/puppet/align.vim

@@ -1,72 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-
-function! puppet#align#IndentLevel(lnum)
-    return indent(a:lnum) / &shiftwidth
-endfunction
-
-function! puppet#align#LinesInBlock(lnum)
-    let lines = []
-    let indent_level = puppet#align#IndentLevel(a:lnum)
-
-    let marker = a:lnum - 1
-    while marker >= 1
-        let line_text = getline(marker)
-        let line_indent = puppet#align#IndentLevel(marker)
-
-        if line_text =~? '\v\S'
-            if line_indent < indent_level
-                break
-            elseif line_indent == indent_level
-                call add(lines, marker)
-            endif
-        endif
-
-        let marker -= 1
-    endwhile
-
-    let marker = a:lnum
-    while marker <= line('$')
-        let line_text = getline(marker)
-        let line_indent = puppet#align#IndentLevel(marker)
-
-        if line_text =~? '\v\S'
-            if line_indent < indent_level
-                break
-            elseif line_indent == indent_level
-                call add(lines, marker)
-            endif
-        endif
-
-        let marker += 1
-    endwhile
-
-    return lines
-endfunction
-
-""
-" Format lines with hashrocket (=>)
-" @param a:1 a line where function should search for first hashrocket
-"   expression, if param is not given, line with active cursor is used
-function! puppet#align#AlignHashrockets(...) abort
-    let l:lnum = get(a:, 1, line('.'))
-    let lines_in_block = puppet#align#LinesInBlock(l:lnum)
-    let max_left_len = 0
-    let indent_str = printf('%' . indent(l:lnum) . 's', '')
-
-    for line_num in lines_in_block
-        let data = matchlist(getline(line_num), '^\s*\(.\{-}\S\)\s*=>\s*\(.*\)$')
-        if !empty(data)
-            let max_left_len = max([max_left_len, strlen(data[1])])
-        endif
-    endfor
-
-    for line_num in lines_in_block
-        let data = matchlist(getline(line_num), '^\s*\(.\{-}\S\)\s*=>\s*\(.*\)$')
-        if !empty(data)
-            let new_line = printf('%s%-' . max_left_len . 's => %s', indent_str, data[1], data[2])
-            call setline(line_num, new_line)
-        endif
-    endfor
-endfunction
-
-endif

autoload/puppet/ctags.vim

@@ -1,40 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-
-
-if !exists('s:ctags_type')
-  let s:ctags_type = 0
-endif
-
-let s:ctags_options_dir = expand('<sfile>:p:h:h:h') . '/ctags/'
-
-" Return full path to option file for ctags application
-function! puppet#ctags#OptionFile()
-
-  if puppet#ctags#Type() == 'universal'
-    let l:ctags_options = 'puppet_u.ctags'
-  else
-    let l:ctags_options = 'puppet.ctags'
-  endif
-  return s:ctags_options_dir . l:ctags_options
-endfunction
-
-" Return type of installed ctags application,
-" can be 'universal' or 'exuberant'
-function! puppet#ctags#Type()
-
-  if !s:ctags_type
-    let l:version = system('ctags --version')
-    if l:version =~ 'Universal Ctags'
-      let s:ctags_type = 'universal'
-    elseif l:version =~ 'Exuberant Ctags'
-      let s:ctags_type = 'exuberant'
-    else
-       echoerr 'Unknown version of Ctags'
-    endif
-  endif
-
-  return s:ctags_type
-endfunction
-
-
-endif

autoload/puppet/format.vim

@@ -1,74 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
-
-"
-" Simple format using puppet's l:indents and align hashrockets function
-function! puppet#format#Format() abort
-  let l:start_lnum = v:lnum
-  let l:end_lnum = v:lnum + v:count - 1
-  " Don't modify indentation or alignment if called by textwidth. We'll only
-  " let the fallback function do its thing in this case so that textwidth
-  " still performs the expected feature.
-  if mode() !~# '[iR]'
-    call puppet#format#Indention(l:start_lnum, l:end_lnum)
-    call puppet#format#Hashrocket(l:start_lnum, l:end_lnum)
-  endif
-  call puppet#format#Fallback(l:start_lnum, l:end_lnum)
-  " explicitly avoid falling back to default formatting
-  return 0
-endfunction
-
-""
-" Format hashrockets expressions in every line in range start_lnum and
-" end_lnum, both ends included
-"
-" TODO way of using AlignHashrockets function is ineffective, because it
-" formats same lines again and again, find better way to do it
-function! puppet#format#Hashrocket(start_lnum, end_lnum) abort
-  let l:lnum = a:start_lnum
-  while l:lnum <= a:end_lnum
-    call puppet#align#AlignHashrockets(l:lnum)
-    let l:lnum += 1
-  endwhile
-endfunction
-
-""
-" Format indention in every line in range start_lnum and end_lnum, both ends
-" included
-"
-function! puppet#format#Indention(start_lnum, end_lnum) abort
-  execute 'normal! ' . a:start_lnum . 'gg=' . a:end_lnum . 'gg'
-endfunction
-
-""
-" Use internal vim default autoformat method for every line in range, only
-" lines which exeed &widthline are formated
-"
-function! puppet#format#Fallback(start_lnum, end_lnum) abort
-  " We shouldn't wrap lines based on textwidth if it is disabled
-  if &textwidth == 0
-    return
-  endif
-
-  " I'm using it to check if autoformat expand range
-  let l:eof_lnum = line('$')
-  let l:lnum = a:start_lnum
-  let l:end_lnum = a:end_lnum
-
-  while l:lnum <= l:end_lnum
-    if strlen(getline(l:lnum)) > &textwidth
-      call cursor(l:lnum)
-      execute 'normal! gww'
-      " Checking if autoformat expand number of lines if yes, I will extend
-      " range too
-      if l:eof_lnum < line('$')
-        let l:end_lnum += line('$') - l:eof_lnum
-        let l:eof_lnum = line('$')
-      endif
-    endif
-    let l:lnum += 1
-  endwhile
-
-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/rubycomplete.vim

@@ -1,10 +1,11 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
-
+  
 " Vim completion script
-" Language:		Ruby
-" Maintainer:		Mark Guzman <segfault@hasno.info>
-" URL:			https://github.com/vim-ruby/vim-ruby
-" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" Language:             Ruby
+" Maintainer:           Mark Guzman <segfault@hasno.info>
+" URL:                  https://github.com/vim-ruby/vim-ruby
+" Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
+" Maintainer Version:   0.8.1
 " ----------------------------------------------------------------------------
 "
 " Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -54,23 +55,6 @@ if !exists("g:rubycomplete_include_objectspace")
 endif
 " }}} configuration failsafe initialization
 
-" {{{ regex patterns
-
-" Regex that defines the start-match for the 'end' keyword.
-let s:end_start_regex =
-      \ '\C\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
-      \ '\<\%(module\|class\|if\|for\|while\|until\|case\|unless\|begin' .
-      \   '\|\%(\K\k*[!?]\?\s\+\)\=def\):\@!\>' .
-      \ '\|\%(^\|[^.:@$]\)\@<=\<do:\@!\>'
-
-" Regex that defines the middle-match for the 'end' keyword.
-let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|elsif\):\@!\>'
-
-" Regex that defines the end-match for the 'end' keyword.
-let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
-
-" }}} regex patterns
-
 " {{{ vim-side support functions
 let s:rubycomplete_debug = 0
 
@@ -121,7 +105,7 @@ function! s:GetBufferRubyEntity( name, type, ... )
     endif
 
     let curpos = getpos(".")
-    let [enum,ecol] = searchpairpos( s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'W' )
+    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'wr' )
     call cursor(lastpos[1], lastpos[2])
 
     if lnum > enum
@@ -146,28 +130,19 @@ function! s:IsPosInClassDef(pos)
     return ret
 endfunction
 
-function! s:IsInComment(pos)
-    let stack = synstack(a:pos[0], a:pos[1])
-    if !empty(stack)
-        return synIDattr(stack[0], 'name') =~ 'ruby\%(.*Comment\|Documentation\)'
-    else
-        return 0
-    endif
-endfunction
-
 function! s:GetRubyVarType(v)
     let stopline = 1
     let vtp = ''
-    let curpos = getpos('.')
+    let pos = getpos('.')
     let sstr = '^\s*#\s*@var\s*'.escape(a:v, '*').'\>\s\+[^ \t]\+\s*$'
     let [lnum,lcol] = searchpos(sstr,'nb',stopline)
     if lnum != 0 && lcol != 0
-        call setpos('.',curpos)
+        call setpos('.',pos)
         let str = getline(lnum)
         let vtp = substitute(str,sstr,'\1','')
         return vtp
     endif
-    call setpos('.',curpos)
+    call setpos('.',pos)
     let ctors = '\(now\|new\|open\|get_instance'
     if exists('g:rubycomplete_rails') && g:rubycomplete_rails == 1 && s:rubycomplete_rails_loaded == 1
         let ctors = ctors.'\|find\|create'
@@ -177,13 +152,9 @@ function! s:GetRubyVarType(v)
 
     let fstr = '=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%[xwQqr][(\[{@]\|[A-Za-z0-9@:\-()\.]\+...\?\|lambda\|&\)'
     let sstr = ''.escape(a:v, '*').'\>\s*[+\-*/]*'.fstr
-    let pos = searchpos(sstr,'bW')
-    while pos != [0,0] && s:IsInComment(pos)
-        let pos = searchpos(sstr,'bW')
-    endwhile
-    if pos != [0,0]
-        let [lnum, col] = pos
-        let str = matchstr(getline(lnum),fstr,col)
+    let [lnum,lcol] = searchpos(sstr,'nb',stopline)
+    if lnum != 0 && lcol != 0
+        let str = matchstr(getline(lnum),fstr,lcol)
         let str = substitute(str,'^=\s*','','')
 
         call setpos('.',pos)
@@ -205,7 +176,7 @@ function! s:GetRubyVarType(v)
         end
         return ''
     endif
-    call setpos('.',curpos)
+    call setpos('.',pos)
     return ''
 endfunction
 
@@ -227,7 +198,7 @@ function! rubycomplete#Complete(findstart, base)
             if c =~ '\w'
                 continue
             elseif ! c =~ '\.'
-                let idx = -1
+                idx = -1
                 break
             else
                 break
@@ -284,27 +255,15 @@ class VimRubyCompletion
 
 # {{{ buffer analysis magic
   def load_requires
-
-    custom_paths = VIM::evaluate("get(g:, 'rubycomplete_load_paths', [])")
-
-    if !custom_paths.empty?
-      $LOAD_PATH.concat(custom_paths).uniq!
-    end
-
     buf = VIM::Buffer.current
     enum = buf.line_number
     nums = Range.new( 1, enum )
     nums.each do |x|
-
       ln = buf[x]
       begin
-        if /.*require_relative\s*(.*)$/.match( ln )
-          eval( "require %s" % File.expand_path($1) )
-        elsif /.*require\s*(["'].*?["'])/.match( ln )
-          eval( "require %s" % $1 )
-        end
-      rescue Exception => e
-        dprint e.inspect
+        eval( "require %s" % $1 ) if /.*require\s*(.*)$/.match( ln )
+      rescue Exception
+        #ignore?
       end
     end
   end
@@ -387,13 +346,8 @@ class VimRubyCompletion
         if x != cur_line
           next if x == 0
           ln = buf[x]
-          is_const = false
-          if /^\s*(module|class|def|include)\s+/.match(ln) || is_const = /^\s*?[A-Z]([A-z]|[1-9])*\s*?[|]{0,2}=\s*?.+\s*?/.match(ln)
-            clscnt += 1 if /class|module/.match($1)
-            # We must make sure to load each constant only once to avoid errors
-            if is_const
-                ln.gsub!(/\s*?[|]{0,2}=\s*?/, '||=')
-            end
+          if /^\s*(module|class|def|include)\s+/.match(ln)
+            clscnt += 1 if $1 == "class"
             #dprint "\$1$1
             classdef += "%s\n" % ln
             classdef += "end\n" if /def\s+/.match(ln)
@@ -471,6 +425,7 @@ class VimRubyCompletion
     return get_buffer_entity_list( "class" )
   end
 
+
   def load_rails
     allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
     return if allow_rails.to_i.zero?
@@ -576,6 +531,7 @@ class VimRubyCompletion
         ret += ActiveRecord::ConnectionAdapters::SchemaStatements.methods
     end
 
+
     return ret
   end
 
@@ -633,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
@@ -660,6 +614,7 @@ class VimRubyCompletion
 
     want_gems = VIM::evaluate("get(g:, 'rubycomplete_load_gemfile')")
     load_gems unless want_gems.to_i.zero?
+    
 
     input = VIM::Buffer.current.line
     cpos = VIM::Window.current.cursor[1] - 1
@@ -702,25 +657,25 @@ class VimRubyCompletion
           methods.delete_if { |c| c.match( /'/ ) }
         end
 
-      when /^::([A-Z][^:\.\(]*)?$/ # Absolute Constant or class methods
+      when /^::([A-Z][^:\.\(]*)$/ # Absolute Constant or class methods
         dprint "const or cls"
         receiver = $1
-        methods = Object.constants.collect{ |c| c.to_s }.grep(/^#{receiver}/)
+        methods = Object.constants
+        methods.grep(/^#{receiver}/).collect{|e| "::" + e}
 
       when /^(((::)?[A-Z][^:.\(]*)+?)::?([^:.]*)$/ # Constant or class methods
         receiver = $1
         message = Regexp.quote($4)
         dprint "const or cls 2 [recv: \'%s\', msg: \'%s\']" % [ receiver, message ]
         load_buffer_class( receiver )
-        load_buffer_module( receiver )
         begin
-          constants = eval("#{receiver}.constants").collect{ |c| c.to_s }.grep(/^#{message}/)
-          methods = eval("#{receiver}.methods").collect{ |m| m.to_s }.grep(/^#{message}/)
+          classes = eval("#{receiver}.constants")
+          #methods = eval("#{receiver}.methods")
         rescue Exception
           dprint "exception: %s" % $!
-          constants = []
           methods = []
         end
+        methods.grep(/^#{message}/).collect{|e| receiver + "::" + e}
 
       when /^(:[^:.]+)\.([^.]*)$/ # Symbol
         dprint "symbol"
@@ -833,6 +788,7 @@ class VimRubyCompletion
       methods += Kernel.public_methods
     end
 
+
     include_object = VIM::evaluate("exists('g:rubycomplete_include_object') && g:rubycomplete_include_object")
     methods = clean_sel( methods, message )
     methods = (methods-Object.instance_methods) if include_object == "0"
@@ -875,6 +831,7 @@ let s:rubycomplete_rails_loaded = 0
 call s:DefRuby()
 "}}} ruby-side code
 
+
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
 
 endif

autoload/rust.vim

@@ -1,260 +1,208 @@
 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
-
-function! rust#Load()
-    " Utility call to get this script loaded, for debugging
-endfunction
-
-function! rust#GetConfigVar(name, default)
-    " Local buffer variable with same name takes predeence over global
-    if has_key(b:, a:name)
-        return get(b:, a:name)
-    endif
-    if has_key(g:, a:name)
-        return get(g:, a:name)
-    endif
-    return a:default
-endfunction
-
-" Include expression {{{1
-
-function! rust#IncludeExpr(fname) abort
-    " Remove leading 'crate::' to deal with 2018 edition style 'use'
-    " statements
-    let l:fname = substitute(a:fname, '^crate::', '', '')
-
-    " Remove trailing colons arising from lines like
-    "
-    "     use foo::{Bar, Baz};
-    let l:fname = substitute(l:fname, ':\+$', '', '')
-
-    " Replace '::' with '/'
-    let l:fname = substitute(l:fname, '::', '/', 'g')
-
-    " When we have
-    "
-    "    use foo::bar::baz;
-    "
-    " we can't tell whether baz is a module or a function; and we can't tell
-    " which modules correspond to files.
-    "
-    " So we work our way up, trying
-    "
-    "     foo/bar/baz.rs
-    "     foo/bar.rs
-    "     foo.rs
-    while l:fname !=# '.'
-        let l:path = findfile(l:fname)
-        if !empty(l:path)
-            return l:fname
-        endif
-        let l:fname = fnamemodify(l:fname, ':h')
-    endwhile
-    return l:fname
-endfunction
 
 " Jump {{{1
 
 function! rust#Jump(mode, function) range
-    let cnt = v:count1
-    normal! m'
-    if a:mode ==# 'v'
-        norm! gv
-    endif
-    let foldenable = &foldenable
-    set nofoldenable
-    while cnt > 0
-        execute "call <SID>Jump_" . a:function . "()"
-        let cnt = cnt - 1
-    endwhile
-    let &foldenable = foldenable
+	let cnt = v:count1
+	normal! m'
+	if a:mode ==# 'v'
+		norm! gv
+	endif
+	let foldenable = &foldenable
+	set nofoldenable
+	while cnt > 0
+		execute "call <SID>Jump_" . a:function . "()"
+		let cnt = cnt - 1
+	endwhile
+	let &foldenable = foldenable
 endfunction
 
 function! s:Jump_Back()
-    call search('{', 'b')
-    keepjumps normal! w99[{
+	call search('{', 'b')
+	keepjumps normal! w99[{
 endfunction
 
 function! s:Jump_Forward()
-    normal! j0
-    call search('{', 'b')
-    keepjumps normal! w99[{%
-    call search('{')
+	normal! j0
+	call search('{', 'b')
+	keepjumps normal! w99[{%
+	call search('{')
 endfunction
 
 " Run {{{1
 
 function! rust#Run(bang, args)
-    let args = s:ShellTokenize(a:args)
-    if a:bang
-        let idx = index(l:args, '--')
-        if idx != -1
-            let rustc_args = idx == 0 ? [] : l:args[:idx-1]
-            let args = l:args[idx+1:]
-        else
-            let rustc_args = l:args
-            let args = []
-        endif
-    else
-        let rustc_args = []
-    endif
+	let args = s:ShellTokenize(a:args)
+	if a:bang
+		let idx = index(l:args, '--')
+		if idx != -1
+			let rustc_args = idx == 0 ? [] : l:args[:idx-1]
+			let args = l:args[idx+1:]
+		else
+			let rustc_args = l:args
+			let args = []
+		endif
+	else
+		let rustc_args = []
+	endif
 
-    let b:rust_last_rustc_args = l:rustc_args
-    let b:rust_last_args = l:args
+	let b:rust_last_rustc_args = l:rustc_args
+	let b:rust_last_args = l:args
 
-    call s:WithPath(function("s:Run"), rustc_args, args)
+	call s:WithPath(function("s:Run"), rustc_args, args)
 endfunction
 
 function! s:Run(dict, rustc_args, args)
-    let exepath = a:dict.tmpdir.'/'.fnamemodify(a:dict.path, ':t:r')
-    if has('win32')
-        let exepath .= '.exe'
-    endif
+	let exepath = a:dict.tmpdir.'/'.fnamemodify(a:dict.path, ':t:r')
+	if has('win32')
+		let exepath .= '.exe'
+	endif
 
-    let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-    let rustc_args = [relpath, '-o', exepath] + a:rustc_args
+	let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
+	let rustc_args = [relpath, '-o', exepath] + a:rustc_args
 
-    let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+	let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
 
-    let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-    let output = s:system(pwd, shellescape(rustc) . " " . join(map(rustc_args, 'shellescape(v:val)')))
-    if output !=# ''
-        echohl WarningMsg
-        echo output
-        echohl None
-    endif
-    if !v:shell_error
-        exe '!' . shellescape(exepath) . " " . join(map(a:args, 'shellescape(v:val)'))
-    endif
+	let pwd = a:dict.istemp ? a:dict.tmpdir : ''
+	let output = s:system(pwd, shellescape(rustc) . " " . join(map(rustc_args, 'shellescape(v:val)')))
+	if output != ''
+		echohl WarningMsg
+		echo output
+		echohl None
+	endif
+	if !v:shell_error
+		exe '!' . shellescape(exepath) . " " . join(map(a:args, 'shellescape(v:val)'))
+	endif
 endfunction
 
 " Expand {{{1
 
 function! rust#Expand(bang, args)
-    let args = s:ShellTokenize(a:args)
-    if a:bang && !empty(l:args)
-        let pretty = remove(l:args, 0)
-    else
-        let pretty = "expanded"
-    endif
-    call s:WithPath(function("s:Expand"), pretty, args)
+	let args = s:ShellTokenize(a:args)
+	if a:bang && !empty(l:args)
+		let pretty = remove(l:args, 0)
+	else
+		let pretty = "expanded"
+	endif
+	call s:WithPath(function("s:Expand"), pretty, args)
 endfunction
 
 function! s:Expand(dict, pretty, args)
-    try
-        let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+	try
+		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
 
-        if a:pretty =~? '^\%(everybody_loops$\|flowgraph=\)'
-            let flag = '--xpretty'
-        else
-            let flag = '--pretty'
-        endif
-        let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-        let args = [relpath, '-Z', 'unstable-options', l:flag, a:pretty] + a:args
-        let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-        let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-        if v:shell_error
-            echohl WarningMsg
-            echo output
-            echohl None
-        else
-            new
-            silent put =output
-            1
-            d
-            setl filetype=rust
-            setl buftype=nofile
-            setl bufhidden=hide
-            setl noswapfile
-            " give the buffer a nice name
-            let suffix = 1
-            let basename = fnamemodify(a:dict.path, ':t:r')
-            while 1
-                let bufname = basename
-                if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-                let bufname .= '.pretty.rs'
-                if bufexists(bufname)
-                    let suffix += 1
-                    continue
-                endif
-                exe 'silent noautocmd keepalt file' fnameescape(bufname)
-                break
-            endwhile
-        endif
-    endtry
+		if a:pretty =~? '^\%(everybody_loops$\|flowgraph=\)'
+			let flag = '--xpretty'
+		else
+			let flag = '--pretty'
+		endif
+		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
+		let args = [relpath, '-Z', 'unstable-options', l:flag, a:pretty] + a:args
+		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
+		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
+		if v:shell_error
+			echohl WarningMsg
+			echo output
+			echohl None
+		else
+			new
+			silent put =output
+			1
+			d
+			setl filetype=rust
+			setl buftype=nofile
+			setl bufhidden=hide
+			setl noswapfile
+			" give the buffer a nice name
+			let suffix = 1
+			let basename = fnamemodify(a:dict.path, ':t:r')
+			while 1
+				let bufname = basename
+				if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
+				let bufname .= '.pretty.rs'
+				if bufexists(bufname)
+					let suffix += 1
+					continue
+				endif
+				exe 'silent noautocmd keepalt file' fnameescape(bufname)
+				break
+			endwhile
+		endif
+	endtry
 endfunction
 
 function! rust#CompleteExpand(lead, line, pos)
-    if a:line[: a:pos-1] =~# '^RustExpand!\s*\S*$'
-        " first argument and it has a !
-        let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph=", "everybody_loops"]
-        if !empty(a:lead)
-            call filter(list, "v:val[:len(a:lead)-1] == a:lead")
-        endif
-        return list
-    endif
+	if a:line[: a:pos-1] =~ '^RustExpand!\s*\S*$'
+		" first argument and it has a !
+		let list = ["normal", "expanded", "typed", "expanded,identified", "flowgraph=", "everybody_loops"]
+		if !empty(a:lead)
+			call filter(list, "v:val[:len(a:lead)-1] == a:lead")
+		endif
+		return list
+	endif
 
-    return glob(escape(a:lead, "*?[") . '*', 0, 1)
+	return glob(escape(a:lead, "*?[") . '*', 0, 1)
 endfunction
 
 " Emit {{{1
 
 function! rust#Emit(type, args)
-    let args = s:ShellTokenize(a:args)
-    call s:WithPath(function("s:Emit"), a:type, args)
+	let args = s:ShellTokenize(a:args)
+	call s:WithPath(function("s:Emit"), a:type, args)
 endfunction
 
 function! s:Emit(dict, type, args)
-    try
-        let output_path = a:dict.tmpdir.'/output'
+	try
+		let output_path = a:dict.tmpdir.'/output'
 
-        let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
+		let rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
 
-        let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
-        let args = [relpath, '--emit', a:type, '-o', output_path] + a:args
-        let pwd = a:dict.istemp ? a:dict.tmpdir : ''
-        let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
-        if output !=# ''
-            echohl WarningMsg
-            echo output
-            echohl None
-        endif
-        if !v:shell_error
-            new
-            exe 'silent keepalt read' fnameescape(output_path)
-            1
-            d
-            if a:type ==# "llvm-ir"
-                setl filetype=llvm
-                let extension = 'll'
-            elseif a:type ==# "asm"
-                setl filetype=asm
-                let extension = 's'
-            endif
-            setl buftype=nofile
-            setl bufhidden=hide
-            setl noswapfile
-            if exists('l:extension')
-                " give the buffer a nice name
-                let suffix = 1
-                let basename = fnamemodify(a:dict.path, ':t:r')
-                while 1
-                    let bufname = basename
-                    if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
-                    let bufname .= '.'.extension
-                    if bufexists(bufname)
-                        let suffix += 1
-                        continue
-                    endif
-                    exe 'silent noautocmd keepalt file' fnameescape(bufname)
-                    break
-                endwhile
-            endif
-        endif
-    endtry
+		let relpath = get(a:dict, 'tmpdir_relpath', a:dict.path)
+		let args = [relpath, '--emit', a:type, '-o', output_path] + a:args
+		let pwd = a:dict.istemp ? a:dict.tmpdir : ''
+		let output = s:system(pwd, shellescape(rustc) . " " . join(map(args, 'shellescape(v:val)')))
+		if output != ''
+			echohl WarningMsg
+			echo output
+			echohl None
+		endif
+		if !v:shell_error
+			new
+			exe 'silent keepalt read' fnameescape(output_path)
+			1
+			d
+			if a:type == "llvm-ir"
+				setl filetype=llvm
+				let extension = 'll'
+			elseif a:type == "asm"
+				setl filetype=asm
+				let extension = 's'
+			endif
+			setl buftype=nofile
+			setl bufhidden=hide
+			setl noswapfile
+			if exists('l:extension')
+				" give the buffer a nice name
+				let suffix = 1
+				let basename = fnamemodify(a:dict.path, ':t:r')
+				while 1
+					let bufname = basename
+					if suffix > 1 | let bufname .= ' ('.suffix.')' | endif
+					let bufname .= '.'.extension
+					if bufexists(bufname)
+						let suffix += 1
+						continue
+					endif
+					exe 'silent noautocmd keepalt file' fnameescape(bufname)
+					break
+				endwhile
+			endif
+		endif
+	endtry
 endfunction
 
 " Utility functions {{{1
@@ -272,154 +220,145 @@ endfunction
 " existing path of the current buffer. If the path is inside of {dict.tmpdir}
 " then it is guaranteed to have a '.rs' extension.
 function! s:WithPath(func, ...)
-    let buf = bufnr('')
-    let saved = {}
-    let dict = {}
-    try
-        let saved.write = &write
-        set write
-        let dict.path = expand('%')
-        let pathisempty = empty(dict.path)
+	let buf = bufnr('')
+	let saved = {}
+	let dict = {}
+	try
+		let saved.write = &write
+		set write
+		let dict.path = expand('%')
+		let pathisempty = empty(dict.path)
 
-        " Always create a tmpdir in case the wrapped command wants it
-        let dict.tmpdir = tempname()
-        call mkdir(dict.tmpdir)
+		" Always create a tmpdir in case the wrapped command wants it
+		let dict.tmpdir = tempname()
+		call mkdir(dict.tmpdir)
 
-        if pathisempty || !saved.write
-            let dict.istemp = 1
-            " if we're doing this because of nowrite, preserve the filename
-            if !pathisempty
-                let filename = expand('%:t:r').".rs"
-            else
-                let filename = 'unnamed.rs'
-            endif
-            let dict.tmpdir_relpath = filename
-            let dict.path = dict.tmpdir.'/'.filename
+		if pathisempty || !saved.write
+			let dict.istemp = 1
+			" if we're doing this because of nowrite, preserve the filename
+			if !pathisempty
+				let filename = expand('%:t:r').".rs"
+			else
+				let filename = 'unnamed.rs'
+			endif
+			let dict.tmpdir_relpath = filename
+			let dict.path = dict.tmpdir.'/'.filename
 
-            let saved.mod = &modified
-            set nomodified
+			let saved.mod = &mod
+			set nomod
 
-            silent exe 'keepalt write! ' . fnameescape(dict.path)
-            if pathisempty
-                silent keepalt 0file
-            endif
-        else
-            let dict.istemp = 0
-            update
-        endif
+			silent exe 'keepalt write! ' . fnameescape(dict.path)
+			if pathisempty
+				silent keepalt 0file
+			endif
+		else
+			let dict.istemp = 0
+			update
+		endif
 
-        call call(a:func, [dict] + a:000)
-    finally
-        if bufexists(buf)
-            for [opt, value] in items(saved)
-                silent call setbufvar(buf, '&'.opt, value)
-                unlet value " avoid variable type mismatches
-            endfor
-        endif
-        if has_key(dict, 'tmpdir') | silent call s:RmDir(dict.tmpdir) | endif
-    endtry
+		call call(a:func, [dict] + a:000)
+	finally
+		if bufexists(buf)
+			for [opt, value] in items(saved)
+				silent call setbufvar(buf, '&'.opt, value)
+				unlet value " avoid variable type mismatches
+			endfor
+		endif
+		if has_key(dict, 'tmpdir') | silent call s:RmDir(dict.tmpdir) | endif
+	endtry
 endfunction
 
 function! rust#AppendCmdLine(text)
-    call setcmdpos(getcmdpos())
-    let cmd = getcmdline() . a:text
-    return cmd
+	call setcmdpos(getcmdpos())
+	let cmd = getcmdline() . a:text
+	return cmd
 endfunction
 
 " Tokenize the string according to sh parsing rules
 function! s:ShellTokenize(text)
-    " states:
-    " 0: start of word
-    " 1: unquoted
-    " 2: unquoted backslash
-    " 3: double-quote
-    " 4: double-quoted backslash
-    " 5: single-quote
-    let l:state = 0
-    let l:current = ''
-    let l:args = []
-    for c in split(a:text, '\zs')
-        if l:state == 0 || l:state == 1 " unquoted
-            if l:c ==# ' '
-                if l:state == 0 | continue | endif
-                call add(l:args, l:current)
-                let l:current = ''
-                let l:state = 0
-            elseif l:c ==# '\'
-                let l:state = 2
-            elseif l:c ==# '"'
-                let l:state = 3
-            elseif l:c ==# "'"
-                let l:state = 5
-            else
-                let l:current .= l:c
-                let l:state = 1
-            endif
-        elseif l:state == 2 " unquoted backslash
-            if l:c !=# "\n" " can it even be \n?
-                let l:current .= l:c
-            endif
-            let l:state = 1
-        elseif l:state == 3 " double-quote
-            if l:c ==# '\'
-                let l:state = 4
-            elseif l:c ==# '"'
-                let l:state = 1
-            else
-                let l:current .= l:c
-            endif
-        elseif l:state == 4 " double-quoted backslash
-            if stridx('$`"\', l:c) >= 0
-                let l:current .= l:c
-            elseif l:c ==# "\n" " is this even possible?
-                " skip it
-            else
-                let l:current .= '\'.l:c
-            endif
-            let l:state = 3
-        elseif l:state == 5 " single-quoted
-            if l:c ==# "'"
-                let l:state = 1
-            else
-                let l:current .= l:c
-            endif
-        endif
-    endfor
-    if l:state != 0
-        call add(l:args, l:current)
-    endif
-    return l:args
+	" states:
+	" 0: start of word
+	" 1: unquoted
+	" 2: unquoted backslash
+	" 3: double-quote
+	" 4: double-quoted backslash
+	" 5: single-quote
+	let l:state = 0
+	let l:current = ''
+	let l:args = []
+	for c in split(a:text, '\zs')
+		if l:state == 0 || l:state == 1 " unquoted
+			if l:c ==# ' '
+				if l:state == 0 | continue | endif
+				call add(l:args, l:current)
+				let l:current = ''
+				let l:state = 0
+			elseif l:c ==# '\'
+				let l:state = 2
+			elseif l:c ==# '"'
+				let l:state = 3
+			elseif l:c ==# "'"
+				let l:state = 5
+			else
+				let l:current .= l:c
+				let l:state = 1
+			endif
+		elseif l:state == 2 " unquoted backslash
+			if l:c !=# "\n" " can it even be \n?
+				let l:current .= l:c
+			endif
+			let l:state = 1
+		elseif l:state == 3 " double-quote
+			if l:c ==# '\'
+				let l:state = 4
+			elseif l:c ==# '"'
+				let l:state = 1
+			else
+				let l:current .= l:c
+			endif
+		elseif l:state == 4 " double-quoted backslash
+			if stridx('$`"\', l:c) >= 0
+				let l:current .= l:c
+			elseif l:c ==# "\n" " is this even possible?
+				" skip it
+			else
+				let l:current .= '\'.l:c
+			endif
+			let l:state = 3
+		elseif l:state == 5 " single-quoted
+			if l:c == "'"
+				let l:state = 1
+			else
+				let l:current .= l:c
+			endif
+		endif
+	endfor
+	if l:state != 0
+		call add(l:args, l:current)
+	endif
+	return l:args
 endfunction
 
 function! s:RmDir(path)
-    " sanity check; make sure it's not empty, /, or $HOME
-    if empty(a:path)
-        echoerr 'Attempted to delete empty path'
-        return 0
-    elseif a:path ==# '/' || a:path ==# $HOME
-        let l:path = expand(a:path)
-        if l:path ==# '/' || l:path ==# $HOME
-            echoerr 'Attempted to delete protected path: ' . a:path
-            return 0
-        endif
-    endif
-
-    if !isdirectory(a:path)
-        return 0
-    endif
-
-    " delete() returns 0 when removing file successfully
-    return delete(a:path, 'rf') == 0
+	" sanity check; make sure it's not empty, /, or $HOME
+	if empty(a:path)
+		echoerr 'Attempted to delete empty path'
+		return 0
+	elseif a:path == '/' || a:path == $HOME
+		echoerr 'Attempted to delete protected path: ' . a:path
+		return 0
+	endif
+	return system("rm -rf " . shellescape(a:path))
 endfunction
 
 " Executes {cmd} with the cwd set to {pwd}, without changing Vim's cwd.
 " If {pwd} is the empty string then it doesn't change the cwd.
 function! s:system(pwd, cmd)
-    let cmd = a:cmd
-    if !empty(a:pwd)
-        let cmd = 'cd ' . shellescape(a:pwd) . ' && ' . cmd
-    endif
-    return system(cmd)
+	let cmd = a:cmd
+	if !empty(a:pwd)
+		let cmd = 'cd ' . shellescape(a:pwd) . ' && ' . cmd
+	endif
+	return system(cmd)
 endfunction
 
 " Playpen Support {{{1
@@ -427,141 +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 url = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
+  let body = l:rust_playpen_url."?code=".webapi#http#encodeURI(content)
 
-    if strlen(url) > 5000
-        echohl ErrorMsg | echomsg 'Buffer too large, max 5000 encoded characters ('.strlen(url).')' | 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(url)
-    let res = webapi#http#post(l:rust_shortener_url.'create.php', payload, {})
-    if res.status[0] ==# '2'
-        let url = res.content
-    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 footer = ''
-    if exists('g:rust_clip_command')
-        call system(g:rust_clip_command, url)
-        if !v:shell_error
-            let footer = ' (copied to clipboard)'
-        endif
-    endif
-    redraw | echomsg 'Done: '.url.footer
-endfunction
-
-" Run a test under the cursor or all tests {{{1
-
-" Finds a test function name under the cursor. Returns empty string when a
-" test function is not found.
-function! s:SearchTestFunctionNameUnderCursor() abort
-    let cursor_line = line('.')
-
-    " Find #[test] attribute
-    if search('\m\C#\[test\]', 'bcW') is 0
-        return ''
-    endif
-
-    " Move to an opening brace of the test function
-    let test_func_line = search('\m\C^\s*fn\s\+\h\w*\s*(.\+{$', 'eW')
-    if test_func_line is 0
-        return ''
-    endif
-
-    " Search the end of test function (closing brace) to ensure that the
-    " cursor position is within function definition
-    normal! %
-    if line('.') < cursor_line
-        return ''
-    endif
-
-    return matchstr(getline(test_func_line), '\m\C^\s*fn\s\+\zs\h\w*')
-endfunction
-
-function! rust#Test(mods, winsize, all, options) abort
-    let manifest = findfile('Cargo.toml', expand('%:p:h') . ';')
-    if manifest ==# ''
-        return rust#Run(1, '--test ' . a:options)
-    endif
-
-    " <count> defaults to 0, but we prefer an empty string
-    let winsize = a:winsize ? a:winsize : ''
-
-    if has('terminal')
-        if has('patch-8.0.910')
-            let cmd = printf('%s noautocmd %snew | terminal ++curwin ', a:mods, winsize)
-        else
-            let cmd = printf('%s terminal ', a:mods)
-        endif
-    elseif has('nvim')
-        let cmd = printf('%s noautocmd %snew | terminal ', a:mods, winsize)
-    else
-        let cmd = '!'
-        let manifest = shellescape(manifest)
-    endif
-
-    if a:all
-        if a:options ==# ''
-            execute cmd . 'cargo test --manifest-path' manifest
-        else
-            execute cmd . 'cargo test --manifest-path' manifest a:options
-        endif
-        return
-    endif
-
-    let saved = getpos('.')
-    try
-        let func_name = s:SearchTestFunctionNameUnderCursor()
-        if func_name ==# ''
-            echohl ErrorMsg
-            echomsg 'No test function was found under the cursor. Please add ! to command if you want to run all tests'
-            echohl None
-            return
-        endif
-        if a:options ==# ''
-            execute cmd . 'cargo test --manifest-path' manifest func_name
-        else
-            execute cmd . 'cargo test --manifest-path' manifest func_name a:options
-        endif
-        return
-    finally
-        call setpos('.', saved)
-    endtry
+  redraw | echomsg 'Done: '.url
 endfunction
 
 " }}}1
 
-" vim: set et sw=4 sts=4 ts=8:
+" vim: set noet sw=4 ts=4:
 
 endif

autoload/rust/debugging.vim

@@ -1,107 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-" For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
-
-let s:global_variable_list = [
-            \ '_rustfmt_autosave_because_of_config',
-            \ 'ftplugin_rust_source_path',
-            \ 'loaded_syntastic_rust_cargo_checker',
-            \ 'loaded_syntastic_rust_filetype',
-            \ 'loaded_syntastic_rust_rustc_checker',
-            \ 'rust_bang_comment_leader',
-            \ 'rust_cargo_avoid_whole_workspace',
-            \ 'rust_clip_command',
-            \ 'rust_conceal',
-            \ 'rust_conceal_mod_path',
-            \ 'rust_conceal_pub',
-            \ 'rust_fold',
-            \ 'rust_last_args',
-            \ 'rust_last_rustc_args',
-            \ 'rust_original_delimitMate_excluded_regions',
-            \ 'rust_playpen_url',
-            \ 'rust_prev_delimitMate_quotes',
-            \ 'rust_recent_nearest_cargo_tol',
-            \ 'rust_recent_root_cargo_toml',
-            \ 'rust_recommended_style',
-            \ 'rust_set_conceallevel',
-            \ 'rust_set_conceallevel=1',
-            \ 'rust_set_foldmethod',
-            \ 'rust_set_foldmethod=1',
-            \ 'rust_shortener_url',
-            \ 'rustc_makeprg_no_percent',
-            \ 'rustc_path',
-            \ 'rustfmt_autosave',
-            \ 'rustfmt_autosave_if_config_present',
-            \ 'rustfmt_command',
-            \ 'rustfmt_emit_files',
-            \ 'rustfmt_fail_silently',
-            \ 'rustfmt_options',
-            \ 'syntastic_extra_filetypes',
-            \ 'syntastic_rust_cargo_fname',
-            \]
-
-function! s:Echo(message) abort
-    execute 'echo a:message'
-endfunction
-
-function! s:EchoGlobalVariables() abort
-    for l:key in s:global_variable_list
-        if l:key !~# '^_'
-            call s:Echo('let g:' . l:key . ' = ' . string(get(g:, l:key, v:null)))
-        endif
-
-        if has_key(b:, l:key)
-            call s:Echo('let b:' . l:key . ' = ' . string(b:[l:key]))
-        endif
-    endfor
-endfunction
-
-function! rust#debugging#Info() abort
-    call cargo#Load()
-    call rust#Load()
-    call rustfmt#Load()
-    call s:Echo('rust.vim Global Variables:')
-    call s:Echo('')
-    call s:EchoGlobalVariables()
-
-    silent let l:output = system(g:rustfmt_command . ' --version')
-    echo l:output
-
-    let l:rustc = exists("g:rustc_path") ? g:rustc_path : "rustc"
-    silent let l:output = system(l:rustc . ' --version')
-    echo l:output
-
-    silent let l:output = system('cargo --version')
-    echo l:output
-
-    version
-
-    if exists(":SyntasticInfo")
-        echo "----"
-        echo "Info from Syntastic:"
-        execute "SyntasticInfo"
-    endif
-endfunction
-
-function! rust#debugging#InfoToClipboard() abort
-    redir @"
-    silent call rust#debugging#Info()
-    redir END
-
-    call s:Echo('RustInfo copied to your clipboard')
-endfunction
-
-function! rust#debugging#InfoToFile(filename) abort
-    let l:expanded_filename = expand(a:filename)
-
-    redir => l:output
-    silent call rust#debugging#Info()
-    redir END
-
-    call writefile(split(l:output, "\n"), l:expanded_filename)
-    call s:Echo('RustInfo written to ' . l:expanded_filename)
-endfunction
-
-" vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/rust/delimitmate.vim

@@ -1,48 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
-
-" For this buffer, when delimitMate issues the `User delimitMate_map`
-" event in the autocommand system, add the above-defined extra excluded
-" regions to delimitMate's state, if they have not already been added.
-function! rust#delimitmate#onMap() abort
-    if &filetype !=# 'rust'
-        return
-    endif
-
-    if get(b:, "delimitMate_quotes")
-        let b:rust_prev_delimitMate_quotes = b:delimitMate_quotes
-    endif
-    let b:delimitMate_quotes = "\" `"
-
-    if match(delimitMate#Get("excluded_regions"),
-                \ s:delimitMate_extra_excluded_regions) == -1
-        call delimitMate#Set("excluded_regions",
-                    \delimitMate#Get("excluded_regions").s:delimitMate_extra_excluded_regions)
-    endif
-endfunction
-
-" For this buffer, when delimitMate issues the `User delimitMate_unmap`
-" event in the autocommand system, delete the above-defined extra excluded
-" regions from delimitMate's state (the deletion being idempotent and
-" having no effect if the extra excluded regions are not present in the
-" targeted part of delimitMate's state).
-function! rust#delimitmate#onUnmap() abort
-    if &filetype !=# 'rust'
-        return
-    endif
-
-    if get(b:, "rust_prev_delimitMate_quotes")
-        let b:delimitMate_quotes = b:rust_prev_delimitMate_quotes
-    endif
-
-    call delimitMate#Set("excluded_regions", substitute(
-               \ delimitMate#Get("excluded_regions"),
-               \ '\C\V' . s:delimitMate_extra_excluded_regions,
-               \ '', 'g'))
-endfunction
-
-" vim: set et sw=4 sts=4 ts=8:
-
-
-endif

autoload/rust/tags.vim

@@ -1,22 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
-
-" Tagbar support code, for the sake of not automatically overriding its
-" configuration in case Universal Ctags is detected.
-
-let s:ctags_is_uctags = 0
-let s:checked_ctags = 0
-
-function! rust#tags#IsUCtags() abort
-    if s:checked_ctags == 0
-        let l:ctags_bin = get(g:, 'tagbar_ctags_bin', 'ctags')
-        if system(l:ctags_bin.' --version') =~? 'universal ctags'
-            let s:ctags_is_uctags = 1
-        endif
-        let s:checked_ctags = 1
-    endif
-    return s:ctags_is_uctags
-endfunction
-
-" vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/rustfmt.vim

@@ -1,12 +1,11 @@
 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")
@@ -14,255 +13,75 @@ if !exists("g:rustfmt_command")
 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
-endif
-
-function! rustfmt#DetectVersion()
-    " Save rustfmt '--help' for feature inspection
-    silent let s:rustfmt_help = system(g:rustfmt_command . " --help")
-    let s:rustfmt_unstable_features = s:rustfmt_help =~# "--unstable-features"
-
-    " Build a comparable rustfmt version varible out of its `--version` output:
-    silent let l:rustfmt_version_full = system(g:rustfmt_command . " --version")
-    let l:rustfmt_version_list = matchlist(l:rustfmt_version_full,
-        \    '\vrustfmt ([0-9]+[.][0-9]+[.][0-9]+)')
-    if len(l:rustfmt_version_list) < 3
-        let s:rustfmt_version = "0"
-    else
-        let s:rustfmt_version = l:rustfmt_version_list[1]
-    endif
-    return s:rustfmt_version
-endfunction
-
-call rustfmt#DetectVersion()
-
-if !exists("g:rustfmt_emit_files")
-    let g:rustfmt_emit_files = s:rustfmt_version >= "0.8.2"
-endif
-
-if !exists("g:rustfmt_file_lines")
-    let g:rustfmt_file_lines = s:rustfmt_help =~# "--file-lines JSON"
+  let g:rustfmt_fail_silently = 0
 endif
 
 let s:got_fmt_error = 0
 
-function! rustfmt#Load()
-    " Utility call to get this script loaded, for debugging
-endfunction
-
-function! s:RustfmtWriteMode()
-    if g:rustfmt_emit_files
-        return "--emit=files"
-    else
-        return "--write-mode=overwrite"
-    endif
-endfunction
-
-function! s:RustfmtConfig()
-    let l:rustfmt_toml = findfile('rustfmt.toml', expand('%:p:h') . ';')
-    if l:rustfmt_toml !=# ''
-        return '--config-path '.l:rustfmt_toml
-    endif
-
-    let l:_rustfmt_toml = findfile('.rustfmt.toml', expand('%:p:h') . ';')
-    if l:_rustfmt_toml !=# ''
-        return '--config-path '.l:_rustfmt_toml
-    endif
-
-    return ''
-endfunction
-
-function! s:RustfmtCommandRange(filename, line1, line2)
-    if g:rustfmt_file_lines == 0
-        echo "--file-lines is not supported in the installed `rustfmt` executable"
-        return
-    endif
-
-    let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
-    let l:write_mode = s:RustfmtWriteMode()
-    let l:rustfmt_config = s:RustfmtConfig()
-
-    " FIXME: When --file-lines gets to be stable, add version range checking
-    " accordingly.
-    let l:unstable_features = s:rustfmt_unstable_features ? '--unstable-features' : ''
-
-    let l:cmd = printf("%s %s %s %s %s --file-lines '[%s]' %s", g:rustfmt_command,
-                \ l:write_mode, g:rustfmt_options,
-                \ l:unstable_features, l:rustfmt_config,
-                \ json_encode(l:arg), shellescape(a:filename))
-    return l:cmd
-endfunction
-
-function! s:RustfmtCommand()
-    if g:rustfmt_emit_files
-        let l:write_mode = "--emit=stdout"
-    else
-        let l:write_mode = "--write-mode=display"
-    endif
-    " rustfmt will pick on the right config on its own due to the
-    " current directory change.
-    return g:rustfmt_command . " ". l:write_mode . " " . g:rustfmt_options
-endfunction
-
-function! s:DeleteLines(start, end) abort
-    silent! execute a:start . ',' . a:end . 'delete _'
-endfunction
-
-function! s:RunRustfmt(command, tmpname, from_writepre)
-    mkview!
-
-    let l:stderr_tmpname = tempname()
-    call writefile([], l:stderr_tmpname)
-
-    let l:command = a:command . ' 2> ' . l:stderr_tmpname
-
-    if a:tmpname ==# ''
-        " Rustfmt in stdin/stdout mode
-
-        " chdir to the directory of the file
-        let l:has_lcd = haslocaldir()
-        let l:prev_cd = getcwd()
-        execute 'lchdir! '.expand('%:h')
-
-        let l:buffer = getline(1, '$')
-        if exists("*systemlist")
-            silent let out = systemlist(l:command, l:buffer)
-        else
-            silent let out = split(system(l:command,
-                        \ join(l:buffer, "\n")), '\r\?\n')
-        endif
-    else
-        if exists("*systemlist")
-            silent let out = systemlist(l:command)
-        else
-            silent let out = split(system(l:command), '\r\?\n')
-        endif
-    endif
-
-    let l:stderr = readfile(l:stderr_tmpname)
-
-    call delete(l:stderr_tmpname)
-
-    let l:open_lwindow = 0
-    if v:shell_error == 0
-        if a:from_writepre
-            " remove undo point caused via BufWritePre
-            try | silent undojoin | catch | endtry
-        endif
-
-        if a:tmpname ==# ''
-            let l:content = l:out
-        else
-            " take the tmpfile's content, this is better than rename
-            " because it preserves file modes.
-            let l:content = readfile(a:tmpname)
-        endif
-
-        call s:DeleteLines(len(l:content), line('$'))
-        call setline(1, l:content)
-
-        " 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, [])
-            let l:open_lwindow = 1
-        endif
-    elseif g:rustfmt_fail_silently == 0 && !a:from_writepre
-        " otherwise get the errors and put them in the location list
-        let l:errors = []
-
-        let l:prev_line = ""
-        for l:line in l:stderr
-            " error: expected one of `;` or `as`, found `extern`
-            "  --> src/main.rs:2:1
-            let tokens = matchlist(l:line, '^\s\+-->\s\(.\{-}\):\(\d\+\):\(\d\+\)$')
-            if !empty(tokens)
-                call add(l:errors, {"filename": @%,
-                            \"lnum":	tokens[2],
-                            \"col":	tokens[3],
-                            \"text":	l:prev_line})
-            endif
-            let l:prev_line = l:line
-        endfor
-
-        if !empty(l:errors)
-            call setloclist(0, l:errors, 'r')
-            echohl Error | echomsg "rustfmt returned error" | echohl None
-        else
-            echo "rust.vim: was not able to parse rustfmt messages. Here is the raw output:"
-            echo "\n"
-            for l:line in l:stderr
-                echo l:line
-            endfor
-        endif
-
-        let s:got_fmt_error = 1
-        let l:open_lwindow = 1
-    endif
-
-    " Restore the current directory if needed
-    if a:tmpname ==# ''
-        if l:has_lcd
-            execute 'lchdir! '.l:prev_cd
-        else
-            execute 'chdir! '.l:prev_cd
-        endif
-    endif
-
-    " Open lwindow after we have changed back to the previous directory
-    if l:open_lwindow == 1
-        lwindow
-    endif
-
-    silent! loadview
-endfunction
-
-function! rustfmt#FormatRange(line1, line2)
-    let l:tmpname = tempname()
-    call writefile(getline(1, '$'), l:tmpname)
-    let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
-    call s:RunRustfmt(command, l:tmpname, v:false)
-    call delete(l:tmpname)
-endfunction
-
 function! rustfmt#Format()
-    call s:RunRustfmt(s:RustfmtCommand(), '', v:false)
-endfunction
+  let l:curw = winsaveview()
+  let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
+  call writefile(getline(1, '$'), l:tmpname)
 
-function! rustfmt#Cmd()
-    " Mainly for debugging
-    return s:RustfmtCommand()
-endfunction
+  let command = g:rustfmt_command . " --write-mode=overwrite "
 
-function! rustfmt#PreWrite()
-    if !filereadable(expand("%@"))
-        return
+  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
-    if rust#GetConfigVar('rustfmt_autosave_if_config_present', 0)
-        if findfile('rustfmt.toml', '.;') !=# '' || findfile('.rustfmt.toml', '.;') !=# ''
-            let b:rustfmt_autosave = 1
-            let b:_rustfmt_autosave_because_of_config = 1
-        endif
-    else
-        if has_key(b:, '_rustfmt_autosave_because_of_config')
-            unlet b:_rustfmt_autosave_because_of_config
-            unlet b:rustfmt_autosave
-        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 !rust#GetConfigVar("rustfmt_autosave", 0)
-        return
+    if !empty(errors)
+      call setloclist(0, errors, 'r')
+      echohl Error | echomsg "rustfmt returned error" | echohl None
     endif
 
-    call s:RunRustfmt(s:RustfmtCommand(), '', v:true)
+    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
 
-
-" vim: set et sw=4 sts=4 ts=8:
-
 endif

autoload/smt2.vim

@@ -1,34 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'smt2') == -1
-
-" Invokes the solver on current file
-function! smt2#RunSolver()
-    silent !clear
-    execute "!" . g:smt2_solver_command . " " . bufname("%")
-endfunction
-
-" Puts the solver's output in new split (replaces old split)
-function! smt2#RunSolverAndShowResult()
-    let output = system(g:smt2_solver_command . " " . bufname("%") . " 2>&1")
-
-    " Create split (or reuse existent)
-    if exists("s:outputbufnr") && bufwinnr(s:outputbufnr) > 0
-        execute bufwinnr(s:outputbufnr) . 'wincmd w'
-    else
-        silent! vnew
-        let s:outputbufnr=bufnr('%')
-    endif
-
-    " Clear & (re-)fill contents
-    silent! normal! ggdG
-    setlocal filetype=smt2 buftype=nofile nobuflisted noswapfile
-    call append(0, split(output, '\v\n'))
-    normal! gg
-endfunction
-
-" Requests the solver's version
-function! smt2#PrintSolverVersion()
-    silent !clear
-    execute "!" . g:smt2_solver_command . " " . g:smt2_solver_version_switch
-endfunction
-
-endif

autoload/terraform.vim

@@ -1,64 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
-
-" Ensure no conflict with arguments from the environment
-let $TF_CLI_ARGS_fmt=''
-
-function! terraform#fmt()
-  if !filereadable(expand('%:p'))
-    return
-  endif
-  let l:curw = winsaveview()
-  " Make a fake change so that the undo point is right.
-  normal! ix
-  normal! "_x
-  silent execute '%!terraform fmt -no-color -'
-  if v:shell_error != 0
-    let output = getline(1, '$')
-    silent undo
-    echo join(output, "\n")
-  endif
-  call winrestview(l:curw)
-endfunction
-
-function! terraform#align()
-  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
-
-function! terraform#commands(ArgLead, CmdLine, CursorPos)
-  let l:commands = [
-    \ 'apply',
-    \ 'console',
-    \ 'destroy',
-    \ 'env',
-    \ 'fmt',
-    \ 'get',
-    \ 'graph',
-    \ 'import',
-    \ 'init',
-    \ 'output',
-    \ 'plan',
-    \ 'providers',
-    \ 'refresh',
-    \ 'show',
-    \ 'taint',
-    \ 'untaint',
-    \ 'validate',
-    \ 'version',
-    \ 'workspace',
-    \ '0.12upgrade',
-    \ 'debug',
-    \ 'force-unlock',
-    \ 'push',
-    \ 'state'
-  \ ]
-  return join(l:commands, "\n")
-endfunction
-
-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/vifm/globals.vim

@@ -1,35 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
-
-" common functions for vifm plugin related to globals
-" Maintainer:  xaizek <xaizek@posteo.net>
-" Last Change: November 03, 2018
-
-" Initializes global variables to defaults unless they are already set
-function! vifm#globals#Init()
-    if !exists('g:vifm_exec')
-        let g:vifm_exec = 'vifm'
-    endif
-
-    if !exists('g:vifm_exec_args')
-        let g:vifm_exec_args = ''
-    endif
-
-    if !exists('g:vifm_term')
-        if has('win32')
-            if filereadable('C:\Windows\system32\cmd.exe')
-                let g:vifm_term = 'C:\Windows\system32\cmd.exe /C'
-            else
-                " If don't find use the integrate shell it work too
-                let g:vifm_term = ''
-            endif
-        else
-            let g:vifm_term = 'xterm -e'
-        endif
-    endif
-
-    if !exists('g:vifm_embed_term')
-        let g:vifm_embed_term = has('gui_running')
-    endif
-endfunction
-
-endif

autoload/vital.vim

@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+  
+function! vital#of(name) abort
+  let files = globpath(&runtimepath, 'autoload/vital/' . a:name . '.vital')
+  let file = split(files, "\n")
+  if empty(file)
+    throw 'vital: version file not found: ' . a:name
+  endif
+  let ver = readfile(file[0], 'b')
+  if empty(ver)
+    throw 'vital: invalid version file: ' . a:name
+  endif
+  return vital#_{substitute(ver[0], '\W', '', 'g')}#new()
+endfunction
+
+endif

autoload/vital/_crystal.vim

@@ -1,13 +1,313 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+  
+let s:self_version = expand('<sfile>:t:r')
+let s:self_file = expand('<sfile>')
 
-let s:_plugin_name = expand('<sfile>:t:r')
+" Note: The extra argument to globpath() was added in Patch 7.2.051.
+let s:globpath_third_arg = v:version > 702 || v:version == 702 && has('patch51')
 
-function! vital#{s:_plugin_name}#new() abort
-  return vital#{s:_plugin_name[1:]}#new()
+let s:loaded = {}
+let s:cache_module_path = {}
+let s:cache_sid = {}
+
+let s:_vital_files_cache_runtimepath = ''
+let s:_vital_files_cache = []
+let s:_unify_path_cache = {}
+
+function! s:import(name, ...) abort
+  let target = {}
+  let functions = []
+  for a in a:000
+    if type(a) == type({})
+      let target = a
+    elseif type(a) == type([])
+      let functions = a
+    endif
+    unlet a
+  endfor
+  let module = s:_import(a:name)
+  if empty(functions)
+    call extend(target, module, 'keep')
+  else
+    for f in functions
+      if has_key(module, f) && !has_key(target, f)
+        let target[f] = module[f]
+      endif
+    endfor
+  endif
+  return target
 endfunction
 
-function! vital#{s:_plugin_name}#function(funcname) abort
-  silent! return function(a:funcname)
+function! s:load(...) dict abort
+  for arg in a:000
+    let [name; as] = type(arg) == type([]) ? arg[: 1] : [arg, arg]
+    let target = split(join(as, ''), '\W\+')
+    let dict = self
+    let dict_type = type({})
+    while !empty(target)
+      let ns = remove(target, 0)
+      if !has_key(dict, ns)
+        let dict[ns] = {}
+      endif
+      if type(dict[ns]) == dict_type
+        let dict = dict[ns]
+      else
+        unlet dict
+        break
+      endif
+    endwhile
+
+    if exists('dict')
+      call extend(dict, s:_import(name))
+    endif
+    unlet arg
+  endfor
+  return self
+endfunction
+
+function! s:unload() abort
+  let s:loaded = {}
+  let s:cache_sid = {}
+  let s:cache_module_path = {}
+endfunction
+
+function! s:exists(name) abort
+  return s:_get_module_path(a:name) !=# ''
+endfunction
+
+function! s:search(pattern) abort
+  let paths = s:_vital_files(a:pattern)
+  let modules = sort(map(paths, 's:_file2module(v:val)'))
+  return s:_uniq(modules)
+endfunction
+
+function! s:expand_modules(entry, all) abort
+  if type(a:entry) == type([])
+    let candidates = s:_concat(map(copy(a:entry), 's:search(v:val)'))
+    if empty(candidates)
+      throw printf('vital: Any of module %s is not found', string(a:entry))
+    endif
+    if eval(join(map(copy(candidates), 'has_key(a:all, v:val)'), '+'))
+      let modules = []
+    else
+      let modules = [candidates[0]]
+    endif
+  else
+    let modules = s:search(a:entry)
+    if empty(modules)
+      throw printf('vital: Module %s is not found', a:entry)
+    endif
+  endif
+  call filter(modules, '!has_key(a:all, v:val)')
+  for module in modules
+    let a:all[module] = 1
+  endfor
+  return modules
+endfunction
+
+function! s:_import(name) abort
+  if type(a:name) == type(0)
+    return s:_build_module(a:name)
+  endif
+  let path = s:_get_module_path(a:name)
+  if path ==# ''
+    throw 'vital: module not found: ' . a:name
+  endif
+  let sid = s:_get_sid_by_script(path)
+  if !sid
+    try
+      execute 'source' fnameescape(path)
+    catch /^Vim\%((\a\+)\)\?:E484/
+      throw 'vital: module not found: ' . a:name
+    catch /^Vim\%((\a\+)\)\?:E127/
+      " Ignore.
+    endtry
+
+    let sid = s:_get_sid_by_script(path)
+  endif
+  return s:_build_module(sid)
+endfunction
+
+function! s:_get_module_path(name) abort
+  let key = a:name . '_'
+  if has_key(s:cache_module_path, key)
+    return s:cache_module_path[key]
+  endif
+  if s:_is_absolute_path(a:name) && filereadable(a:name)
+    return a:name
+  endif
+  if a:name ==# ''
+    let paths = [s:self_file]
+  elseif a:name =~# '\v^\u\w*%(\.\u\w*)*$'
+    let paths = s:_vital_files(a:name)
+  else
+    throw 'vital: Invalid module name: ' . a:name
+  endif
+
+  call filter(paths, 'filereadable(expand(v:val, 1))')
+  let path = get(paths, 0, '')
+  let s:cache_module_path[key] = path
+  return path
+endfunction
+
+function! s:_get_sid_by_script(path) abort
+  if has_key(s:cache_sid, a:path)
+    return s:cache_sid[a:path]
+  endif
+
+  let path = s:_unify_path(a:path)
+  for line in filter(split(s:_redir('scriptnames'), "\n"),
+  \                  'stridx(v:val, s:self_version) > 0')
+    let list = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$')
+    if !empty(list) && s:_unify_path(list[2]) ==# path
+      let s:cache_sid[a:path] = list[1] - 0
+      return s:cache_sid[a:path]
+    endif
+  endfor
+  return 0
+endfunction
+
+function! s:_file2module(file) abort
+  let filename = fnamemodify(a:file, ':p:gs?[\\/]?/?')
+  let tail = matchstr(filename, 'autoload/vital/_\w\+/\zs.*\ze\.vim$')
+  return join(split(tail, '[\\/]\+'), '.')
+endfunction
+
+if filereadable(expand('<sfile>:r') . '.VIM')
+  " resolve() is slow, so we cache results.
+  " Note: On windows, vim can't expand path names from 8.3 formats.
+  " So if getting full path via <sfile> and $HOME was set as 8.3 format,
+  " vital load duplicated scripts. Below's :~ avoid this issue.
+  function! s:_unify_path(path) abort
+    if has_key(s:_unify_path_cache, a:path)
+      return s:_unify_path_cache[a:path]
+    endif
+    let value = tolower(fnamemodify(resolve(fnamemodify(
+    \                   a:path, ':p')), ':~:gs?[\\/]?/?'))
+    let s:_unify_path_cache[a:path] = value
+    return value
+  endfunction
+else
+  function! s:_unify_path(path) abort
+    return resolve(fnamemodify(a:path, ':p:gs?[\\/]?/?'))
+  endfunction
+endif
+
+if s:globpath_third_arg
+  function! s:_runtime_files(path) abort
+    return split(globpath(&runtimepath, a:path, 1), "\n")
+  endfunction
+else
+  function! s:_runtime_files(path) abort
+    return split(globpath(&runtimepath, a:path), "\n")
+  endfunction
+endif
+
+function! s:_vital_files(pattern) abort
+  if s:_vital_files_cache_runtimepath !=# &runtimepath
+    let path = printf('autoload/vital/%s/**/*.vim', s:self_version)
+    let s:_vital_files_cache = s:_runtime_files(path)
+    let mod = ':p:gs?[\\/]\+?/?'
+    call map(s:_vital_files_cache, 'fnamemodify(v:val, mod)')
+    let s:_vital_files_cache_runtimepath = &runtimepath
+  endif
+  let target = substitute(a:pattern, '\.', '/', 'g')
+  let target = substitute(target, '\*', '[^/]*', 'g')
+  let regexp = printf('autoload/vital/%s/%s.vim', s:self_version, target)
+  return filter(copy(s:_vital_files_cache), 'v:val =~# regexp')
+endfunction
+
+" Copy from System.Filepath
+if has('win16') || has('win32') || has('win64')
+  function! s:_is_absolute_path(path) abort
+    return a:path =~? '^[a-z]:[/\\]'
+  endfunction
+else
+  function! s:_is_absolute_path(path) abort
+    return a:path[0] ==# '/'
+  endfunction
+endif
+
+function! s:_build_module(sid) abort
+  if has_key(s:loaded, a:sid)
+    return copy(s:loaded[a:sid])
+  endif
+  let functions = s:_get_functions(a:sid)
+
+  let prefix = '<SNR>' . a:sid . '_'
+  let module = {}
+  for func in functions
+    let module[func] = function(prefix . func)
+  endfor
+  if has_key(module, '_vital_created')
+    call module._vital_created(module)
+  endif
+  let export_module = filter(copy(module), 'v:key =~# "^\\a"')
+  let s:loaded[a:sid] = get(g:, 'vital_debug', 0) ? module : export_module
+  if has_key(module, '_vital_loaded')
+    let V = vital#{s:self_version}#new()
+    call module._vital_loaded(V)
+  endif
+  return copy(s:loaded[a:sid])
+endfunction
+
+if exists('+regexpengine')
+  function! s:_get_functions(sid) abort
+    let funcs = s:_redir(printf("function /\\%%#=2^\<SNR>%d_", a:sid))
+    let map_pat = '<SNR>' . a:sid . '_\zs\w\+'
+    return map(split(funcs, "\n"), 'matchstr(v:val, map_pat)')
+  endfunction
+else
+  function! s:_get_functions(sid) abort
+    let prefix = '<SNR>' . a:sid . '_'
+    let funcs = s:_redir('function')
+    let filter_pat = '^\s*function ' . prefix
+    let map_pat = prefix . '\zs\w\+'
+    return map(filter(split(funcs, "\n"),
+    \          'stridx(v:val, prefix) > 0 && v:val =~# filter_pat'),
+    \          'matchstr(v:val, map_pat)')
+  endfunction
+endif
+
+if exists('*uniq')
+  function! s:_uniq(list) abort
+    return uniq(a:list)
+  endfunction
+else
+  function! s:_uniq(list) abort
+    let i = len(a:list) - 1
+    while 0 < i
+      if a:list[i] ==# a:list[i - 1]
+        call remove(a:list, i)
+        let i -= 2
+      else
+        let i -= 1
+      endif
+    endwhile
+    return a:list
+  endfunction
+endif
+
+function! s:_concat(lists) abort
+  let result_list = []
+  for list in a:lists
+    let result_list += list
+  endfor
+  return result_list
+endfunction
+
+function! s:_redir(cmd) abort
+  let [save_verbose, save_verbosefile] = [&verbose, &verbosefile]
+  set verbose=0 verbosefile=
+  redir => res
+    silent! execute a:cmd
+  redir END
+  let [&verbose, &verbosefile] = [save_verbose, save_verbosefile]
+  return res
+endfunction
+
+function! vital#{s:self_version}#new() abort
+  return s:_import('')
 endfunction
 
 endif

autoload/vital/_crystal/ColorEcho.vim

@@ -1,14 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-
-" ___vital___
-" NOTE: lines between '" ___vital___' is generated by :Vitalize.
-" Do not mofidify the code nor insert new lines before '" ___vital___'
-function! s:_SID() abort
-  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
-endfunction
-execute join(['function! vital#_crystal#ColorEcho#import() abort', printf("return map({'get_echorizer': '', 'echo': '', 'is_available': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
-delfunction s:_SID
-" ___vital___
+  
 scriptencoding utf-8
 let s:save_cpo = &cpo
 set cpo&vim

autoload/vital/_crystal/Data/List.vim

@@ -1,14 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-
-" ___vital___
-" NOTE: lines between '" ___vital___' is generated by :Vitalize.
-" Do not mofidify the code nor insert new lines before '" ___vital___'
-function! s:_SID() abort
-  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
-endfunction
-execute join(['function! vital#_crystal#Data#List#import() abort', printf("return map({'combinations': '', 'and': '', 'sort_by': '', 'foldr1': '', 'sort': '', 'flatten': '', 'has_index': '', 'find_indices': '', 'any': '', 'unshift': '', 'span': '', 'pop': '', 'binary_search': '', 'uniq_by': '', 'or': '', 'all': '', 'zip': '', 'find_last_index': '', 'find': '', 'partition': '', 'shift': '', 'permutations': '', 'break': '', 'max_by': '', 'foldl': '', 'foldr': '', 'find_index': '', 'drop_while': '', 'group_by': '', 'take_while': '', 'conj': '', 'push': '', 'char_range': '', 'cons': '', 'foldl1': '', 'intersect': '', 'concat': '', 'map_accum': '', 'clear': '', 'has_common_items': '', 'product': '', 'zip_fill': '', 'uniq': '', 'has': '', 'min_by': '', 'with_index': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
-delfunction s:_SID
-" ___vital___
+  
 " Utilities for list.
 
 let s:save_cpo = &cpo
@@ -184,11 +175,6 @@ function! s:take_while(f, xs) abort
   return s:span(a:f, a:xs)[0]
 endfunction
 
-" similar to Haskell's Data.List.dropWhile
-function! s:drop_while(f, xs) abort
-  return s:span(a:f, a:xs)[1]
-endfunction
-
 " similar to Haskell's Data.List.partition
 function! s:partition(f, xs) abort
   return [filter(copy(a:xs), a:f), filter(copy(a:xs), '!(' . a:f . ')')]
@@ -285,22 +271,14 @@ endfunction
 
 " similar to Ruby's detect or Haskell's find.
 function! s:find(list, default, f) abort
-  let l:Call = type(a:f) is type(function('function'))
-  \          ? function('call')
-  \          : function('s:_call_string_expr')
-
   for x in a:list
-    if l:Call(a:f, [x])
+    if eval(substitute(a:f, 'v:val', string(x), 'g'))
       return x
     endif
   endfor
   return a:default
 endfunction
 
-function! s:_call_string_expr(expr, args) abort
-  return map([a:args[0]], a:expr)[0]
-endfunction
-
 " Returns the index of the first element which satisfies the given expr.
 function! s:find_index(xs, f, ...) abort
   let len = len(a:xs)
@@ -448,7 +426,7 @@ function! s:combinations(list, r) abort
   if a:r > len(a:list)
     return []
   elseif a:r < 0
-    throw 'vital: Data.List: {r} must be non-negative integer'
+    throw 'vital: Data:List: {r} must be non-negative integer'
   endif
   let n = len(a:list)
   let result = []

autoload/vital/_crystal/Data/String.vim

@@ -1,14 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-
-" ___vital___
-" NOTE: lines between '" ___vital___' is generated by :Vitalize.
-" Do not mofidify the code nor insert new lines before '" ___vital___'
-function! s:_SID() abort
-  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
-endfunction
-execute join(['function! vital#_crystal#Data#String#import() abort', printf("return map({'starts_with': '', 'split3': '', 'replace_first': '', 'chop': '', 'unescape': '', 'split_posix_text': '', 'replace': '', 'scan': '', 'strwidthpart': '', 'common_head': '', 'reverse': '', 'escape_pattern': '', 'trim_end': '', '_vital_depends': '', 'wrap': '', 'join_posix_lines': '', 'contains_multibyte': '', 'truncate_skipping': '', 'split_leftright': '', 'ends_with': '', 'nsplit': '', 'strwidthpart_reverse': '', 'unescape_pattern': '', 'levenshtein_distance': '', 'trim_start': '', 'justify_equal_spacing': '', 'nr2hex': '', 'iconv': '', 'pad_left': '', 'nr2enc_char': '', 'lines': '', 'repair_posix_text': '', 'nr2byte': '', 'trim': '', 'diffidx': '', 'truncate': '', 'split_by_displaywidth': '', '_vital_created': '', 'padding_by_displaywidth': '', 'hash': '', 'chomp': '', 'pad_between_letters': '', 'dstring': '', 'pad_both_sides': '', 'substitute_last': '', 'pad_right': '', 'remove_ansi_sequences': '', '_vital_loaded': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
-delfunction s:_SID
-" ___vital___
+  
 " Utilities for string.
 
 let s:save_cpo = &cpo
@@ -16,21 +7,12 @@ set cpo&vim
 
 function! s:_vital_loaded(V) abort
   let s:V = a:V
+  let s:P = s:V.import('Prelude')
   let s:L = s:V.import('Data.List')
 endfunction
 
 function! s:_vital_depends() abort
-  return ['Data.List']
-endfunction
-
-function! s:_vital_created(module) abort
-  " Expose script-local funcref
-  if exists('s:strchars')
-    let a:module.strchars = s:strchars
-  endif
-  if exists('s:wcswidth')
-    let a:module.wcswidth = s:wcswidth
-  endif
+  return ['Prelude', 'Data.List']
 endfunction
 
 " Substitute a:from => a:to by string.
@@ -79,7 +61,7 @@ function! s:common_head(strs) abort
   endif
   let strs = len == 2 ? a:strs : sort(copy(a:strs))
   let pat = substitute(strs[0], '.', '\="[" . escape(submatch(0), "^\\") . "]"', 'g')
-  return pat ==# '' ? '' : matchstr(strs[-1], '\C^\%[' . pat . ']')
+  return pat == '' ? '' : matchstr(strs[-1], '\C^\%[' . pat . ']')
 endfunction
 
 " Split to two elements of List. ([left, right])
@@ -148,7 +130,9 @@ endfunction
 " even if a:str contains multibyte character(s).
 " s:strchars(str) {{{
 if exists('*strchars')
-  let s:strchars = function('strchars')
+  function! s:strchars(str) abort
+    return strchars(a:str)
+  endfunction
 else
   function! s:strchars(str) abort
     return strlen(substitute(copy(a:str), '.', 'x', 'g'))
@@ -226,7 +210,7 @@ function! s:nr2byte(nr) abort
 endfunction
 
 function! s:nr2enc_char(charcode) abort
-  if &encoding ==# 'utf-8'
+  if &encoding == 'utf-8'
     return nr2char(a:charcode)
   endif
   let char = s:nr2byte(a:charcode)
@@ -238,7 +222,7 @@ endfunction
 
 function! s:nr2hex(nr) abort
   let n = a:nr
-  let r = ''
+  let r = ""
   while n
     let r = '0123456789ABCDEF'[n % 16] . r
     let n = n / 16
@@ -334,7 +318,7 @@ function! s:levenshtein_distance(str1, str2) abort
   let letters2 = split(a:str2, '\zs')
   let length1 = len(letters1)
   let length2 = len(letters2)
-  let distances = map(range(1, length1 + 1), 'map(range(1, length2 + 1), ''0'')')
+  let distances = map(range(1, length1 + 1), 'map(range(1, length2 + 1), "0")')
 
   for i1 in range(0, length1)
     let distances[i1][0] = i1
@@ -389,7 +373,7 @@ function! s:split_by_displaywidth(expr, width, float, is_wrap) abort
 
   let text = ''
   while cs_index < len(cs)
-    if cs[cs_index] is# "\n"
+    if cs[cs_index] is "\n"
       let text = s:padding_by_displaywidth(text, a:width, a:float)
       let lines += [text]
       let text = ''
@@ -410,7 +394,7 @@ function! s:split_by_displaywidth(expr, width, float, is_wrap) abort
         if a:is_wrap
           if a:width < w
             if a:width < strdisplaywidth(cs[cs_index])
-              while get(cs, cs_index, "\n") isnot# "\n"
+              while get(cs, cs_index, "\n") isnot "\n"
                 let cs_index += 1
               endwhile
               continue
@@ -419,7 +403,7 @@ function! s:split_by_displaywidth(expr, width, float, is_wrap) abort
             endif
           endif
         else
-          while get(cs, cs_index, "\n") isnot# "\n"
+          while get(cs, cs_index, "\n") isnot "\n"
             let cs_index += 1
           endwhile
           continue
@@ -456,9 +440,8 @@ function! s:truncate(str, width) abort
   " http://github.com/mattn/googlereader-vim/tree/master
 
   if a:str =~# '^[\x00-\x7f]*$'
-    return len(a:str) < a:width
-          \ ? printf('%-' . a:width . 's', a:str)
-          \ : strpart(a:str, 0, a:width)
+    return len(a:str) < a:width ?
+          \ printf('%-'.a:width.'s', a:str) : strpart(a:str, 0, a:width)
   endif
 
   let ret = a:str
@@ -488,20 +471,57 @@ function! s:truncate_skipping(str, max, footer_width, separator) abort
 endfunction
 
 function! s:strwidthpart(str, width) abort
-  let str = tr(a:str, "\t", ' ')
-  let vcol = a:width + 2
-  return matchstr(str, '.*\%<' . (vcol < 0 ? 0 : vcol) . 'v')
+  if a:width <= 0
+    return ''
+  endif
+  let strarr = split(a:str, '\zs')
+  let width = s:wcswidth(a:str)
+  let index = len(strarr)
+  let diff = (index + 1) / 2
+  let rightindex = index - 1
+  while width > a:width
+    let index = max([rightindex - diff + 1, 0])
+    let partwidth = s:wcswidth(join(strarr[(index):(rightindex)], ''))
+    if width - partwidth >= a:width || diff <= 1
+      let width -= partwidth
+      let rightindex = index - 1
+    endif
+    if diff > 1
+      let diff = diff / 2
+    endif
+  endwhile
+  return index ? join(strarr[:index - 1], '') : ''
 endfunction
 
 function! s:strwidthpart_reverse(str, width) abort
-  let str = tr(a:str, "\t", ' ')
-  let vcol = s:wcswidth(str) - a:width
-  return matchstr(str, '\%>' . (vcol < 0 ? 0 : vcol) . 'v.*')
+  if a:width <= 0
+    return ''
+  endif
+  let strarr = split(a:str, '\zs')
+  let width = s:wcswidth(a:str)
+  let strlen = len(strarr)
+  let diff = (strlen + 1) / 2
+  let leftindex = 0
+  let index = -1
+  while width > a:width
+    let index = min([leftindex + diff, strlen]) - 1
+    let partwidth = s:wcswidth(join(strarr[(leftindex):(index)], ''))
+    if width - partwidth >= a:width || diff <= 1
+      let width -= partwidth
+      let leftindex = index + 1
+    endif
+    if diff > 1
+      let diff = diff / 2
+    endif
+  endwhile
+  return index < strlen ? join(strarr[(index + 1):], '') : ''
 endfunction
 
 if v:version >= 703
   " Use builtin function.
-  let s:wcswidth = function('strwidth')
+  function! s:wcswidth(str) abort
+    return strwidth(a:str)
+  endfunction
 else
   function! s:wcswidth(str) abort
     if a:str =~# '^[\x00-\x7f]*$'
@@ -544,88 +564,9 @@ else
   endfunction
 endif
 
-function! s:remove_ansi_sequences(text) abort
-  return substitute(a:text, '\e\[\%(\%(\d\+;\)*\d\+\)\?[mK]', '', 'g')
-endfunction
-
-function! s:escape_pattern(str) abort
-  " escape characters for no-magic
-  return escape(a:str, '^$~.*[]\')
-endfunction
-
-function! s:unescape_pattern(str) abort
-  " unescape characters for no-magic
-  return s:unescape(a:str, '^$~.*[]\')
-endfunction
-
-function! s:unescape(str, chars) abort
-  let chars = map(split(a:chars, '\zs'), 'escape(v:val, ''^$~.*[]\'')')
-  return substitute(a:str, '\\\(' . join(chars, '\|') . '\)', '\1', 'g')
-endfunction
-
-function! s:iconv(expr, from, to) abort
-  if a:from ==# '' || a:to ==# '' || a:from ==? a:to
-    return a:expr
-  endif
-  let result = iconv(a:expr, a:from, a:to)
-  return empty(result) ? a:expr : result
-endfunction
-
-" NOTE:
-" A definition of a TEXT file is "A file that contains characters organized
-" into one or more lines."
-" A definition of a LINE is "A sequence of zero or more non- <newline>s
-" plus a terminating <newline>"
-" That's why {stdin} always ends with <newline> ideally. However, there are
-" some programs which does not follow the POSIX rule and a Vim's way to join
-" List into TEXT; join({text}, "\n"); does not add <newline> to the end of
-" the last line.
-" That's why add a trailing <newline> if it does not exist.
-" REF:
-" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_392
-" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_205
-" :help split()
-" NOTE:
-" it does nothing if the text is a correct POSIX text
-function! s:repair_posix_text(text, ...) abort
-  let newline = get(a:000, 0, "\n")
-  return a:text =~# '\n$' ? a:text : a:text . newline
-endfunction
-
-" NOTE:
-" A definition of a TEXT file is "A file that contains characters organized
-" into one or more lines."
-" A definition of a LINE is "A sequence of zero or more non- <newline>s
-" plus a terminating <newline>"
-" REF:
-" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_392
-" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_205
-function! s:join_posix_lines(lines, ...) abort
-  let newline = get(a:000, 0, "\n")
-  return join(a:lines, newline) . newline
-endfunction
-
-" NOTE:
-" A definition of a TEXT file is "A file that contains characters organized
-" into one or more lines."
-" A definition of a LINE is "A sequence of zero or more non- <newline>s
-" plus a terminating <newline>"
-" TEXT into List; split({text}, '\r\?\n', 1); add an extra empty line at the
-" end of List because the end of TEXT ends with <newline> and keepempty=1 is
-" specified. (btw. keepempty=0 cannot be used because it will remove
-" emptylines in the head and the tail).
-" That's why removing a trailing <newline> before proceeding to 'split' is required
-" REF:
-" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_392
-" http://pubs.opengroup.org/onlinepubs/000095399/basedefs/xbd_chap03.html#tag_03_205
-function! s:split_posix_text(text, ...) abort
-  let newline = get(a:000, 0, '\r\?\n')
-  let text = substitute(a:text, newline . '$', '', '')
-  return split(text, newline, 1)
-endfunction
-
 let &cpo = s:save_cpo
 unlet s:save_cpo
+
 " vim:set et ts=2 sts=2 sw=2 tw=0:
 
 endif

autoload/vital/_crystal/Prelude.vim

@@ -0,0 +1,389 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+  
+let s:save_cpo = &cpo
+set cpo&vim
+
+if v:version ># 703 ||
+\  (v:version is 703 && has('patch465'))
+  function! s:glob(expr) abort
+    return glob(a:expr, 1, 1)
+  endfunction
+else
+  function! s:glob(expr) abort
+    let R = glob(a:expr, 1)
+    return split(R, '\n')
+  endfunction
+endif
+
+function! s:globpath(path, expr) abort
+  let R = globpath(a:path, a:expr, 1)
+  return split(R, '\n')
+endfunction
+
+" Wrapper functions for type().
+let [
+\   s:__TYPE_NUMBER,
+\   s:__TYPE_STRING,
+\   s:__TYPE_FUNCREF,
+\   s:__TYPE_LIST,
+\   s:__TYPE_DICT,
+\   s:__TYPE_FLOAT] = [
+      \   type(3),
+      \   type(""),
+      \   type(function('tr')),
+      \   type([]),
+      \   type({}),
+      \   has('float') ? type(str2float('0')) : -1]
+" __TYPE_FLOAT = -1 when -float
+" This doesn't match to anything.
+
+" Number or Float
+function! s:is_numeric(Value) abort
+  let _ = type(a:Value)
+  return _ ==# s:__TYPE_NUMBER
+  \   || _ ==# s:__TYPE_FLOAT
+endfunction
+
+" Number
+function! s:is_number(Value) abort
+  return type(a:Value) ==# s:__TYPE_NUMBER
+endfunction
+
+" Float
+function! s:is_float(Value) abort
+  return type(a:Value) ==# s:__TYPE_FLOAT
+endfunction
+" String
+function! s:is_string(Value) abort
+  return type(a:Value) ==# s:__TYPE_STRING
+endfunction
+" Funcref
+function! s:is_funcref(Value) abort
+  return type(a:Value) ==# s:__TYPE_FUNCREF
+endfunction
+" List
+function! s:is_list(Value) abort
+  return type(a:Value) ==# s:__TYPE_LIST
+endfunction
+" Dictionary
+function! s:is_dict(Value) abort
+  return type(a:Value) ==# s:__TYPE_DICT
+endfunction
+
+function! s:truncate_skipping(str, max, footer_width, separator) abort
+  call s:_warn_deprecated("truncate_skipping", "Data.String.truncate_skipping")
+
+  let width = s:wcswidth(a:str)
+  if width <= a:max
+    let ret = a:str
+  else
+    let header_width = a:max - s:wcswidth(a:separator) - a:footer_width
+    let ret = s:strwidthpart(a:str, header_width) . a:separator
+          \ . s:strwidthpart_reverse(a:str, a:footer_width)
+  endif
+
+  return s:truncate(ret, a:max)
+endfunction
+
+function! s:truncate(str, width) abort
+  " Original function is from mattn.
+  " http://github.com/mattn/googlereader-vim/tree/master
+
+  call s:_warn_deprecated("truncate", "Data.String.truncate")
+
+  if a:str =~# '^[\x00-\x7f]*$'
+    return len(a:str) < a:width ?
+          \ printf('%-'.a:width.'s', a:str) : strpart(a:str, 0, a:width)
+  endif
+
+  let ret = a:str
+  let width = s:wcswidth(a:str)
+  if width > a:width
+    let ret = s:strwidthpart(ret, a:width)
+    let width = s:wcswidth(ret)
+  endif
+
+  if width < a:width
+    let ret .= repeat(' ', a:width - width)
+  endif
+
+  return ret
+endfunction
+
+function! s:strwidthpart(str, width) abort
+  call s:_warn_deprecated("strwidthpart", "Data.String.strwidthpart")
+
+  if a:width <= 0
+    return ''
+  endif
+  let ret = a:str
+  let width = s:wcswidth(a:str)
+  while width > a:width
+    let char = matchstr(ret, '.$')
+    let ret = ret[: -1 - len(char)]
+    let width -= s:wcswidth(char)
+  endwhile
+
+  return ret
+endfunction
+function! s:strwidthpart_reverse(str, width) abort
+  call s:_warn_deprecated("strwidthpart_reverse", "Data.String.strwidthpart_reverse")
+
+  if a:width <= 0
+    return ''
+  endif
+  let ret = a:str
+  let width = s:wcswidth(a:str)
+  while width > a:width
+    let char = matchstr(ret, '^.')
+    let ret = ret[len(char) :]
+    let width -= s:wcswidth(char)
+  endwhile
+
+  return ret
+endfunction
+
+if v:version >= 703
+  " Use builtin function.
+  function! s:wcswidth(str) abort
+    call s:_warn_deprecated("wcswidth", "Data.String.wcswidth")
+    return strwidth(a:str)
+  endfunction
+else
+  function! s:wcswidth(str) abort
+    call s:_warn_deprecated("wcswidth", "Data.String.wcswidth")
+
+    if a:str =~# '^[\x00-\x7f]*$'
+      return strlen(a:str)
+    end
+
+    let mx_first = '^\(.\)'
+    let str = a:str
+    let width = 0
+    while 1
+      let ucs = char2nr(substitute(str, mx_first, '\1', ''))
+      if ucs == 0
+        break
+      endif
+      let width += s:_wcwidth(ucs)
+      let str = substitute(str, mx_first, '', '')
+    endwhile
+    return width
+  endfunction
+
+  " UTF-8 only.
+  function! s:_wcwidth(ucs) abort
+    let ucs = a:ucs
+    if (ucs >= 0x1100
+          \  && (ucs <= 0x115f
+          \  || ucs == 0x2329
+          \  || ucs == 0x232a
+          \  || (ucs >= 0x2e80 && ucs <= 0xa4cf
+          \      && ucs != 0x303f)
+          \  || (ucs >= 0xac00 && ucs <= 0xd7a3)
+          \  || (ucs >= 0xf900 && ucs <= 0xfaff)
+          \  || (ucs >= 0xfe30 && ucs <= 0xfe6f)
+          \  || (ucs >= 0xff00 && ucs <= 0xff60)
+          \  || (ucs >= 0xffe0 && ucs <= 0xffe6)
+          \  || (ucs >= 0x20000 && ucs <= 0x2fffd)
+          \  || (ucs >= 0x30000 && ucs <= 0x3fffd)
+          \  ))
+      return 2
+    endif
+    return 1
+  endfunction
+endif
+
+let s:is_windows = has('win16') || has('win32') || has('win64') || has('win95')
+let s:is_cygwin = has('win32unix')
+let s:is_mac = !s:is_windows && !s:is_cygwin
+      \ && (has('mac') || has('macunix') || has('gui_macvim') ||
+      \   (!isdirectory('/proc') && executable('sw_vers')))
+let s:is_unix = has('unix')
+
+function! s:is_windows() abort
+  return s:is_windows
+endfunction
+
+function! s:is_cygwin() abort
+  return s:is_cygwin
+endfunction
+
+function! s:is_mac() abort
+  return s:is_mac
+endfunction
+
+function! s:is_unix() abort
+  return s:is_unix
+endfunction
+
+function! s:_warn_deprecated(name, alternative) abort
+  try
+    echohl Error
+    echomsg "Prelude." . a:name . " is deprecated!  Please use " . a:alternative . " instead."
+  finally
+    echohl None
+  endtry
+endfunction
+
+function! s:smart_execute_command(action, word) abort
+  execute a:action . ' ' . (a:word == '' ? '' : '`=a:word`')
+endfunction
+
+function! s:escape_file_searching(buffer_name) abort
+  return escape(a:buffer_name, '*[]?{}, ')
+endfunction
+
+function! s:escape_pattern(str) abort
+  return escape(a:str, '~"\.^$[]*')
+endfunction
+
+function! s:getchar(...) abort
+  let c = call('getchar', a:000)
+  return type(c) == type(0) ? nr2char(c) : c
+endfunction
+
+function! s:getchar_safe(...) abort
+  let c = s:input_helper('getchar', a:000)
+  return type(c) == type("") ? c : nr2char(c)
+endfunction
+
+function! s:input_safe(...) abort
+  return s:input_helper('input', a:000)
+endfunction
+
+function! s:input_helper(funcname, args) abort
+  let success = 0
+  if inputsave() !=# success
+    throw 'vital: Prelude: inputsave() failed'
+  endif
+  try
+    return call(a:funcname, a:args)
+  finally
+    if inputrestore() !=# success
+      throw 'vital: Prelude: inputrestore() failed'
+    endif
+  endtry
+endfunction
+
+function! s:set_default(var, val) abort
+  if !exists(a:var) || type({a:var}) != type(a:val)
+    let {a:var} = a:val
+  endif
+endfunction
+
+function! s:substitute_path_separator(path) abort
+  return s:is_windows ? substitute(a:path, '\\', '/', 'g') : a:path
+endfunction
+
+function! s:path2directory(path) abort
+  return s:substitute_path_separator(isdirectory(a:path) ? a:path : fnamemodify(a:path, ':p:h'))
+endfunction
+
+function! s:_path2project_directory_git(path) abort
+  let parent = a:path
+
+  while 1
+    let path = parent . '/.git'
+    if isdirectory(path) || filereadable(path)
+      return parent
+    endif
+    let next = fnamemodify(parent, ':h')
+    if next == parent
+      return ''
+    endif
+    let parent = next
+  endwhile
+endfunction
+
+function! s:_path2project_directory_svn(path) abort
+  let search_directory = a:path
+  let directory = ''
+
+  let find_directory = s:escape_file_searching(search_directory)
+  let d = finddir('.svn', find_directory . ';')
+  if d == ''
+    return ''
+  endif
+
+  let directory = fnamemodify(d, ':p:h:h')
+
+  " Search parent directories.
+  let parent_directory = s:path2directory(
+        \ fnamemodify(directory, ':h'))
+
+  if parent_directory != ''
+    let d = finddir('.svn', parent_directory . ';')
+    if d != ''
+      let directory = s:_path2project_directory_svn(parent_directory)
+    endif
+  endif
+  return directory
+endfunction
+
+function! s:_path2project_directory_others(vcs, path) abort
+  let vcs = a:vcs
+  let search_directory = a:path
+
+  let find_directory = s:escape_file_searching(search_directory)
+  let d = finddir(vcs, find_directory . ';')
+  if d == ''
+    return ''
+  endif
+  return fnamemodify(d, ':p:h:h')
+endfunction
+
+function! s:path2project_directory(path, ...) abort
+  let is_allow_empty = get(a:000, 0, 0)
+  let search_directory = s:path2directory(a:path)
+  let directory = ''
+
+  " Search VCS directory.
+  for vcs in ['.git', '.bzr', '.hg', '.svn']
+    if vcs ==# '.git'
+      let directory = s:_path2project_directory_git(search_directory)
+    elseif vcs ==# '.svn'
+      let directory = s:_path2project_directory_svn(search_directory)
+    else
+      let directory = s:_path2project_directory_others(vcs, search_directory)
+    endif
+    if directory != ''
+      break
+    endif
+  endfor
+
+  " Search project file.
+  if directory == ''
+    for d in ['build.xml', 'prj.el', '.project', 'pom.xml', 'package.json',
+          \ 'Makefile', 'configure', 'Rakefile', 'NAnt.build',
+          \ 'P4CONFIG', 'tags', 'gtags']
+      let d = findfile(d, s:escape_file_searching(search_directory) . ';')
+      if d != ''
+        let directory = fnamemodify(d, ':p:h')
+        break
+      endif
+    endfor
+  endif
+
+  if directory == ''
+    " Search /src/ directory.
+    let base = s:substitute_path_separator(search_directory)
+    if base =~# '/src/'
+      let directory = base[: strridx(base, '/src/') + 3]
+    endif
+  endif
+
+  if directory == '' && !is_allow_empty
+    " Use original path.
+    let directory = search_directory
+  endif
+
+  return s:substitute_path_separator(directory)
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et ts=2 sts=2 sw=2 tw=0:
+
+endif

autoload/vital/_crystal/Process.vim

@@ -1,14 +1,5 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
-
-" ___vital___
-" NOTE: lines between '" ___vital___' is generated by :Vitalize.
-" Do not mofidify the code nor insert new lines before '" ___vital___'
-function! s:_SID() abort
-  return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
-endfunction
-execute join(['function! vital#_crystal#Process#import() abort', printf("return map({'shellescape': '', 'has_vimproc': '', 'system': '', 'iconv': '', 'spawn': '', 'get_last_status': ''}, \"vital#_crystal#function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
-delfunction s:_SID
-" ___vital___
+  
 " TODO: move all comments to doc file.
 "
 "
@@ -30,36 +21,62 @@ let s:need_trans = v:version < 704 || (v:version == 704 && !has('patch122'))
 
 let s:TYPE_DICT = type({})
 let s:TYPE_LIST = type([])
-let s:TYPE_STRING = type('')
+let s:TYPE_STRING = type("")
 
+
+" Execute program in the background from Vim.
+" Return an empty string always.
+"
+" If a:expr is a List, shellescape() each argument.
+" If a:expr is a String, the arguments are passed as-is.
+"
+" Windows:
+" Using :!start , execute program without via cmd.exe.
+" Spawning 'expr' with 'noshellslash'
+" keep special characters from unwanted expansion.
+" (see :help shellescape())
+"
+" Unix:
+" using :! , execute program in the background by shell.
 function! s:spawn(expr, ...) abort
-  if type(a:expr) is s:TYPE_LIST
-    let special = 1
-    let cmdline = join(map(a:expr, 's:shellescape(v:val, special)'), ' ')
-  elseif type(a:expr) is s:TYPE_STRING
-    let cmdline = a:expr
-    if a:0 && a:1
-      " for :! command
-      let cmdline = substitute(cmdline, '\([!%#]\|<[^<>]\+>\)', '\\\1', 'g')
-    endif
-  else
-    throw 'vital: Process: invalid argument (value type:' . type(a:expr) . ')'
-  endif
+  let shellslash = 0
   if s:is_windows
-    silent execute '!start' cmdline
-  else
-    silent execute '!' cmdline '&'
+    let shellslash = &l:shellslash
+    setlocal noshellslash
   endif
+  try
+    if type(a:expr) is s:TYPE_LIST
+      let special = 1
+      let cmdline = join(map(a:expr, 'shellescape(v:val, special)'), ' ')
+    elseif type(a:expr) is s:TYPE_STRING
+      let cmdline = a:expr
+      if a:0 && a:1
+        " for :! command
+        let cmdline = substitute(cmdline, '\([!%#]\|<[^<>]\+>\)', '\\\1', 'g')
+      endif
+    else
+      throw 'Process.spawn(): invalid argument (value type:'.type(a:expr).')'
+    endif
+    if s:is_windows
+      silent execute '!start' cmdline
+    else
+      silent execute '!' cmdline '&'
+    endif
+  finally
+    if s:is_windows
+      let &l:shellslash = shellslash
+    endif
+  endtry
   return ''
 endfunction
 
 " iconv() wrapper for safety.
 function! s:iconv(expr, from, to) abort
-  if a:from ==# '' || a:to ==# '' || a:from ==? a:to
+  if a:from == '' || a:to == '' || a:from ==? a:to
     return a:expr
   endif
   let result = iconv(a:expr, a:from, a:to)
-  return result !=# '' ? result : a:expr
+  return result != '' ? result : a:expr
 endfunction
 
 " Check vimproc.
@@ -111,7 +128,7 @@ function! s:system(str, ...) abort
     elseif type(a:1) is s:TYPE_STRING
       let args += [s:iconv(a:1, &encoding, 'char')]
     else
-      throw 'vital: Process: invalid argument (value type:' . type(a:1) . ')'
+      throw 'Process.system(): invalid argument (value type:'.type(a:1).')'
     endif
   elseif a:0 >= 2
     " {command} [, {input} [, {timeout}]]
@@ -128,16 +145,13 @@ function! s:system(str, ...) abort
   elseif type(a:str) is s:TYPE_STRING
     let command = a:str
   else
-    throw 'vital: Process: invalid argument (value type:' . type(a:str) . ')'
+    throw 'Process.system(): invalid argument (value type:'.type(a:str).')'
   endif
   if s:need_trans
     let command = s:iconv(command, &encoding, 'char')
   endif
   let args = [command] + args
   if background && (use_vimproc || !s:is_windows)
-    if has('nvim')
-      throw "vital: Process: neovim's system() doesn't support background(&) process (cmdline:" . string(a:str) . ')'
-    endif
     let args[0] = args[0] . ' &'
   endif
 
@@ -153,14 +167,8 @@ function! s:get_last_status() abort
 endfunction
 
 if s:is_windows
-  function! s:shellescape(...) abort
-    try
-      let shellslash = &shellslash
-      set noshellslash
-      return call('shellescape', a:000)
-    finally
-      let &shellslash = shellslash
-    endtry
+  function! s:shellescape(command) abort
+    return substitute(a:command, '[&()[\]{}^=;!''+,`~]', '^\0', 'g')
   endfunction
 else
   function! s:shellescape(...) abort