Use upstreadm mdx ftdetect

Gemfile.lock

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

README.md

@@ -1,4 +1,4 @@
-# vim-polyglot [![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2018.svg?maxAge=2592000)]()
+# vim-polyglot [![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2019.svg?maxAge=2592000)]()
 
 [travis-img-url]: https://travis-ci.org/sheerun/vim-polyglot.svg
 [travis-url]: https://travis-ci.org/sheerun/vim-polyglot
@@ -8,7 +8,7 @@ A collection of language packs for Vim.
 > One to rule them all, one to find them, one to bring them all and in the darkness bind them.
 
 - It **won't affect your startup time**, as scripts are loaded only on demand\*.
-- It **installs and updates 100+ times faster** than the <!--Package Count-->118<!--/Package Count--> packages it consists of.
+- It **installs and updates 100+ times faster** than the <!--Package Count-->128<!--/Package Count--> packages it consists of.
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
 - No support for esoteric languages, only most popular ones (modern too, like `slim`).
@@ -62,6 +62,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (syntax, compiler, ftplugin)
 - [crystal](https://github.com/rhysd/vim-crystal) (syntax, indent, autoload, ftplugin)
 - [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin)
+- [cue](https://github.com/mgrabovsky/vim-cuesheet) (syntax)
 - [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin)
 - [dockerfile](https://github.com/ekalinin/Dockerfile.vim) (syntax, indent, ftplugin)
 - [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, autoload, ftplugin)
@@ -71,13 +72,16 @@ If you need full functionality of any plugin, please use it directly with your p
 - [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (syntax, indent)
 - [ferm](https://github.com/vim-scripts/ferm.vim) (syntax)
 - [fish](https://github.com/dag/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, ftplugin)
+- [groovy-indent](https://github.com/vim-scripts/groovyindent-unix) (indent)
 - [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)
@@ -86,15 +90,17 @@ If you need full functionality of any plugin, please use it directly with your p
 - [haxe](https://github.com/yaymukund/vim-haxe) (syntax)
 - [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)
 - [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/mxw/vim-jsx) (after)
+- [jsx](https://github.com/amadeus/vim-jsx) (syntax, indent, ftplugin)
 - [julia](https://github.com/JuliaEditorSupport/julia-vim) (syntax, indent, autoload, ftplugin)
-- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent)
+- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent, ftplugin)
 - [latex](https://github.com/LaTeX-Box-Team/LaTeX-Box) (syntax, indent, ftplugin)
 - [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin)
 - [liquid](https://github.com/tpope/vim-liquid) (syntax, indent, ftplugin)
@@ -103,15 +109,16 @@ If you need full functionality of any plugin, please use it directly with your p
 - [mako](https://github.com/sophacles/vim-bundle-mako) (syntax, indent, ftplugin)
 - [markdown](https://github.com/plasticboy/vim-markdown) (syntax, indent)
 - [mathematica](https://github.com/rsmenon/vim-mathematica) (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)
 - [objc](https://github.com/b4winckler/vim-objc) (ftplugin, syntax, indent)
-- [ocaml](https://github.com/jrk/vim-ocaml) (syntax, indent, ftplugin)
+- [ocaml](https://github.com/rgrinberg/vim-ocaml) (syntax, indent, compiler, ftplugin)
 - [octave](https://github.com/vim-scripts/octave.vim--) (syntax)
 - [opencl](https://github.com/petRUShka/vim-opencl) (syntax, indent, ftplugin)
-- [org](https://github.com/jceb/vim-orgmode) (syntax, indent, ftplugin)
 - [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin)
 - [pgsql](https://github.com/exu/pgsql.vim) (syntax)
 - [php](https://github.com/StanAngeloff/php.vim) (syntax)
@@ -123,13 +130,15 @@ If you need full functionality of any plugin, please use it directly with your p
 - [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin)
 - [purescript](https://github.com/purescript-contrib/purescript-vim) (syntax, indent, ftplugin)
 - [python-compiler](https://github.com/aliev/vim-compiler-python) (compiler, autoload)
-- [python-ident](https://github.com/Vimjas/vim-python-pep8-indent) (indent)
+- [python-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, ftplugin)
 - [racket](https://github.com/wlangstroth/vim-racket) (syntax, indent, autoload, ftplugin)
 - [ragel](https://github.com/jneen/ragel.vim) (syntax)
 - [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin)
+- [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, autoload, ftplugin)
 - [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin)
@@ -159,6 +168,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [vm](https://github.com/lepture/vim-velocity) (syntax, indent)
 - [vue](https://github.com/posva/vim-vue) (syntax, indent, ftplugin)
 - [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)
 <!--/Language Packs-->

after/ftplugin/cabal.vim

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

after/ftplugin/coffee.vim

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

after/ftplugin/haskell.vim

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

after/ftplugin/idris.vim

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

after/ftplugin/javascript.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 " Vim filetype plugin file
 " Language:     JavaScript
@@ -12,5 +14,3 @@ if exists('b:undo_ftplugin')
 else
   let b:undo_ftplugin = 'setlocal iskeyword< suffixesadd<'
 endif
-
-endif

after/ftplugin/jsx.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim ftplugin file
@@ -11,13 +13,19 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
 " modified from html.vim
 if exists("loaded_matchit")
   let b:match_ignorecase = 0
-  let s:jsx_match_words = '(:),\[:\],{:},<:>,' .
+  let s:jsx_match_words = '<\([a-zA-Z0-9.]\+\)\(>\|$\|\s\):<\/\1>'
-        \ '<\@<=\([^/][^ \t>]*\)[^>]*\%(/\@<!>\|$\):<\@<=/\1>'
+
-  let b:match_words = exists('b:match_words')
+  if !exists('b:loaded_jsx_match_words')
-    \ ? b:match_words . ',' . s:jsx_match_words
+    let b:loaded_jsx_match_words = 0
-    \ : s:jsx_match_words
+  endif
+
+  if b:loaded_jsx_match_words == 0
+    let b:match_words = exists('b:match_words')
+      \ ? b:match_words . ',' . s:jsx_match_words
+      \ : s:jsx_match_words
+  endif
+
+  let b:loaded_jsx_match_words = 1
 endif
 
 setlocal suffixesadd+=.jsx
-
-endif

after/ftplugin/puppet.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'puppet') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'puppet') != -1
+  finish
+endif
 
 if !exists('g:puppet_align_hashes')
     let g:puppet_align_hashes = 1
@@ -16,5 +18,3 @@ if g:puppet_align_hashes && exists(':Tabularize')
         call search(repeat('\([^=]\|=[^>]\)*=>',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
     endfunction
 endif
-
-endif

after/ftplugin/terraform.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'terraform') != -1
+  finish
+endif
 
 if !exists('g:terraform_align')
   let g:terraform_align = 0
@@ -81,5 +83,3 @@ if exists('g:terraform_commentstring')
 else
     setlocal commentstring=#%s
 endif
-
-endif

after/ftplugin/yaml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
 
 " Vim indent file
 " Language: Yaml
@@ -7,5 +9,3 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
 " URL: https://github.com/hjpbarcelos
 setlocal autoindent sw=2 ts=2 expandtab
 " vim:set sw=2:
-
-endif

after/indent/html.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -33,5 +35,3 @@ function! GetCoffeeHtmlIndent(curlinenum)
   " Otherwise use html indenting.
   exec 'return ' s:htmlIndentExpr
 endfunction
-
-endif

after/indent/jsx.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim indent file
@@ -114,5 +116,3 @@ fu! GetJsxIndent()
 
   return ind
 endfu
-
-endif

after/indent/objc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
 
 " Vim indent file
 " Language:	Objective-C
@@ -93,5 +95,3 @@ endfunction
 " Restore 'cpo' options
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif

after/syntax/c.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
+  finish
+endif
 
 " Vim syntax file
 " Language: C Additions
@@ -304,5 +306,3 @@ hi def link cBoolean Boolean
 "hi def link cDelimiter Delimiter
 " foldmethod=syntax fix, courtesy of Ivan Freitas
 "hi def link cBraces Delimiter
-
-endif

after/syntax/coffee.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cjsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cjsx') != -1
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax=b:current_syntax
@@ -27,5 +29,3 @@ hi def link cjsxTagName         Function
 hi def link cjsxEntity          Statement
 hi def link cjsxEntityPunct     Type
 hi def link cjsxAttribProperty  Type
-
-endif

after/syntax/cpp.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c++11') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'c++11') != -1
+  finish
+endif
 
 " Vim syntax file
 " Language: C++ Additions
@@ -2092,5 +2094,3 @@ if version >= 508 || !exists("did_cpp_syntax_inits")
   HiLink cppRawDelimiter    Delimiter
   delcommand HiLink
 endif
-
-endif

after/syntax/haml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Sven Felix Oberquelle <Svelix.Github@gmail.com>
@@ -23,5 +25,3 @@ if exists('s:current_syntax_save')
   let b:current_syntax = s:current_syntax_save
   unlet s:current_syntax_save
 endif
-
-endif

after/syntax/help.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
 
 " Extends standard help syntax with highlighting of Scala code.
 "
@@ -14,5 +16,3 @@ if has('conceal')
 else
   syntax region rgnScala matchgroup=Ignore start='!sc!' end='!/sc!' contains=@ScalaCode
 endif
-
-endif

after/syntax/html.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -20,9 +22,9 @@ if exists('s:current_syntax_save')
   let b:current_syntax = s:current_syntax_save
   unlet s:current_syntax_save
 endif
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'glsl') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'glsl') == -1
 
 " Language: OpenGL Shading Language
 " Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io>
@@ -33,9 +35,9 @@ syn region ShaderScript
       \ keepend
       \ end="</script>"me=s-1
       \ contains=@GLSL,htmlScriptTag,@htmlPreproc
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 
 " Vim syntax file
 " Language:     HTML (version 5.1)
@@ -49,9 +51,9 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " https://github.com/w3c/html/issues/694
 syntax region htmlComment start=+<!--+ end=+-->+ contains=@Spell
 syntax region htmlComment start=+<!DOCTYPE+ keepend end=+>+
-
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'less') != -1
+  finish
 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
@@ -79,5 +81,3 @@ syn region lessStyle start=+<style [^>]*type *=[^>]*text/less[^>]*>+ keepend end
 if exists("s:pre_less_cur_syn")
    let b:current_syntax = s:pre_less_cur_syn
 endif
-
-endif

after/syntax/idris.vim

@@ -0,0 +1,82 @@
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'idris') != -1
+  finish
+endif
+
+" 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
+

after/syntax/javascript/graphql.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
@@ -23,5 +25,3 @@ hi def link graphqlTemplateExpression jsTemplateExpression
 
 syn cluster jsExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif

after/syntax/jsx.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'jsx') != -1
+  finish
+endif
 
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Vim syntax file
@@ -60,10 +62,22 @@ syn region jsxRegion
   \ keepend
   \ extend
 
+" Shorthand fragment support
+"
+" Note that since the main jsxRegion contains @XMLSyntax, we cannot simply
+" adjust the regex above since @XMLSyntax will highlight the opening `<` as an
+" XMLError. Instead we create a new group with the same name that does not
+" include @XMLSyntax and instead uses matchgroup to get the same highlighting.
+syn region jsxRegion
+  \ contains=@Spell,jsxRegion,jsxChild,jsBlock,javascriptBlock
+  \ matchgroup=xmlTag
+  \ start=/<>/
+  \ end=/<\/>/
+  \ keepend
+  \ extend
+
 " Add jsxRegion to the lowest-level JS syntax cluster.
 syn cluster jsExpression add=jsxRegion
 
 " Allow jsxRegion to contain reserved words.
 syn cluster javascriptNoReserved add=jsxRegion
-
-endif

after/syntax/mdx.vim

@@ -0,0 +1,45 @@
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mdx') != -1
+  finish
+endif
+
+
+" based on mxw/vim-jsx
+
+if exists('b:current_syntax')
+  let s:current_syntax=b:current_syntax
+  unlet b:current_syntax
+endif
+syn include @XMLSyntax syntax/xml.vim
+if exists('s:current_syntax')
+  let b:current_syntax=s:current_syntax
+endif
+
+" 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
+
+" JSX child blocks behave just like JSX attributes, except that (a) they are
+" syntactically distinct, and (b) they need the syn-extend argument, or else
+" nested XML end-tag patterns may end the outer jsxRegion.
+syn region jsxChild contained start=+{+ end=++ contains=jsBlock,javascriptBlock
+  \ extend
+
+" Highlight JSX regions as XML; recursively match.
+"
+" Note that we prohibit JSX tags from having a < or word character immediately
+" preceding it, to avoid conflicts with, respectively, the left shift operator
+" and generic Flow type annotations (http://flowtype.org/).
+syn region jsxRegion
+  \ contains=@Spell,@XMLSyntax,jsxRegion,jsxChild,jsBlock,javascriptBlock
+  \ start=+\%(<\|\w\)\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\)+
+  \ skip=+<!--\_.\{-}-->+
+  \ end=+</\z1\_\s\{-}>+
+  \ end=+/>+
+  \ keepend
+  \ extend
+
+" Add jsxRegion to the lowest-level JS syntax cluster.
+syn cluster jsExpression add=jsxRegion
+
+" Allow jsxRegion to contain reserved words.
+syn cluster javascriptNoReserved add=jsxRegion

after/syntax/mma.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'mathematica') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'mathematica') != -1
+  finish
+endif
 
 "Vim conceal file
 " Language: Mathematica
@@ -103,5 +105,3 @@ endif
 
 hi! link Conceal Normal
 setlocal conceallevel=2
-
-endif

after/syntax/objc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'objc') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'objc') != -1
+  finish
+endif
 
 " ARC type modifiers
 syn keyword objcTypeModifier __bridge __bridge_retained __bridge_transfer __autoreleasing __strong __weak __unsafe_unretained
@@ -19,5 +21,3 @@ syn match objcDirective "@property\|@synthesize\|@dynamic\|@package"
 
 " Highlight property attributes as if they were type modifiers
 hi def link objcPropertyAttribute objcTypeModifier
-
-endif

after/syntax/reason.vim

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

after/syntax/rspec.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rspec') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rspec') != -1
+  finish
+endif
 
 "
 " An rspec syntax file
@@ -32,5 +34,3 @@ syntax keyword rspecMessageExpectation advise any_args any_number_of_times anyth
 highlight link rspecMessageExpectation Function
 
 let b:current_syntax = 'rspec'
-
-endif

after/syntax/ruby.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yard') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yard') != -1
+  finish
+endif
 
 " Ruby syntax extensions for highlighting YARD documentation.
 "
@@ -126,5 +128,3 @@ hi def link yardParametricType yardComment
 hi def link yardArrow yardComment
 hi def link yardHashAngle yardComment
 hi def link yardHashCurly yardComment
-
-endif

after/syntax/rust.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 scriptencoding utf-8
 
@@ -41,5 +43,3 @@ if !get(g:, 'rust_conceal_mod_path', 0)
 endif
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

after/syntax/tex.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'latex') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'latex') != -1
+  finish
+endif
 
 " adds support for cleverref package
 " \Cref, \cref, \cpageref, \labelcref, \labelcpageref
@@ -9,5 +11,3 @@ syn region texRefZone		matchgroup=texStatement start="\\\(label\|\)c\(page\|\)re
 syn region texZone start="\\begin{lstlisting}" end="\\end{lstlisting}\|%stopzone\>"
 syn match texInputFile  "\\lstinputlisting\s*\(\[.*\]\)\={.\{-}}" contains=texStatement,texInputCurlies,texInputFileOpt
 syn match texZone "\\lstinline\s*\(\[.*\]\)\={.\{-}}"
-
-endif

after/syntax/typescript/graphql.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'graphql') != -1
+  finish
+endif
 
 if exists('b:current_syntax')
   let s:current_syntax = b:current_syntax
@@ -22,5 +24,3 @@ hi def link graphqlTemplateExpression typescriptTemplateSubstitution
 
 syn cluster typescriptExpression add=graphqlTaggedTemplate
 syn cluster graphqlTaggedTemplate add=graphqlTemplateString
-
-endif

after/syntax/yaml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'yaml') != -1
+  finish
+endif
 
 " To make this file do stuff, add something like the following (without the
 " leading ") to your ~/.vimrc:
@@ -27,7 +29,7 @@ syn match yamlBlock "[>|]\d\?[+-]"
 syn region yamlComment	start="\#" end="$"
 syn match yamlIndicator	"#YAML:\S\+"
 
-syn region yamlString	start="\(^\|\s\|\[\|\,\|\-\)'" end="'" skip="\\'"
+syn region yamlString	start="\(^\|\s\|\[\|\,\|\-\)\@<='" 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
@@ -61,5 +63,3 @@ hi link yamlInline	Operator
 hi link yamlBlock	Operator
 hi link yamlString	String
 hi link yamlEscape	Special
-
-endif

autoload/LaTeXtoUnicode.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " Support for LaTex-to-Unicode conversion as in the Julia REPL "
@@ -650,5 +652,3 @@ function! LaTeXtoUnicode#Toggle()
   endif
   return
 endfunction
-
-endif

autoload/RstFold.vim

@@ -1,10 +1,16 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rst') != -1
+  finish
+endif
 
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
-" Last Modified: 2018-01-07
+" 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]
@@ -30,6 +36,10 @@ function s:CacheRstFold()
 endfunction
 
 function RstFold#GetRstFold()
+  if !g:rst_fold_enabled
+    return
+  endif
+
   if !has_key(b:, 'RstFoldCache')
     call s:CacheRstFold()
   endif
@@ -41,6 +51,10 @@ function RstFold#GetRstFold()
 endfunction
 
 function RstFold#GetRstFoldText()
+  if !g:rst_fold_enabled
+    return
+  endif
+
   if !has_key(b:, 'RstFoldCache')
     call s:CacheRstFold()
   endif
@@ -50,5 +64,3 @@ function RstFold#GetRstFoldText()
   let text = thisline =~ '^\([=`:.''"~^_*+#-]\)\1\+$' ? getline(v:foldstart + 1) : thisline
   return indent . text
 endfunction
-
-endif

autoload/cargo.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 function! cargo#Load() 
     " Utility call to get this script loaded, for debugging
@@ -115,5 +117,3 @@ function! cargo#runtarget(args)
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/cargo/quickfix.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 function! cargo#quickfix#CmdPre() abort
     if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
@@ -26,5 +28,3 @@ function! cargo#quickfix#CmdPost() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/clojurecomplete.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'clojure') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'clojure') != -1
+  finish
+endif
 
 " Vim completion script
 " Language:     Clojure
@@ -22,5 +24,3 @@ function! clojurecomplete#Complete(findstart, base)
 endfunction
 
 " vim:sts=8:sw=8:ts=8:noet
-
-endif

autoload/coffee.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -54,5 +56,3 @@ function! coffee#CoffeeSetUpErrorFormat()
                          \%f:%l:%c:\ error:\ %m,
                          \%-G%.%#
 endfunction
-
-endif

autoload/crystal_lang.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -316,5 +318,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif

autoload/dart.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dart') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'dart') != -1
+  finish
+endif
 
 
 function! s:error(text) abort
@@ -170,5 +172,3 @@ function! dart#setModifiable() abort
     setlocal nomodifiable
   endif
 endfunction
-
-endif

autoload/elixir/indent.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if !exists("g:elixir_indent_max_lookbehind")
   let g:elixir_indent_max_lookbehind = 30
@@ -267,7 +269,7 @@ function! elixir#indent#handle_inside_block(context)
     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'), 'pattern_match_clauses': s:keyword('catch\|rescue')},
+          \'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},
@@ -343,5 +345,3 @@ function! elixir#indent#handle_inside_generic_block(context)
     return -1
   endif
 endfunction
-
-endif

autoload/elixir/util.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 function! elixir#util#get_filename(word) abort
   let word = a:word
@@ -24,5 +26,3 @@ function! elixir#util#get_filename(word) abort
 
   return word
 endfunction
-
-endif

autoload/elm.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
 
 let s:errors = []
 
@@ -381,5 +383,3 @@ function! s:ExecuteInRoot(cmd) abort
 
 	return l:out
 endfunction
-
-endif

autoload/elm/util.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elm') != -1
+  finish
+endif
 
 " IsWin returns 1 if current OS is Windows or 0 otherwise
 fun! elm#util#IsWin() abort
@@ -174,5 +176,3 @@ function! s:error(msg)
 	echohl NONE
 	let v:errmsg = a:msg
 endfunction
-
-endif

autoload/fish.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
 
 function! fish#Indent()
     let l:shiftwidth = shiftwidth()
@@ -67,5 +69,3 @@ endfunction
 function! fish#errorformat()
     return '%Afish: %m,%-G%*\\ ^,%-Z%f (line %l):%s'
 endfunction
-
-endif

autoload/go/config.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
 
 " don't spam the user when Vim is started in Vi compatibility mode
 let s:cpo_save = &cpo
@@ -390,8 +392,9 @@ function! go#config#HighlightFunctions() abort
   return get(g:, 'go_highlight_functions', 0)
 endfunction
 
-function! go#config#HighlightFunctionArguments() abort
+function! go#config#HighlightFunctionParameters() abort
-  return get(g:, 'go_highlight_function_arguments', 0)
+  " 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
@@ -441,6 +444,11 @@ function! go#config#FoldEnable(...) abort
   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
+
+
 " 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
@@ -452,5 +460,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif

autoload/htmlcomplete.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
 
 " Vim completion script
 " Language:     HTML and XHTML
@@ -841,5 +843,3 @@ function! htmlcomplete#CheckDoctype() " {{{
 endfunction
 " }}}
 " vim:set foldmethod=marker:
-
-endif

autoload/julia.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 function! julia#set_syntax_version(jvers)
   if &filetype != "julia"
@@ -184,5 +186,3 @@ function! julia#gotodefinition()
     return
 endfunction
 
-endif
-

autoload/julia/doc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 " path to the julia binary to communicate with
 if has('win32') || has('win64')
@@ -242,5 +244,3 @@ function! s:likely(str) abort
   let output = systemlist(cmd)
   return split(matchstr(output[0], '\C^search: \zs.*'))
 endfunction
-
-endif

autoload/julia_blocks.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 " Facilities for moving around Julia blocks (e.g. if/end, function/end etc.)
 " (AKA a collection of horrible hacks)
@@ -794,5 +796,3 @@ function! s:cursor_moved(...)
   let b:jlblk_did_select = b:jlblk_doing_select
   let b:jlblk_doing_select = 0
 endfunction
-
-endif

autoload/julia_latex_symbols.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'julia') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'julia') != -1
+  finish
+endif
 
 " This file is autogenerated from the script 'generate_latex_symbols_table.jl'
 " The symbols are based on Julia version 1.1.0-DEV.695
@@ -3329,5 +3331,3 @@ function! julia_latex_symbols#get_dict()
     \ '\:baggage_claim:': '🛄',
     \ '\:left_luggage:': '🛅'}
 endfunction
-
-endif

autoload/pony.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'pony') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'pony') != -1
+  finish
+endif
 
 " Vim plugin file
 " Language:     Pony
@@ -532,5 +534,3 @@ endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-
-endif

autoload/python/utils.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
+  finish
+endif
 
 " Sometimes Python issues debugging messages
 " which don't belong to a call stack context
@@ -17,5 +19,3 @@ function! python#utils#fix_qflist() " {{{
     call setqflist(l:traceback)
   endif
 endfunction " }}}
-
-endif

autoload/racket.vim

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

autoload/rubycomplete.vim

@@ -1,11 +1,12 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim completion script
-" Language:             Ruby
+" Language:		Ruby
-" Maintainer:           Mark Guzman <segfault@hasno.info>
+" Maintainer:		Mark Guzman <segfault@hasno.info>
-" URL:                  https://github.com/vim-ruby/vim-ruby
+" URL:			https://github.com/vim-ruby/vim-ruby
-" Release Coordinator:  Doug Kearns <dougkearns@gmail.com>
+" Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Maintainer Version:   0.8.1
 " ----------------------------------------------------------------------------
 "
 " Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -55,6 +56,23 @@ 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
 
@@ -105,7 +123,7 @@ function! s:GetBufferRubyEntity( name, type, ... )
     endif
 
     let curpos = getpos(".")
-    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'W' )
+    let [enum,ecol] = searchpairpos( s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'W' )
     call cursor(lastpos[1], lastpos[2])
 
     if lnum > enum
@@ -130,19 +148,28 @@ 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 pos = getpos('.')
+    let curpos = 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('.',pos)
+        call setpos('.',curpos)
         let str = getline(lnum)
         let vtp = substitute(str,sstr,'\1','')
         return vtp
     endif
-    call setpos('.',pos)
+    call setpos('.',curpos)
     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'
@@ -152,9 +179,13 @@ function! s:GetRubyVarType(v)
 
     let fstr = '=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%[xwQqr][(\[{@]\|[A-Za-z0-9@:\-()\.]\+...\?\|lambda\|&\)'
     let sstr = ''.escape(a:v, '*').'\>\s*[+\-*/]*'.fstr
-    let [lnum,lcol] = searchpos(sstr,'nb',stopline)
+    let pos = searchpos(sstr,'bW')
-    if lnum != 0 && lcol != 0
+    while pos != [0,0] && s:IsInComment(pos)
-        let str = matchstr(getline(lnum),fstr,lcol)
+        let pos = searchpos(sstr,'bW')
+    endwhile
+    if pos != [0,0]
+        let [lnum, col] = pos
+        let str = matchstr(getline(lnum),fstr,col)
         let str = substitute(str,'^=\s*','','')
 
         call setpos('.',pos)
@@ -176,7 +207,7 @@ function! s:GetRubyVarType(v)
         end
         return ''
     endif
-    call setpos('.',pos)
+    call setpos('.',curpos)
     return ''
 endfunction
 
@@ -673,11 +704,10 @@ 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
+        methods = Object.constants.collect{ |c| c.to_s }.grep(/^#{receiver}/)
-        methods.grep(/^#{receiver}/).collect{|e| "::" + e}
 
       when /^(((::)?[A-Z][^:.\(]*)+?)::?([^:.]*)$/ # Constant or class methods
         receiver = $1
@@ -686,13 +716,13 @@ class VimRubyCompletion
         load_buffer_class( receiver )
         load_buffer_module( receiver )
         begin
-          classes = eval("#{receiver}.constants")
+          constants = eval("#{receiver}.constants").collect{ |c| c.to_s }.grep(/^#{message}/)
-          #methods = eval("#{receiver}.methods")
+          methods = eval("#{receiver}.methods").collect{ |m| m.to_s }.grep(/^#{message}/)
         rescue Exception
           dprint "exception: %s" % $!
+          constants = []
           methods = []
         end
-        methods.grep(/^#{message}/).collect{|e| receiver + "::" + e}
 
       when /^(:[^:.]+)\.([^.]*)$/ # Symbol
         dprint "symbol"
@@ -848,5 +878,3 @@ call s:DefRuby()
 "}}} ruby-side code
 
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
-
-endif

autoload/rust.vim

@@ -1,12 +1,12 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Author: Kevin Ballard
 " Description: Helper functions for Rust commands/mappings
 " Last Modified: May 27, 2014
 " For bugs, patches and license go to https://github.com/rust-lang/rust.vim
 
-" Jump {{{1
-
 function! rust#Load()
     " Utility call to get this script loaded, for debugging
 endfunction
@@ -22,6 +22,44 @@ function! rust#GetConfigVar(name, default)
     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
@@ -487,14 +525,6 @@ function! rust#Test(all, options) abort
         return
     endif
 
-    let mod_name = expand('%:t:r')
-    if mod_name ==# ''
-        echohl ErrorMsg
-        echo 'Cannot extract a module name from file name. Please add ! to command if you want to run all tests'
-        echohl None
-        return
-    endif
-
     let saved = getpos('.')
     try
         let func_name = s:SearchTestFunctionNameUnderCursor()
@@ -504,11 +534,10 @@ function! rust#Test(all, options) abort
             echohl None
             return
         endif
-        let spec = mod_name . '::' . func_name
         if a:options ==# ''
-            execute cmd . 'cargo test --manifest-path' manifest spec
+            execute cmd . 'cargo test --manifest-path' manifest func_name
         else
-            execute cmd . 'cargo test --manifest-path' manifest spec a:options
+            execute cmd . 'cargo test --manifest-path' manifest func_name a:options
         endif
         return
     finally
@@ -519,5 +548,3 @@ endfunction
 " }}}1
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/rust/debugging.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
@@ -101,5 +103,3 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/rust/delimitmate.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
@@ -44,5 +46,3 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
-
-endif

autoload/rustfmt.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Author: Stephen Sugden <stephen@stephensugden.com>
 "
@@ -248,5 +250,3 @@ endfunction
 
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

autoload/scss_indent.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scss') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scss') != -1
+  finish
+endif
 
 " usage:
 " set indentexpr=scss_indent#GetIndent(v:lnum)
@@ -37,5 +39,3 @@ fun! scss_indent#GetIndent(lnum)
     return 0
   endif
 endfun
-
-endif

autoload/vifm/edit.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
 
 " common functions for vifm command-line editing buffer filetype plugins
 " Maintainer:  xaizek <xaizek@posteo.net>
@@ -14,5 +16,3 @@ function! vifm#edit#Init()
     " Start buffer editing in insert mode
     startinsert
 endfunction
-
-endif

autoload/vifm/globals.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vifm') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'vifm') != -1
+  finish
+endif
 
 " common functions for vifm plugin related to globals
 " Maintainer:  xaizek <xaizek@posteo.net>
@@ -31,5 +33,3 @@ function! vifm#globals#Init()
         let g:vifm_embed_term = has('gui_running')
     endif
 endfunction
-
-endif

autoload/vital/_crystal.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 let s:_plugin_name = expand('<sfile>:t:r')
 
@@ -9,5 +11,3 @@ endfunction
 function! vital#{s:_plugin_name}#function(funcname) abort
   silent! return function(a:funcname)
 endfunction
-
-endif

autoload/vital/_crystal/ColorEcho.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -187,5 +189,3 @@ endfunction
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
-
-endif

autoload/vital/_crystal/Data/List.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -464,5 +466,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/_crystal/Data/String.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -627,5 +629,3 @@ 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,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -173,5 +175,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/_crystal/Web/JSON.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 " ___vital___
 " NOTE: lines between '" ___vital___' is generated by :Vitalize.
@@ -178,5 +180,3 @@ let &cpo = s:save_cpo
 unlet s:save_cpo
 
 " vim:set et ts=2 sts=2 sw=2 tw=0:
-
-endif

autoload/vital/crystal.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 let s:plugin_name = expand('<sfile>:t:r')
 let s:vital_base_dir = expand('<sfile>:h')
@@ -328,5 +330,3 @@ else
     return a:list
   endfunction
 endif
-
-endif

autoload/vital/crystal.vital

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'crystal') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'crystal') != -1
+  finish
+endif
 
 crystal
 bee84ae23effb0510137ad177e98c94d8b3657a6
@@ -6,5 +8,3 @@ bee84ae23effb0510137ad177e98c94d8b3657a6
 Process
 Web.JSON
 ColorEcho
-
-endif

autoload/xml/aria.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
 
 " Vim completion for WAI-ARIA data file
 " Language:       HTML + WAI-ARIA
@@ -457,5 +459,3 @@ let g:xmldata_aria = {
     \ 'default_role': default_role,
     \ 'vimariaattrinfo': aria_attributes_value
 \ }
-
-endif

autoload/xml/html5.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'html5') != -1
+  finish
+endif
 
 " Vim completion for HTML5 data file
 " Language:	    HTML (version 5.1 Draft 2016 Jan 13)
@@ -870,5 +872,3 @@ let g:xmldata_html5 = {
     \ 'wbr': ['/>', ''],
 \ },
 \ }
-
-endif

build

@@ -63,12 +63,12 @@ extract() {
 
     output "${subdirs##, })"$'\n'
 
-    if (echo "julia coffee-script elixir fish git plantuml scala swift" | grep -qF "$name"); then
+    if (echo "julia coffee-script elixir fish git plantuml scala swift jinja" | grep -qF "$name"); then
       echo "Skipping ftdetect installation of $name" >&2
       continue
     fi
 
-    [ -d "${dir}/ftdetect" ] && for f in "${dir}/ftdetect/"*; do
+    [ -d "${dir}${subtree:-/}ftdetect" ] && for f in "${dir}${subtree:-/}ftdetect/"*; do
       cat <<EOF >> tmp/polyglot.vim
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '${pack%%:*}') == -1
   augroup filetypedetect
@@ -151,12 +151,11 @@ update_readme() {
 }
 
 PACKS="
+  ansible:pearofducks/ansible-vim
   apiblueprint:sheerun/apiblueprint.vim
   applescript:mityu/vim-applescript:_SYNTAX
-  asciidoc:asciidoc/vim-asciidoc
-  yaml:stephpy/vim-yaml
-  ansible:pearofducks/ansible-vim
   arduino:sudar/vim-arduino-syntax
+  asciidoc:asciidoc/vim-asciidoc
   autohotkey:hnamikaw/vim-autohotkey
   blade:jwalton512/vim-blade
   c++11:octol/vim-cpp-enhanced-highlight
@@ -167,10 +166,11 @@ PACKS="
   clojure:guns/vim-clojure-static
   cmake:pboettch/vim-cmake-syntax
   coffee-script:kchmck/vim-coffee-script
+  cql:elubow/cql-vim
   cryptol:victoredwardocallaghan/cryptol.vim
   crystal:rhysd/vim-crystal
-  cql:elubow/cql-vim
   cucumber:tpope/vim-cucumber
+  cue:mgrabovsky/vim-cuesheet
   dart:dart-lang/dart-vim-plugin
   dockerfile:ekalinin/Dockerfile.vim
   elixir:elixir-lang/vim-elixir
@@ -180,14 +180,17 @@ PACKS="
   erlang:vim-erlang/vim-erlang-runtime
   ferm:vim-scripts/ferm.vim
   fish:dag/vim-fish
+  flatbuffers:dcharbon/vim-flatbuffers
   fsharp:fsharp/vim-fsharp:_BASIC
   git:tpope/vim-git
-  gmpl:maelvalais/gmpl.vim
   glsl:tikhomirov/vim-glsl
+  gmpl:maelvalais/gmpl.vim
   gnuplot:vim-scripts/gnuplot-syntax-highlighting
   go:fatih/vim-go:_BASIC
+  gradle:tfnico/vim-gradle
   graphql:jparise/vim-graphql
   groovy:vim-scripts/groovy.vim
+  groovy-indent:vim-scripts/groovyindent-unix
   haml:sheerun/vim-haml
   handlebars:mustache/vim-mustache-handlebars
   haproxy:CH-DanReif/haproxy.vim
@@ -195,13 +198,15 @@ PACKS="
   haxe:yaymukund/vim-haxe
   html5:othree/html5.vim
   i3:mboughaba/i3config.vim
+  idris:idris-hackers/idris-vim
   jasmine:glanotte/vim-jasmine
   javascript:pangloss/vim-javascript:_JAVASCRIPT
   jenkins:martinda/Jenkinsfile-vim-syntax
-  json:elzr/vim-json
+  jinja:lepture/vim-jinja
   json5:GutenYe/json5.vim
+  json:elzr/vim-json
   jst:briancollins/vim-jst
-  jsx:mxw/vim-jsx:_ALL
+  jsx:amadeus/vim-jsx
   julia:JuliaEditorSupport/julia-vim
   kotlin:udalov/kotlin-vim
   latex:LaTeX-Box-Team/LaTeX-Box
@@ -212,15 +217,16 @@ PACKS="
   mako:sophacles/vim-bundle-mako
   markdown:plasticboy/vim-markdown:_SYNTAX
   mathematica:rsmenon/vim-mathematica
+  mdx:jxnblk/vim-mdx-js
+  meson:mesonbuild/meson:_ALL:/data/syntax-highlighting/vim/
   moonscript:leafo/moonscript-vim
   nginx:chr4/nginx.vim
   nim:zah/nim.vim:_BASIC
   nix:LnL7/vim-nix
   objc:b4winckler/vim-objc
-  ocaml:jrk/vim-ocaml
+  ocaml:rgrinberg/vim-ocaml
   octave:vim-scripts/octave.vim--
   opencl:petRUShka/vim-opencl
-  org:jceb/vim-orgmode
   perl:vim-perl/vim-perl
   pgsql:exu/pgsql.vim
   php:StanAngeloff/php.vim
@@ -231,18 +237,20 @@ PACKS="
   pug:digitaltoad/vim-pug
   puppet:voxpupuli/vim-puppet
   purescript:purescript-contrib/purescript-vim
-  python:vim-python/python-syntax
   python-compiler:aliev/vim-compiler-python
-  python-ident:Vimjas/vim-python-pep8-indent
+  python-indent:Vimjas/vim-python-pep8-indent
+  python:vim-python/python-syntax
+  qmake:artoj/qmake-syntax-vim
   qml:peterhoeg/vim-qml
   r-lang:vim-scripts/R.vim
   racket:wlangstroth/vim-racket
-  raml:IN3D/vim-raml
   ragel:jneen/ragel.vim
+  raml:IN3D/vim-raml
+  reason:reasonml-editor/vim-reason-plus
   rspec:sheerun/rspec.vim
+  rst:marshallward/vim-restructuredtext
   ruby:vim-ruby/vim-ruby
   rust:rust-lang/rust.vim
-  rst:marshallward/vim-restructuredtext
   sbt:derekwyatt/vim-sbt
   scala:derekwyatt/vim-scala
   scss:cakebaker/scss-syntax.vim
@@ -265,9 +273,11 @@ PACKS="
   vbnet:vim-scripts/vbnet.vim
   vcl:smerrill/vcl-vim-plugin
   vifm:vifm/vifm.vim
-  vue:posva/vim-vue
   vm:lepture/vim-velocity
+  vue:posva/vim-vue
+  xml:amadeus/vim-xml
   xls:vim-scripts/XSLT-syntax
+  yaml:stephpy/vim-yaml
   yard:sheerun/vim-yardoc
 "
 

compiler/cake.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -15,5 +17,3 @@ call coffee#CoffeeSetUpVariables()
 exec 'CompilerSet makeprg=' . escape(g:coffee_cake . ' ' .
 \                                    g:coffee_cake_options . ' $*', ' ')
 call coffee#CoffeeSetUpErrorFormat()
-
-endif

compiler/cargo.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:         Cargo Compiler
@@ -49,5 +51,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

compiler/coffee.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'coffee-script') != -1
+  finish
+endif
 
 " Language:    CoffeeScript
 " Maintainer:  Mick Koch <mick@kochm.co>
@@ -82,5 +84,3 @@ augroup CoffeeUpdateMakePrg
     autocmd BufWritePre,BufFilePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif

compiler/credo.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=%f:%l:\ %t:\ %m
 CompilerSet makeprg=mix\ credo\ suggest\ --format=flycheck
-
-endif

compiler/cryptol.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cryptol') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cryptol') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:         Cryptol version 1.8.19-academic Compiler
@@ -20,5 +22,3 @@ CompilerSet errorformat&     " use the default 'errorformat'
 
 " "%<" means the current file name without extension.
 CompilerSet makeprg=cryptol\ -o\ %<\ %
-
-endif

compiler/cucumber.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'cucumber') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'cucumber') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:	Cucumber
@@ -29,5 +31,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif

compiler/eruby.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		eRuby
@@ -39,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/eslint.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'javascript') != -1
+  finish
+endif
 
 " Vim compiler plugin
 " Language:     JavaScript
@@ -16,5 +18,3 @@ endif
 
 CompilerSet makeprg=eslint\ -f\ compact\ %
 CompilerSet errorformat=%f:\ line\ %l\\,\ col\ %c\\,\ %m
-
-endif

compiler/exunit.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if exists("current_compiler")
   finish
@@ -25,5 +27,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/fish.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'fish') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'fish') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -7,5 +9,3 @@ let current_compiler = 'fish'
 
 CompilerSet makeprg=fish\ --no-execute\ %
 execute 'CompilerSet errorformat='.escape(fish#errorformat(), ' ')
-
-endif

compiler/go.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'go') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'go') != -1
+  finish
+endif
 
 " Copyright 2013 The Go Authors. All rights reserved.
 " Use of this source code is governed by a BSD-style
@@ -49,5 +51,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: sw=2 ts=2 et
-
-endif

compiler/gradle.vim

@@ -0,0 +1,28 @@
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gradle') != -1
+  finish
+endif
+
+" Vim Compiler File
+" Compiler: gradle
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "gradle"
+
+if exists(":CompilerSet") != 2 " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=gradle
+
+CompilerSet errorformat=
+    \%E[ant:scalac]\ %f:%l:\ error:\ %m,
+    \%W[ant:scalac]\ %f:%l:\ warning:\ %m,
+    \%E%.%#:compile%\\w%#Java%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#,
+    \%W%.%#:compile%\\w%#Java%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#,
+    \%E%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#,
+    \%W%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#,
+    \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
+    \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
+    \%-G%.%#

compiler/gradlew.vim

@@ -0,0 +1,28 @@
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'gradle') != -1
+  finish
+endif
+
+" Vim Compiler File
+" Compiler: gradlew
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "gradlew"
+
+if exists(":CompilerSet") != 2 " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=./gradlew
+
+CompilerSet errorformat=
+    \%E[ant:scalac]\ %f:%l:\ error:\ %m,
+    \%W[ant:scalac]\ %f:%l:\ warning:\ %m,
+    \%E%.%#:compile%\\w%#Java%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#,
+    \%W%.%#:compile%\\w%#Java%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#,
+    \%E%f:%l:\ error:\ %m,%-Z%p^,%-C%.%#,
+    \%W%f:%l:\ warning:\ %m,%-Z%p^,%-C%.%#,
+    \%E%f:\ %\\d%\\+:\ %m\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
+    \%E%>%f:\ %\\d%\\+:\ %m,%C\ @\ line\ %l\\,\ column\ %c.,%-C%.%#,%Z%p^,
+    \%-G%.%#

compiler/haml.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'haml') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:	Haml
@@ -28,5 +30,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2:
-
-endif

compiler/ls.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'livescript') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'livescript') != -1
+  finish
+endif
 
 " Language:    LiveScript
 " Maintainer:  George Zahariev
@@ -74,5 +76,3 @@ augroup LiveScriptUpdateMakePrg
     autocmd BufFilePost,BufWritePost          call s:UpdateMakePrg()
   endif
 augroup END
-
-endif

compiler/mix.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'elixir') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=%A%t%*[^:]:\ %m,%C%f:%l:\ %m,%C%f:%l,%Z
 CompilerSet makeprg=mix
-
-endif

compiler/nim.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nim') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nim') != -1
+  finish
+endif
 
 if exists("current_compiler")
   finish
@@ -25,5 +27,3 @@ unlet s:cpo_save
 
 let g:syntastic_nim_checkers = ['nim']
 
-
-endif

compiler/nix-build.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'nix') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'nix') != -1
+  finish
+endif
 
 if exists('current_compiler')
     finish
@@ -11,5 +13,3 @@ endif
 
 CompilerSet errorformat=error:\ %m\ at\ %f:%l:%c,builder\ for\ \'%m\'\ failed\ with\ exit\ code\ %n,fixed-output\ derivation\ produced\ path\ \'%s\'\ with\ %m
 CompilerSet makeprg=nix-build
-
-endif

compiler/ocaml.vim

@@ -0,0 +1,59 @@
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ocaml') != -1
+  finish
+endif
+
+" Vim Compiler File
+" Compiler:    ocaml
+" Maintainer:  Markus Mottl <markus.mottl@gmail.com>
+" URL:         http://www.ocaml.info/vim/compiler/ocaml.vim
+" Last Change:
+"              2017 Nov 26 - Improved error format (Markus Mottl)
+"              2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
+"              2013 Jun 30 - Initial version (Marc Weber)
+"
+" Marc Weber's comments:
+" Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
+" ocamake and whatnot. So which one to use?
+"
+" This error format was moved from ftplugin/ocaml.vim to this file,
+" because ftplugin is the wrong file to set an error format
+" and the error format itself is annoying because it joins many lines in this
+" error case:
+"
+"    Error: The implementation foo.ml does not match the interface foo.cmi:
+"    Modules do not match case.
+"
+" So having it here makes people opt-in
+
+
+if exists("current_compiler")
+    finish
+endif
+let current_compiler = "ocaml"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet errorformat =
+      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
+      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
+      \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
+      \%+EReference\ to\ unbound\ regexp\ name\ %m,
+      \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
+      \%Wocamlyacc:\ w\ -\ %m,
+      \%-Zmake%.%#,
+      \%C%m,
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ `%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
+      \%D%*\\a:\ Entering\ directory\ `%f',
+      \%X%*\\a:\ Leaving\ directory\ `%f',
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ '%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ '%f',
+      \%D%*\\a:\ Entering\ directory\ '%f',
+      \%X%*\\a:\ Leaving\ directory\ '%f',
+      \%DEntering\ directory\ '%f',
+      \%XLeaving\ directory\ '%f',
+      \%DMaking\ %*\\a\ in\ %f
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

compiler/python.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'python-compiler') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'python-compiler') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:	Unit testing tool for Python
@@ -67,5 +69,3 @@ else
 endif
 
 " vim:foldmethod=marker:foldlevel=0
-
-endif

compiler/rake.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		Rake
@@ -39,5 +41,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/rspec.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		RSpec
@@ -35,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/ruby.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		Ruby
@@ -6,7 +8,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" ----------------------------------------------------------------------------
 
 if exists("current_compiler")
   finish
@@ -45,5 +46,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/rubyunit.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'ruby') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'ruby') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:		Test::Unit - Ruby Unit Testing Framework
@@ -35,5 +37,3 @@ let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim: nowrap sw=2 sts=2 ts=8:
-
-endif

compiler/rustc.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'rust') != -1
+  finish
+endif
 
 " Vim compiler file
 " Compiler:         Rust Compiler
@@ -53,5 +55,3 @@ unlet s:save_cpo
 " vint: +ProhibitAbbreviationOption
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif

compiler/sbt.vim

@@ -1,4 +1,6 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'scala') == -1
+if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'scala') != -1
+  finish
+endif
 
 " Vim compiler file
 " Language:             Scala SBT (http://www.scala-sbt.org/)
@@ -22,13 +24,11 @@ set cpo-=C
 CompilerSet makeprg=sbt\ -Dsbt.log.noformat=true\ compile
 
 CompilerSet errorformat=
-      \%E\ %#[error]\ %f:%l:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z,
+      \%E\ %#[error]\ %f:%l:%c:\ %m,%C\ %#[error]\ %p^,%-C%.%#,%Z,
-      \%W\ %#[warn]\ %f:%l:\ %m,%C\ %#[warn]\ %p^,%-C%.%#,%Z,
+      \%W\ %#[warn]\ %f:%l:%c:\ %m,%C\ %#[warn]\ %p^,%-C%.%#,%Z,
       \%-G%.%#
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
 " vim:set sw=2 sts=2 ts=8 et:
-
-endif