Add racket support, #159

Also fixes #154

README.md

@@ -1,4 +1,4 @@
-# vim-polyglot [![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2016.svg?maxAge=2592000)]()
+# vim-polyglot [![Build Status][travis-img-url]][travis-url] [![Maintenance](https://img.shields.io/maintenance/yes/2017.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 70+ times faster** than 70+ packages it consist of.
+- It **installs and updates 100+ times faster** than 100+ 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`).
@@ -23,94 +23,119 @@ A collection of language packs for Vim.
 
 Optionally download one of the [releases](https://github.com/sheerun/vim-polyglot/releases) and unpack it directly under `~/.vim` directory.
 
+You can also use Vim 8 built-in package manager:
+
+```
+mkdir -p ~/.vim/pack/default/start
+git clone https://github.com/sheerun/vim-polyglot ~/.vim/pack/default/start/vim-polyglot
+```
+
+NOTE: Not all features of listed language packs are available. We strip them from functionality slowing vim startup in general (for example we ignore `plugins` folder that is loaded regardless of file type, use `ftplugin` instead).
+
+If you need full functionality of any plugin, please use it directly with your plugin manager.
+
 ## Language packs
 
+- [ansible](https://github.com/pearofducks/ansible-vim) (syntax, indent, ftplugin)
+- [apiblueprint](https://github.com/sheerun/apiblueprint.vim) (syntax)
 - [applescript](https://github.com/vim-scripts/applescript.vim) (syntax)
-- [ansible](https://github.com/pearofducks/ansible-vim) (syntax, indent, ftplugin, ftdetect)
+- [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, indent)
-- [arduino](https://github.com/sudar/vim-arduino-syntax) (syntax, indent, ftdetect)
+- [asciidoc](https://github.com/asciidoc/vim-asciidoc) (syntax)
-- [blade](https://github.com/jwalton512/vim-blade) (syntax, indent, ftplugin, ftdetect)
+- [blade](https://github.com/jwalton512/vim-blade) (syntax, indent, ftplugin)
 - [c++11](https://github.com/octol/vim-cpp-enhanced-highlight) (syntax)
 - [c/c++](https://github.com/vim-jp/vim-cpp) (syntax)
-- [cjsx](https://github.com/mtscout6/vim-cjsx) (ftdetect, syntax, ftplugin)
+- [caddyfile](https://github.com/joshglendenning/vim-caddyfile) (syntax, indent, ftplugin)
-- [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin, ftdetect)
+- [cjsx](https://github.com/mtscout6/vim-cjsx) (syntax, ftplugin)
-- [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [clojure](https://github.com/guns/vim-clojure-static) (syntax, indent, autoload, ftplugin)
-- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (syntax, compiler, ftplugin, ftdetect)
+- [coffee-script](https://github.com/kchmck/vim-coffee-script) (syntax, indent, compiler, autoload, ftplugin)
-- [crystal](https://github.com/rhysd/vim-crystal) (syntax, indent, autoload, ftplugin, ftdetect)
+- [cql](https://github.com/elubow/cql-vim) (syntax)
-- [cql](https://github.com/elubow/cql-vim) (syntax, ftdetect)
+- [cryptol](https://github.com/victoredwardocallaghan/cryptol.vim) (syntax, compiler, ftplugin)
+- [crystal](https://github.com/rhysd/vim-crystal) (syntax, indent, autoload, ftplugin)
 - [css](https://github.com/JulesWang/css.vim) (syntax)
-- [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin, ftdetect)
+- [cucumber](https://github.com/tpope/vim-cucumber) (syntax, indent, compiler, ftplugin)
-- [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin, ftdetect)
+- [dart](https://github.com/dart-lang/dart-vim-plugin) (syntax, indent, autoload, ftplugin)
-- [dockerfile](https://github.com/honza/dockerfile.vim) (syntax, ftdetect)
+- [dockerfile](https://github.com/docker/docker) (syntax)
-- [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, ftplugin, ftdetect)
+- [elixir](https://github.com/elixir-lang/vim-elixir) (syntax, indent, compiler, autoload, ftplugin)
-- [elm](https://github.com/lambdatoast/elm.vim) (syntax, indent, autoload, ftplugin, ftdetect)
+- [elm](https://github.com/lambdatoast/elm.vim) (syntax, indent, autoload, ftplugin)
-- [emberscript](https://github.com/yalesov/vim-ember-script) (syntax, indent, ftplugin, ftdetect)
+- [emberscript](https://github.com/yalesov/vim-ember-script) (syntax, indent, ftplugin)
-- [emblem](https://github.com/yalesov/vim-emblem) (syntax, indent, ftplugin, ftdetect)
+- [emblem](https://github.com/yalesov/vim-emblem) (syntax, indent, ftplugin)
-- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (syntax, indent, ftdetect)
+- [erlang](https://github.com/vim-erlang/vim-erlang-runtime) (syntax, indent)
-- [fish](https://github.com/dag/vim-fish) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [fish](https://github.com/dag/vim-fish) (syntax, indent, compiler, autoload, ftplugin)
-- [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin, ftdetect)
+- [git](https://github.com/tpope/vim-git) (syntax, indent, ftplugin)
-- [glsl](https://github.com/tikhomirov/vim-glsl) (syntax, indent, ftdetect)
+- [glsl](https://github.com/tikhomirov/vim-glsl) (syntax, indent)
-- [go](https://github.com/fatih/vim-go) (syntax, compiler, indent, ftdetect)
+- [gnuplot](https://github.com/vim-scripts/gnuplot-syntax-highlighting) (syntax)
+- [go](https://github.com/fatih/vim-go) (syntax, compiler, indent)
+- [graphql](https://github.com/jparise/vim-graphql) (syntax, ftplugin)
 - [groovy](https://github.com/vim-scripts/groovy.vim) (syntax)
-- [haml](https://github.com/tpope/vim-haml) (syntax, indent, compiler, ftplugin, ftdetect)
+- [haml](https://github.com/sheerun/vim-haml) (syntax, indent, compiler, ftplugin)
-- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (syntax, indent, ftplugin, ftdetect)
+- [handlebars](https://github.com/mustache/vim-mustache-handlebars) (syntax, indent, ftplugin)
-- [haskell](https://github.com/neovimhaskell/haskell-vim) (syntax, indent, ftplugin, ftdetect)
+- [haskell](https://github.com/neovimhaskell/haskell-vim) (syntax, indent, ftplugin)
-- [haxe](https://github.com/yaymukund/vim-haxe) (syntax, ftdetect)
+- [haxe](https://github.com/yaymukund/vim-haxe) (syntax)
 - [html5](https://github.com/othree/html5.vim) (syntax, indent, autoload, ftplugin)
-- [jasmine](https://github.com/glanotte/vim-jasmine) (syntax, ftdetect)
+- [i3](https://github.com/PotatoesMaster/i3-vim-syntax) (syntax, ftplugin)
-- [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, ftplugin, ftdetect, extras)
+- [jasmine](https://github.com/glanotte/vim-jasmine) (syntax)
-- [json](https://github.com/elzr/vim-json) (syntax, indent, ftplugin, ftdetect)
+- [javascript](https://github.com/pangloss/vim-javascript) (syntax, indent, compiler, ftplugin, extras)
-- [jst](https://github.com/briancollins/vim-jst) (syntax, indent, ftdetect)
+- [json](https://github.com/elzr/vim-json) (syntax, indent, ftplugin)
-- [jsx](https://github.com/mxw/vim-jsx) (ftdetect, after)
+- [jst](https://github.com/briancollins/vim-jst) (syntax, indent)
-- [julia](https://github.com/dcjones/julia-minimalist-vim) (syntax, indent, ftdetect)
+- [jsx](https://github.com/mxw/vim-jsx) (after)
-- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent, ftdetect)
+- [julia](https://github.com/dcjones/julia-minimalist-vim) (syntax, indent)
+- [kotlin](https://github.com/udalov/kotlin-vim) (syntax, indent)
 - [latex](https://github.com/LaTeX-Box-Team/LaTeX-Box) (syntax, indent, ftplugin)
-- [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin, ftdetect)
+- [less](https://github.com/groenewege/vim-less) (syntax, indent, ftplugin)
-- [liquid](https://github.com/tpope/vim-liquid) (syntax, indent, ftplugin, ftdetect)
+- [liquid](https://github.com/tpope/vim-liquid) (syntax, indent, ftplugin)
-- [livescript](https://github.com/gkz/vim-ls) (syntax, indent, compiler, ftplugin, ftdetect)
+- [livescript](https://github.com/gkz/vim-ls) (syntax, indent, compiler, ftplugin)
 - [lua](https://github.com/tbastos/vim-lua) (syntax, indent)
-- [mako](https://github.com/sophacles/vim-bundle-mako) (syntax, indent, ftplugin, ftdetect)
+- [mako](https://github.com/sophacles/vim-bundle-mako) (syntax, indent, ftplugin)
-- [markdown](https://github.com/plasticboy/vim-markdown) (syntax, ftdetect)
+- [markdown](https://github.com/plasticboy/vim-markdown) (syntax)
-- [nginx](https://github.com/othree/nginx-contrib-vim) (syntax, indent, ftdetect)
+- [mathematica](https://github.com/rsmenon/vim-mathematica) (syntax, ftplugin)
-- [nim](https://github.com/zah/nim.vim) (syntax, compiler, indent, ftdetect)
+- [nginx](https://github.com/chr4/nginx.vim) (syntax, indent, ftplugin)
-- [nix](https://github.com/spwhitt/vim-nix) (syntax, ftplugin, ftdetect)
+- [nim](https://github.com/zah/nim.vim) (syntax, compiler, indent)
+- [nix](https://github.com/spwhitt/vim-nix) (syntax, ftplugin)
 - [objc](https://github.com/b4winckler/vim-objc) (ftplugin, syntax, indent)
 - [ocaml](https://github.com/jrk/vim-ocaml) (syntax, indent, ftplugin)
 - [octave](https://github.com/vim-scripts/octave.vim--) (syntax)
-- [opencl](https://github.com/petRUShka/vim-opencl) (syntax, indent, ftplugin, ftdetect)
+- [opencl](https://github.com/petRUShka/vim-opencl) (syntax, indent, ftplugin)
-- [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin, ftdetect)
+- [perl](https://github.com/vim-perl/vim-perl) (syntax, indent, ftplugin)
-- [pgsql](https://github.com/exu/pgsql.vim) (syntax, ftdetect)
+- [pgsql](https://github.com/exu/pgsql.vim) (syntax)
 - [php](https://github.com/StanAngeloff/php.vim) (syntax)
-- [plantuml](https://github.com/aklt/plantuml-syntax) (syntax, ftplugin, ftdetect)
+- [plantuml](https://github.com/aklt/plantuml-syntax) (syntax, indent, ftplugin)
-- [powershell](https://github.com/Persistent13/vim-ps1) (syntax, indent, ftplugin, ftdetect)
+- [powershell](https://github.com/PProvost/vim-ps1) (syntax, indent, ftplugin)
-- [protobuf](https://github.com/uarun/vim-protobuf) (syntax, indent, ftdetect)
+- [protobuf](https://github.com/uarun/vim-protobuf) (syntax, indent)
-- [pug](https://github.com/digitaltoad/vim-pug) (syntax, indent, ftplugin, ftdetect)
+- [pug](https://github.com/digitaltoad/vim-pug) (syntax, indent, ftplugin)
-- [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin, ftdetect)
+- [puppet](https://github.com/voxpupuli/vim-puppet) (syntax, indent, ftplugin)
-- [purescript](https://github.com/raichoo/purescript-vim) (syntax, indent, ftdetect)
+- [purescript](https://github.com/raichoo/purescript-vim) (syntax, indent, ftplugin)
+- [python-compiler](https://github.com/aliev/vim-compiler-python) (compiler, autoload)
 - [python](https://github.com/mitsuhiko/vim-python-combined) (syntax, indent)
-- [qml](https://github.com/peterhoeg/vim-qml) (syntax, indent, ftplugin, ftdetect)
+- [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)
-- [rspec](https://github.com/sheerun/rspec.vim) (syntax, ftdetect)
+- [raml](https://github.com/IN3D/vim-raml) (syntax, ftplugin)
-- [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [rspec](https://github.com/sheerun/rspec.vim) (syntax)
-- [rust](https://github.com/rust-lang/rust.vim) (syntax, indent, compiler, autoload, ftplugin, ftdetect)
+- [ruby](https://github.com/vim-ruby/vim-ruby) (syntax, indent, compiler, autoload, ftplugin)
-- [sbt](https://github.com/derekwyatt/vim-sbt) (syntax, ftdetect)
+- [rust](https://github.com/rust-lang/rust.vim) (syntax, indent, compiler, autoload, ftplugin)
-- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin, ftdetect)
+- [sbt](https://github.com/derekwyatt/vim-sbt) (syntax)
-- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin, ftdetect)
+- [scala](https://github.com/derekwyatt/vim-scala) (syntax, indent, compiler, ftplugin)
-- [solidity](https://github.com/ethereum/vim-solidity) (syntax, indent, ftdetect)
+- [scss](https://github.com/cakebaker/scss-syntax.vim) (syntax, autoload, ftplugin)
-- [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin, ftdetect)
+- [slim](https://github.com/slim-template/vim-slim) (syntax, indent, ftplugin)
-- [swift](https://github.com/keith/swift.vim) (syntax, indent, ftplugin, ftdetect)
+- [solidity](https://github.com/ethereum/vim-solidity) (syntax, indent)
-- [systemd](https://github.com/kurayama/systemd-vim-syntax) (syntax, ftdetect)
+- [stylus](https://github.com/wavded/vim-stylus) (syntax, indent, ftplugin)
-- [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin, ftdetect)
+- [swift](https://github.com/keith/swift.vim) (syntax, indent, ftplugin)
-- [thrift](https://github.com/solarnz/thrift.vim) (syntax, ftdetect)
+- [sxhkd](https://github.com/baskerville/vim-sxhkdrc) (syntax)
-- [tmux](https://github.com/keith/tmux.vim) (syntax, ftplugin, ftdetect)
+- [systemd](https://github.com/kurayama/systemd-vim-syntax) (syntax)
+- [terraform](https://github.com/hashivim/vim-terraform) (syntax, indent, ftplugin)
+- [textile](https://github.com/timcharper/textile.vim) (syntax, ftplugin)
+- [thrift](https://github.com/solarnz/thrift.vim) (syntax)
+- [tmux](https://github.com/keith/tmux.vim) (syntax, ftplugin)
 - [tomdoc](https://github.com/wellbredgrapefruit/tomdoc.vim) (syntax)
-- [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin, ftdetect)
+- [toml](https://github.com/cespare/vim-toml) (syntax, ftplugin)
-- [twig](https://github.com/evidens/vim-twig) (syntax, ftplugin)
+- [twig](https://github.com/lumiliet/vim-twig) (syntax, indent, ftplugin)
-- [typescript](https://github.com/leafgarland/typescript-vim) (syntax, indent, compiler, ftplugin, ftdetect)
+- [typescript](https://github.com/leafgarland/typescript-vim) (syntax, indent, compiler, ftplugin)
-- [vala](https://github.com/tkztmk/vim-vala) (syntax, indent, ftdetect)
+- [vala](https://github.com/arrufat/vala.vim) (syntax, indent)
 - [vbnet](https://github.com/vim-scripts/vbnet.vim) (syntax)
-- [vcl](https://github.com/smerrill/vcl-vim-plugin) (syntax, ftdetect)
+- [vcl](https://github.com/smerrill/vcl-vim-plugin) (syntax)
-- [vm](https://github.com/lepture/vim-velocity) (syntax, indent, ftdetect)
+- [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)
 - [yaml](https://github.com/stephpy/vim-yaml) (syntax, ftplugin)
 - [yard](https://github.com/sheerun/vim-yardoc) (syntax)

after/ftplugin/javascript.vim

@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  
+" Vim filetype plugin file
+" Language:     JavaScript
+" Maintainer:   vim-javascript community
+" URL:          https://github.com/pangloss/vim-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

after/ftplugin/jsx.vim

@@ -5,7 +5,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
 "
 " Language: JSX (JavaScript)
 " Maintainer: Max Wang <mxawng@gmail.com>
-" Depends: pangloss/vim-javascript
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 

after/ftplugin/terraform.vim

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

after/indent/html.vim

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

after/indent/jsx.vim

@@ -5,10 +5,12 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'jsx') == -1
 "
 " Language: JSX (JavaScript)
 " Maintainer: Max Wang <mxawng@gmail.com>
-" Depends: pangloss/vim-javascript
 "
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
+" Save the current JavaScript indentexpr.
+let b:jsx_js_indentexpr = &indentexpr
+
 " Prologue; load in XML indentation.
 if exists('b:did_indent')
   let s:did_indent=b:did_indent
@@ -51,19 +53,31 @@ fu! SynXMLish(syns)
   return SynAttrXMLish(get(a:syns, -1))
 endfu
 
-" Check if a synstack has any XMLish attribute.
-fu! SynXMLishAny(syns)
-  for synattr in a:syns
-    if SynAttrXMLish(synattr)
-      return 1
-    endif
-  endfor
-  return 0
-endfu
-
 " Check if a synstack denotes the end of a JSX block.
 fu! SynJSXBlockEnd(syns)
-  return get(a:syns, -1) == 'jsBraces' && SynAttrXMLish(get(a:syns, -2))
+  return get(a:syns, -1) =~ '\%(js\|javascript\)Braces' &&
+       \ SynAttrXMLish(get(a:syns, -2))
+endfu
+
+" 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 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 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
+  " jsxRegion---specifically, the jsxRegion corresponding to the parent.
+  return prevdepth == curdepth ||
+      \ (prevdepth == curdepth + 1 && get(a:cursyn, -1) ==# 'jsxRegion')
 endfu
 
 " Cleverly mix JS and XML indentation.
@@ -71,9 +85,12 @@ fu! GetJsxIndent()
   let cursyn  = SynSOL(v:lnum)
   let prevsyn = SynEOL(v:lnum - 1)
 
-  " Use XML indenting if the syntax at the end of the previous line was either
+  " Use XML indenting iff:
-  " JSX or was the closing brace of a jsBlock whose parent syntax was JSX.
+  "   - the syntax at the end of the previous line was either JSX or was the
-  if (SynXMLish(prevsyn) || SynJSXBlockEnd(prevsyn)) && SynXMLishAny(cursyn)
+  "     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)
 
     " Align '/>' and '>' with '<' for multiline tags.
@@ -86,7 +103,13 @@ fu! GetJsxIndent()
       let ind = ind + &sw
     endif
   else
-    let ind = GetJavascriptIndent()
+    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
   endif
 
   return ind

after/syntax/c.vim

@@ -24,6 +24,16 @@ syn match    cCustomParen    "(" contains=cParen contains=cCppParen
 syn match    cCustomFunc     "\w\+\s*(\@=" contains=cCustomParen
 hi def link cCustomFunc  Function
 
+" -----------------------------------------------------------------------------
+"  Highlight member variable names.
+" -----------------------------------------------------------------------------
+if exists('g:cpp_member_variable_highlight') && g:cpp_member_variable_highlight
+    syn match   cCustomDot    "\." contained
+    syn match   cCustomPtr    "->" contained
+    syn match   cCustomMemVar "\(\.\|->\)\w\+" contains=cCustomDot,cCustomPtr
+    hi def link cCustomMemVar Function
+endif
+
 " -----------------------------------------------------------------------------
 "  Source: aftersyntaxc.vim
 " -----------------------------------------------------------------------------

after/syntax/haml.vim

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

after/syntax/html.vim

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

after/syntax/jsx.vim

@@ -48,7 +48,7 @@ syn region jsxChild contained start=+{+ end=++ contains=jsBlock,javascriptBlock
 " preceding it, to avoid conflicts with, respectively, the left shift operator
 " and generic Flow type annotations (http://flowtype.org/).
 syn region jsxRegion
-  \ contains=@XMLSyntax,jsxRegion,jsxChild,jsBlock,javascriptBlock
+  \ contains=@Spell,@XMLSyntax,jsxRegion,jsxChild,jsBlock,javascriptBlock
   \ start=+\%(<\|\w\)\@<!<\z([a-zA-Z][a-zA-Z0-9:\-.]*\)+
   \ skip=+<!--\_.\{-}-->+
   \ end=+</\z1\_\s\{-}>+

after/syntax/mma.vim

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

after/syntax/yaml.vim

@@ -21,9 +21,7 @@ if version < 600
 endif
 syntax clear
 
-syn match yamlDelimiter	"[:,-]"
 syn match yamlBlock "[\[\]\{\}\|\>]"
-syn match yamlOperator "[?^+-]\|=>"
 
 syn region yamlComment	start="\#" end="$"
 syn match yamlIndicator	"#YAML:\S\+"
@@ -40,11 +38,12 @@ 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	"\w\+\ze\s*:"
+syn match  yamlKey	"^\s*\zs[^ \t\"]\+\ze\s*:"
+syn match  yamlKey	"^\s*-\s*\zs[^ \t\"]\+\ze\s*:"
 syn match  yamlAnchor	"&\S\+"
 syn match  yamlAlias	"*\S\+"
 
-" Setupt the hilighting links
+" Setup the highlighting links
 
 hi link yamlConstant Keyword
 hi link yamlIndicator PreCondit
@@ -55,10 +54,7 @@ hi link yamlType	Type
 
 hi link yamlComment	Comment
 hi link yamlBlock	Operator
-hi link yamlOperator	Operator
-hi link yamlDelimiter	Delimiter
 hi link yamlString	String
 hi link yamlEscape	Special
 
-
 endif

autoload/dart.vim

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

autoload/elixir/indent.vim

@@ -0,0 +1,347 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'elixir') == -1
+  
+function! elixir#indent#debug(str)
+  if exists("g:elixir_indent_debug") && g:elixir_indent_debug
+    echom a:str
+  endif
+endfunction
+
+" Returns 0 or 1 based on whether or not the text starts with the given
+" expression and is not a string or comment
+function! elixir#indent#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 elixir#indent#is_string_or_comment(a:lnum, pos + 1)
+      return 0
+    else
+      return 1
+    end
+  end
+endfunction
+
+" Returns 0 or 1 based on whether or not the text ends with the given
+" expression and is not a string or comment
+function! elixir#indent#ends_with(text, expr, lnum)
+  let pos = match(a:text, a:expr.'\s*$')
+  if pos == -1
+    return 0
+  else
+    if elixir#indent#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 text matches the given expression
+function! elixir#indent#contains(text, expr)
+  return a:text =~ a:expr
+endfunction
+
+" Returns 0 or 1 based on whether or not the given line number and column
+" number pair is a string or comment
+function! elixir#indent#is_string_or_comment(line, col)
+  return synIDattr(synID(a:line, a:col, 1), "name") =~ '\%(String\|Comment\)'
+endfunction
+
+" Skip expression for searchpair. Returns 0 or 1 based on whether the value
+" under the cursor is a string or comment
+function! elixir#indent#searchpair_back_skip()
+  " NOTE: @jbodah 2017-02-27: for some reason this function gets called with
+  " and index that doesn't exist in the line sometimes. Detect and account for
+  " that situation
+  let curr_col = col('.')
+  if getline('.')[curr_col-1] == ''
+    let curr_col = curr_col-1
+  endif
+  return elixir#indent#is_string_or_comment(line('.'), curr_col)
+endfunction
+
+" DRY up searchpair calls
+function! elixir#indent#searchpair_back(start, mid, end)
+  let line = line('.')
+  return searchpair(a:start, a:mid, a:end, 'bnW', "line('.') == " . line . " || elixir#indent#searchpair_back_skip()")
+endfunction
+
+" DRY up searchpairpos calls
+function! elixir#indent#searchpairpos_back(start, mid, end)
+  let line = line('.')
+  return searchpairpos(a:start, a:mid, a:end, 'bnW', "line('.') == " . line . " || elixir#indent#searchpair_back_skip()")
+endfunction
+
+" DRY up regex for keywords that 1) makes sure we only look at complete words
+" and 2) ignores atoms
+function! elixir#indent#keyword(expr)
+  return ':\@<!\<\C\%('.a:expr.'\)\>:\@!'
+endfunction
+
+function! elixir#indent#starts_with_comment(text)
+  return match(a:text, '^\s*#') != -1
+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! elixir#indent#find_last_pos(lnum, text, match)
+  let last = len(a:text) - 1
+  let c = last
+
+  while c >= 0
+    let substr = strpart(a:text, c, last)
+    let peek = strpart(a:text, c - 1, last)
+    let ss_match = match(substr, a:match)
+    if ss_match != -1
+      let peek_match = match(peek, a:match)
+      if peek_match == ss_match + 1
+        let syng = synIDattr(synID(a:lnum, c + ss_match, 1), 'name')
+        if syng !~ '\%(String\|Comment\)'
+          return c + ss_match
+        end
+      end
+    end
+    let c -= 1
+  endwhile
+
+  return -1
+endfunction
+
+function! elixir#indent#handle_top_of_file(_lnum, _text, prev_nb_lnum, _prev_nb_text)
+  if a:prev_nb_lnum == 0
+    return 0
+  else
+    return -1
+  end
+endfunction
+
+" TODO: @jbodah 2017-03-31: remove
+function! elixir#indent#handle_following_trailing_do(lnum, text, prev_nb_lnum, prev_nb_text)
+  if elixir#indent#ends_with(a:prev_nb_text, elixir#indent#keyword('do'), a:prev_nb_lnum)
+    if elixir#indent#starts_with(a:text, elixir#indent#keyword('end'), a:lnum)
+      return indent(a:prev_nb_lnum)
+    else
+      return indent(a:prev_nb_lnum) + &sw
+    end
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_following_trailing_binary_operator(lnum, text, prev_nb_lnum, prev_nb_text)
+  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
+
+  if elixir#indent#ends_with(a:prev_nb_text, binary_operator, a:prev_nb_lnum)
+    return indent(a:prev_nb_lnum) + &sw
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_starts_with_pipe(lnum, text, prev_nb_lnum, prev_nb_text)
+  if elixir#indent#starts_with(a:text, '|>', a:lnum)
+    let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'
+    let pos = elixir#indent#find_last_pos(a:prev_nb_lnum, a:prev_nb_text, match_operator)
+    if pos == -1
+      return indent(a:prev_nb_lnum)
+    else
+      let next_word_pos = match(strpart(a:prev_nb_text, pos+1, len(a:prev_nb_text)-1), '\S')
+      if next_word_pos == -1
+        return indent(a:prev_nb_lnum) + &sw
+      else
+        return pos + 1 + next_word_pos
+      end
+    end
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_starts_with_comment(_lnum, text, prev_nb_lnum, _prev_nb_text)
+  if elixir#indent#starts_with_comment(a:text)
+    return indent(a:prev_nb_lnum)
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_starts_with_end(lnum, text, _prev_nb_lnum, _prev_nb_text)
+  if elixir#indent#starts_with(a:text, elixir#indent#keyword('end'), a:lnum)
+    let pair_lnum = elixir#indent#searchpair_back(elixir#indent#keyword('do\|fn'), '', elixir#indent#keyword('end').'\zs')
+    return indent(pair_lnum)
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_starts_with_mid_or_end_block_keyword(lnum, text, _prev_nb_lnum, _prev_nb_text)
+  if elixir#indent#starts_with(a:text, elixir#indent#keyword('catch\|rescue\|after\|else'), a:lnum)
+    let pair_lnum = elixir#indent#searchpair_back(elixir#indent#keyword('with\|receive\|try\|if\|fn'), elixir#indent#keyword('catch\|rescue\|after\|else').'\zs', elixir#indent#keyword('end'))
+    return indent(pair_lnum)
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_starts_with_close_bracket(lnum, text, _prev_nb_lnum, _prev_nb_text)
+  if elixir#indent#starts_with(a:text, '\%(\]\|}\|)\)', a:lnum)
+    let pair_lnum = elixir#indent#searchpair_back('\%(\[\|{\|(\)', '', '\%(\]\|}\|)\)')
+    return indent(pair_lnum)
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_starts_with_binary_operator(lnum, text, prev_nb_lnum, prev_nb_text)
+  let binary_operator = '\%(=\|<>\|>>>\|<=\|||\|+\|\~\~\~\|-\|&&\|<<<\|/\|\^\^\^\|\*\)'
+
+  if elixir#indent#starts_with(a:text, binary_operator, a:lnum)
+    let match_operator = '\%(!\|=\|<\|>\)\@<!=\%(=\|>\|\~\)\@!'
+    let pos = elixir#indent#find_last_pos(a:prev_nb_lnum, a:prev_nb_text, match_operator)
+    if pos == -1
+      return indent(a:prev_nb_lnum)
+    else
+      let next_word_pos = match(strpart(a:prev_nb_text, pos+1, len(a:prev_nb_text)-1), '\S')
+      if next_word_pos == -1
+        return indent(a:prev_nb_lnum) + &sw
+      else
+        return pos + 1 + next_word_pos
+      end
+    end
+  else
+    return -1
+  endif
+endfunction
+
+" To handle nested structures properly we need to find the innermost
+" nested structure. For example, we might be in a function in a map in a
+" function, etc... so we need to first figure out what the innermost structure
+" is then forward execution to the proper handler
+function! elixir#indent#handle_inside_nested_construct(lnum, text, prev_nb_lnum, prev_nb_text)
+  let start_pattern = '\C\%(\<if\>\|\<case\>\|\<cond\>\|\<try\>\|\<receive\>\|\<fn\>\|{\|\[\|(\)'
+  let end_pattern = '\C\%(\<end\>\|\]\|}\|)\)'
+  let pair_info = elixir#indent#searchpairpos_back(start_pattern, '', end_pattern)
+  let pair_lnum = pair_info[0]
+  let pair_col = pair_info[1]
+  if pair_lnum != 0 || pair_col != 0
+    let pair_text = getline(pair_lnum)
+    let pair_char = pair_text[pair_col - 1]
+    if pair_char == 'f'
+      call elixir#indent#debug("testing elixir#indent#do_handle_inside_fn")
+      return elixir#indent#do_handle_inside_fn(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
+    elseif pair_char == '['
+      call elixir#indent#debug("testing elixir#indent#do_handle_inside_square_brace")
+      return elixir#indent#do_handle_inside_square_brace(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
+    elseif pair_char == '{'
+      call elixir#indent#debug("testing elixir#indent#do_handle_inside_curly_brace")
+      return elixir#indent#do_handle_inside_curly_brace(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
+    elseif pair_char == '('
+      call elixir#indent#debug("testing elixir#indent#do_handle_inside_parens")
+      return elixir#indent#do_handle_inside_parens(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
+    else
+      call elixir#indent#debug("testing elixir#indent#do_handle_inside_keyword_block")
+      return elixir#indent#do_handle_inside_keyword_block(pair_lnum, pair_col, a:lnum, a:text, a:prev_nb_lnum, a:prev_nb_text)
+    end
+  else
+    return -1
+  end
+endfunction
+
+function! elixir#indent#do_handle_inside_keyword_block(pair_lnum, _pair_col, _lnum, text, prev_nb_lnum, prev_nb_text)
+  let keyword_pattern = '\C\%(\<case\>\|\<cond\>\|\<try\>\|\<receive\>\|\<after\>\|\<catch\>\|\<rescue\>\|\<else\>\)'
+  if a:pair_lnum
+      " last line is a "receive" or something
+    if elixir#indent#starts_with(a:prev_nb_text, keyword_pattern, a:prev_nb_lnum)
+      call elixir#indent#debug("prev nb line is keyword")
+      return indent(a:prev_nb_lnum) + &sw
+    elseif elixir#indent#contains(a:text, '->')
+      call elixir#indent#debug("contains ->")
+      " TODO: @jbodah 2017-03-31: test contains ignores str + comments
+      return indent(a:pair_lnum) + &sw
+    elseif elixir#indent#contains(a:prev_nb_text, '->')
+      call elixir#indent#debug("prev nb line contains ->")
+      return indent(a:prev_nb_lnum) + &sw
+    else
+      call elixir#indent#debug("doesnt start with comment or contain ->")
+      return indent(a:prev_nb_lnum)
+    end
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#do_handle_inside_fn(pair_lnum, _pair_col, lnum, text, prev_nb_lnum, prev_nb_text)
+  if a:pair_lnum && a:pair_lnum != a:lnum
+    if elixir#indent#contains(a:text, '->')
+      return indent(a:pair_lnum) + &sw
+    else
+      if elixir#indent#ends_with(a:prev_nb_text, '->', a:prev_nb_lnum)
+        return indent(a:prev_nb_lnum) + &sw
+      else
+        return indent(a:prev_nb_lnum)
+      end
+    end
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#do_handle_inside_square_brace(pair_lnum, pair_col, _lnum, _text, _prev_nb_lnum, _prev_nb_text)
+  " If in list...
+  if a:pair_lnum != 0 || a:pair_col != 0
+    let pair_text = getline(a:pair_lnum)
+    let substr = strpart(pair_text, a:pair_col, len(pair_text)-1)
+    let indent_pos = match(substr, '\S')
+    if indent_pos != -1
+      return indent_pos + a:pair_col
+    else
+      return indent(a:pair_lnum) + &sw
+    endif
+  else
+    return -1
+  end
+endfunction
+
+function! elixir#indent#do_handle_inside_curly_brace(pair_lnum, _pair_col, _lnum, _text, _prev_nb_lnum, _prev_nb_text)
+  return indent(a:pair_lnum) + &sw
+endfunction
+
+function! elixir#indent#do_handle_inside_parens(pair_lnum, pair_col, _lnum, _text, prev_nb_lnum, prev_nb_text)
+  if a:pair_lnum
+    if elixir#indent#ends_with(a:prev_nb_text, '(', a:prev_nb_lnum)
+      return indent(a:prev_nb_lnum) + &sw
+    elseif a:pair_lnum == a:prev_nb_lnum
+      " Align indent (e.g. "def add(a,")
+      let pos = elixir#indent#find_last_pos(a:prev_nb_lnum, a:prev_nb_text, '[^(]\+,')
+      if pos == -1
+        return 0
+      else
+        return pos
+      end
+    else
+      return indent(a:prev_nb_lnum)
+    end
+  else
+    return -1
+  endif
+endfunction
+
+function! elixir#indent#handle_inside_generic_block(lnum, _text, prev_nb_lnum, prev_nb_text)
+  let pair_lnum = searchpair(elixir#indent#keyword('do\|fn'), '', elixir#indent#keyword('end'), 'bW', "line('.') == ".a:lnum." || elixir#indent#is_string_or_comment(line('.'), col('.'))")
+  if pair_lnum
+    " TODO: @jbodah 2017-03-29: this should probably be the case in *all*
+    " blocks
+    if elixir#indent#ends_with(a:prev_nb_text, ',', a:prev_nb_lnum)
+      return indent(pair_lnum) + 2 * &sw
+    else
+      return indent(pair_lnum) + &sw
+    endif
+  else
+    return -1
+  endif
+endfunction
+
+endif

autoload/elixir/util.vim

@@ -0,0 +1,28 @@
+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/htmlcomplete.vim

@@ -6,7 +6,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'html5') == -1
 " Last Change:  2006 Oct 19
 " Modified:     othree <othree@gmail.com>
 " Changes:      Add HTML5, WAI-ARIA support
-" Last Change:	2010 Sep 25
+" Last Change:  2016 Oct 11
 
 if !exists('g:aria_attributes_complete')
   let g:aria_attributes_complete = 1
@@ -276,7 +276,9 @@ function! htmlcomplete#CompleteTags(findstart, base)
   " 1. Events attributes
   if context =~ '\s'
     " Sort out style, class, and on* cases
-		if context =~? "\\s\\(on[a-z]+\\|id\\|style\\|class\\)\\s*=\\s*[\"']"
+    if context =~? "\\(id\\|class\\)\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$"
+     \ || context =~? "style\\s*=\\s*[\"'][^\"']*$"
+     \ || context =~? 'on[a-z]*\s*=\s*\(''[^'']*\|"[^"]*\)$'
       " Id, class completion {{{
       if context =~? "\\(id\\|class\\)\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$"
         if context =~? "class\\s*=\\s*[\"'][a-zA-Z0-9_ -]*$"

autoload/python/utils.vim

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

autoload/racket.vim

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

autoload/rubycomplete.vim

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

autoload/rustfmt.vim

@@ -22,17 +22,20 @@ endif
 
 let s:got_fmt_error = 0
 
-function! rustfmt#Format()
+function! s:RustfmtCommandRange(filename, line1, line2)
-  let l:curw = winsaveview()
+  let l:arg = {"file": shellescape(a:filename), "range": [a:line1, a:line2]}
-  let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
+  return printf("%s %s --write-mode=overwrite --file-lines '[%s]'", g:rustfmt_command, g:rustfmt_options, json_encode(l:arg))
-  call writefile(getline(1, '$'), l:tmpname)
+endfunction
 
-  let command = g:rustfmt_command . " --write-mode=overwrite "
+function! s:RustfmtCommand(filename)
+  return g:rustfmt_command . " --write-mode=overwrite " . g:rustfmt_options . " " . shellescape(a:filename)
+endfunction
 
+function! s:RunRustfmt(command, curw, tmpname)
   if exists("*systemlist")
-    let out = systemlist(command . g:rustfmt_options . " " . shellescape(l:tmpname))
+    let out = systemlist(a:command)
   else
-    let out = split(system(command . g:rustfmt_options . " " . shellescape(l:tmpname)), '\r\?\n')
+    let out = split(system(a:command), '\r\?\n')
   endif
 
   if v:shell_error == 0 || v:shell_error == 3
@@ -40,7 +43,7 @@ function! rustfmt#Format()
     try | silent undojoin | catch | endtry
 
     " Replace current file with temp file, then reload buffer
-    call rename(l:tmpname, expand('%'))
+    call rename(a:tmpname, expand('%'))
     silent edit!
     let &syntax = &syntax
 
@@ -78,10 +81,30 @@ function! rustfmt#Format()
     let s:got_fmt_error = 1
     lwindow
     " We didn't use the temp file, so clean up
-    call delete(l:tmpname)
+    call delete(a:tmpname)
   endif
 
-  call winrestview(l:curw)
+  call winrestview(a:curw)
+endfunction
+
+function! rustfmt#FormatRange(line1, line2)
+  let l:curw = winsaveview()
+  let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
+  call writefile(getline(1, '$'), l:tmpname)
+
+  let command = s:RustfmtCommandRange(l:tmpname, a:line1, a:line2)
+
+  call s:RunRustfmt(command, l:curw, l:tmpname)
+endfunction
+
+function! rustfmt#Format()
+  let l:curw = winsaveview()
+  let l:tmpname = expand("%:p:h") . "/." . expand("%:p:t") . ".rustfmt"
+  call writefile(getline(1, '$'), l:tmpname)
+
+  let command = s:RustfmtCommand(l:tmpname)
+
+  call s:RunRustfmt(command, l:curw, l:tmpname)
 endfunction
 
 endif

autoload/scss_indent.vim

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

autoload/xml/aria.vim

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

autoload/xml/html5.vim

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

build

@@ -2,11 +2,12 @@
 
 set -E
 
-DIRS="syntax indent compiler autoload ftplugin ftdetect after/syntax after/indent after/ftplugin after/ftdetect"
+DIRS="syntax indent compiler autoload ftplugin after/syntax after/indent after/ftplugin"
-DIRS_BASIC="syntax compiler indent ftdetect after/syntax after/indent after/ftdetect"
+DIRS_BASIC="syntax compiler indent after/syntax after/indent"
-DIRS_ALL="syntax indent compiler autoload ftplugin ftdetect after"
+DIRS_ALL="syntax indent compiler autoload ftplugin after"
-DIRS_SYNTAX="syntax ftdetect after/syntax after/ftdetect"
+DIRS_SYNTAX="syntax after/syntax"
 DIRS_JAVASCRIPT="${DIRS} extras"
+DIRS_RM="$DIRS_JAVASCRIPT"
 
 OUTPUT=""
 
@@ -28,6 +29,9 @@ download() {
 
 extract() {
   printf "\n"
+
+  cat config.vim >> tmp/polyglot.vim
+
   for pack in $1; do
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
@@ -48,10 +52,21 @@ extract() {
       fi
     done
 
+    for f in ${dir}/ftdetect/*; do
+      (
+        echo "augroup filetypedetect";
+        echo '" '"$pack";
+        cat "${f}";
+        echo "augroup END";
+        echo
+      ) >> tmp/polyglot.vim;
+    done
 
     output "${subdirs##, })\n"
   done
 
+  mv tmp/polyglot.vim ftdetect/
+
   for pack in $1; do
     name="$(printf "$pack" | cut -d ':' -f 1)"
     path="$(printf "$pack" | cut -d ':' -f 2)"
@@ -75,13 +90,6 @@ copy_dir() {
   done
 }
 
-concat_ftdetect() {
-  cat config.vim >> tmp/polyglot.vim
-  for f in ftdetect/*; do (echo '" '"$f"; cat "${f}"; echo) >> tmp/polyglot.vim; done
-  rm -f ftdetect/*
-  mv tmp/polyglot.vim ftdetect/
-}
-
 update_readme() {
   OLD_README="$(cat README.md)"
 
@@ -90,7 +98,7 @@ update_readme() {
 +2kb
 /##
 'b,-2c
-$(printf -- "$OUTPUT")
+$(printf -- "$OUTPUT" | sort)
 .
 w
 q
@@ -99,12 +107,16 @@ EOF
 }
 
 PACKS="
+  apiblueprint:sheerun/apiblueprint.vim
   applescript:vim-scripts/applescript.vim
+  asciidoc:asciidoc/vim-asciidoc
+  yaml:stephpy/vim-yaml
   ansible:pearofducks/ansible-vim
   arduino:sudar/vim-arduino-syntax
   blade:jwalton512/vim-blade
   c++11:octol/vim-cpp-enhanced-highlight
   c/c++:vim-jp/vim-cpp
+  caddyfile:joshglendenning/vim-caddyfile
   cjsx:mtscout6/vim-cjsx
   clojure:guns/vim-clojure-static
   coffee-script:kchmck/vim-coffee-script
@@ -114,7 +126,7 @@ PACKS="
   css:JulesWang/css.vim
   cucumber:tpope/vim-cucumber
   dart:dart-lang/dart-vim-plugin
-  dockerfile:honza/dockerfile.vim
+  dockerfile:docker/docker::/contrib/syntax/vim/
   elixir:elixir-lang/vim-elixir
   elm:lambdatoast/elm.vim
   emberscript:yalesov/vim-ember-script
@@ -123,13 +135,16 @@ PACKS="
   fish:dag/vim-fish
   git:tpope/vim-git
   glsl:tikhomirov/vim-glsl
+  gnuplot:vim-scripts/gnuplot-syntax-highlighting
   go:fatih/vim-go:_BASIC
+  graphql:jparise/vim-graphql
   groovy:vim-scripts/groovy.vim
-  haml:tpope/vim-haml
+  haml:sheerun/vim-haml
   handlebars:mustache/vim-mustache-handlebars
   haskell:neovimhaskell/haskell-vim
   haxe:yaymukund/vim-haxe
   html5:othree/html5.vim
+  i3:PotatoesMaster/i3-vim-syntax
   jasmine:glanotte/vim-jasmine
   javascript:pangloss/vim-javascript:_JAVASCRIPT
   json:elzr/vim-json
@@ -144,7 +159,8 @@ PACKS="
   lua:tbastos/vim-lua
   mako:sophacles/vim-bundle-mako
   markdown:plasticboy/vim-markdown:_SYNTAX
-  nginx:othree/nginx-contrib-vim
+  mathematica:rsmenon/vim-mathematica
+  nginx:chr4/nginx.vim
   nim:zah/nim.vim:_BASIC
   nix:spwhitt/vim-nix
   objc:b4winckler/vim-objc
@@ -155,49 +171,54 @@ PACKS="
   pgsql:exu/pgsql.vim
   php:StanAngeloff/php.vim
   plantuml:aklt/plantuml-syntax
-  powershell:Persistent13/vim-ps1
+  powershell:PProvost/vim-ps1
   protobuf:uarun/vim-protobuf
   pug:digitaltoad/vim-pug
   puppet:voxpupuli/vim-puppet
   purescript:raichoo/purescript-vim
   python:mitsuhiko/vim-python-combined
+  python-compiler:aliev/vim-compiler-python
   qml:peterhoeg/vim-qml
   r-lang:vim-scripts/R.vim
+  racket:wlangstroth/vim-racket
+  raml:IN3D/vim-raml
   ragel:jneen/ragel.vim
   rspec:sheerun/rspec.vim
   ruby:vim-ruby/vim-ruby
   rust:rust-lang/rust.vim
   sbt:derekwyatt/vim-sbt
   scala:derekwyatt/vim-scala
+  scss:cakebaker/scss-syntax.vim
   slim:slim-template/vim-slim
   solidity:ethereum/vim-solidity
   stylus:wavded/vim-stylus
   swift:keith/swift.vim
+  sxhkd:baskerville/vim-sxhkdrc
   systemd:kurayama/systemd-vim-syntax
+  terraform:hashivim/vim-terraform
   textile:timcharper/textile.vim
   thrift:solarnz/thrift.vim
   tmux:keith/tmux.vim
   tomdoc:wellbredgrapefruit/tomdoc.vim
   toml:cespare/vim-toml
-  twig:evidens/vim-twig
+  twig:lumiliet/vim-twig
   typescript:leafgarland/typescript-vim
-  vala:tkztmk/vim-vala
+  vala:arrufat/vala.vim
   vbnet:vim-scripts/vbnet.vim
   vcl:smerrill/vcl-vim-plugin
+  vue:posva/vim-vue
   vm:lepture/vim-velocity
   xls:vim-scripts/XSLT-syntax
-  yaml:stephpy/vim-yaml
   yard:sheerun/vim-yardoc
 "
 
 rm -rf tmp
-rm -rf $DIRS_ALL
+rm -rf $DIRS_RM
 mkdir tmp
 
 printf "Downloading packs..."
 download "$PACKS"
 extract "$PACKS"
-concat_ftdetect
 update_readme
 
 rm -rf tmp

compiler/cargo.vim

@@ -21,49 +21,12 @@ else
     CompilerSet makeprg=cargo\ $*
 endif
 
-" Allow a configurable global Cargo.toml name. This makes it easy to
+" Ignore general cargo progress messages
-" support variations like 'cargo.toml'.
+CompilerSet errorformat+=
-let s:cargo_manifest_name = get(g:, 'cargo_manifest_name', 'Cargo.toml')
+			\%-G%\\s%#Downloading%.%#,
-
+			\%-G%\\s%#Compiling%.%#,
-function! s:is_absolute(path)
+			\%-G%\\s%#Finished%.%#,
-    return a:path[0] == '/' || a:path =~ '[A-Z]\+:'
+			\%-G%\\s%#error:\ Could\ not\ compile\ %.%#,
-endfunction
+			\%-G%\\s%#To\ learn\ more\\,%.%#
-
-let s:local_manifest = findfile(s:cargo_manifest_name, '.;')
-if s:local_manifest != ''
-    let s:local_manifest = fnamemodify(s:local_manifest, ':p:h').'/'
-    augroup cargo
-        au!
-        au QuickfixCmdPost make call s:FixPaths()
-    augroup END
-
-    " FixPaths() is run after Cargo, and is used to change the file paths
-    " to be relative to the current directory instead of Cargo.toml.
-    function! s:FixPaths()
-        let qflist = getqflist()
-        let manifest = s:local_manifest
-        for qf in qflist
-            if !qf.valid
-                let m = matchlist(qf.text, '(file://\(.*\))$')
-                if !empty(m)
-                    let manifest = m[1].'/'
-                    " Manually strip another slash if needed; usually just an
-                    " issue on Windows.
-                    if manifest =~ '^/[A-Z]\+:/'
-                        let manifest = manifest[1:]
-                    endif
-                endif
-                continue
-            endif
-            let filename = bufname(qf.bufnr)
-            if s:is_absolute(filename)
-                continue
-            endif
-            let qf.filename = simplify(manifest.filename)
-            call remove(qf, 'bufnr')
-        endfor
-        call setqflist(qflist, 'r')
-    endfunction
-endif
 
 endif

compiler/eslint.vim

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

compiler/python.vim

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

compiler/rake.vim

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

compiler/rustc.vim

@@ -23,6 +23,7 @@ else
 	CompilerSet makeprg=rustc\ \%
 endif
 
+" Old errorformat (before nightly 2016/08/10)
 CompilerSet errorformat=
 			\%f:%l:%c:\ %t%*[^:]:\ %m,
 			\%f:%l:%c:\ %*\\d:%*\\d\ %t%*[^:]:\ %m,
@@ -31,6 +32,17 @@ CompilerSet errorformat=
 			\%-G%*[\ ]^%*[~],
 			\%-G%*[\ ]...
 
+" New errorformat (after nightly 2016/08/10)
+CompilerSet errorformat+=
+			\%-G,
+			\%-Gerror:\ aborting\ %.%#,
+			\%-Gerror:\ Could\ not\ compile\ %.%#,
+			\%Eerror:\ %m,
+			\%Eerror[E%n]:\ %m,
+			\%Wwarning:\ %m,
+			\%Inote:\ %m,
+			\%C\ %#-->\ %f:%l:%c
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
 

compiler/sass.vim

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

compiler/typescript.vim

@@ -13,6 +13,10 @@ if !exists("g:typescript_compiler_options")
   let g:typescript_compiler_options = ""
 endif
 
+if exists(":CompilerSet") != 2
+  command! -nargs=* CompilerSet setlocal <args>
+endif
+
 let &l:makeprg = g:typescript_compiler_binary . ' ' . g:typescript_compiler_options . ' $*  %'
 
 CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m

config.vim

@@ -7,3 +7,5 @@ endif
 if !exists('g:vim_json_syntax_conceal')
   let g:vim_json_syntax_conceal = 0
 endif
+
+let g:filetype_euphoria = 'elixir'

extras/flow.vim

@@ -1,23 +1,53 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
   
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+syntax region  jsFlowDefinition     contained                        start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster containedin=jsParen
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+syntax region  jsFlowArgumentDef    contained                        start=/:/    end=/\%(\s*[,)]\|=>\@!\)\@=/ contains=@jsFlowCluster
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/   end=/\]/        contains=@jsFlowCluster
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/    end=/}/         contains=@jsFlowCluster
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+syntax region  jsFlowParens         contained matchgroup=jsFlowNoise start=/(/  end=/)/ contains=@jsFlowCluster
-syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
-syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
 syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array Function object array bool class
-syntax keyword jsFlowStorageClass   contained const var let
+syntax keyword jsFlowTypeof         contained typeof skipempty skipempty nextgroup=jsFlowTypeCustom,jsFlowType
-syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
+syntax match   jsFlowTypeCustom     contained /[0-9a-zA-Z_.]*/ skipwhite skipempty nextgroup=jsFlowGroup
-syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+syntax region  jsFlowGroup          contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster
+syntax region  jsFlowArrowArguments contained matchgroup=jsFlowNoise start=/(/  end=/)\%(\s*=>\)\@=/ oneline skipwhite skipempty nextgroup=jsFlowArrow contains=@jsFlowCluster
+syntax match   jsFlowArrow          contained /=>/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens
+syntax match   jsFlowMaybe          contained /?/ skipwhite skipempty nextgroup=jsFlowType,jsFlowTypeCustom,jsFlowParens,jsFlowArrowArguments,jsFlowObject,jsFlowReturnObject
+syntax match   jsFlowObjectKey      contained /[0-9a-zA-Z_$?]*\(\s*:\)\@=/ contains=jsFunctionKey,jsFlowMaybe skipwhite skipempty nextgroup=jsObjectValue containedin=jsObject
+syntax match   jsFlowOrOperator     contained /|/ skipwhite skipempty nextgroup=@jsFlowCluster
+syntax keyword jsFlowImportType     contained type skipwhite skipempty nextgroup=jsModuleAsterisk,jsModuleKeyword,jsModuleGroup
+syntax match   jsFlowWildcard       contained /*/
+
+syntax match   jsFlowReturn         contained /:\s*/ contains=jsFlowNoise skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax region  jsFlowReturnObject   contained matchgroup=jsFlowNoise start=/{/    end=/}/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnArray    contained matchgroup=jsFlowNoise start=/\[/   end=/\]/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax region  jsFlowReturnParens   contained matchgroup=jsFlowNoise start=/(/    end=/)/  contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnKeyword  contained /\k\+/ contains=jsFlowType,jsFlowTypeCustom skipwhite skipempty nextgroup=jsFlowReturnGroup,jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnMaybe    contained /?/ skipwhite skipempty nextgroup=jsFlowReturnKeyword
+syntax region  jsFlowReturnGroup    contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncBlock,jsFlowReturnOrOp
+syntax match   jsFlowReturnOrOp     contained /\s*|\s*/ skipwhite skipempty nextgroup=@jsFlowReturnCluster
+syntax match   jsFlowWildcardReturn contained /*/ skipwhite skipempty nextgroup=jsFuncBlock
+
+syntax region  jsFlowFunctionGroup  contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsFuncArgs
+syntax region  jsFlowClassGroup     contained matchgroup=jsFlowNoise start=/</ end=/>/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
+
+syntax region  jsFlowTypeStatement                                   start=/type\%(\s\+\k\)\@=/    end=/=\@=/ contains=jsFlowTypeOperator oneline skipwhite skipempty nextgroup=jsFlowTypeValue keepend
+syntax region  jsFlowTypeValue      contained                        start=/=/       end=/[;\n]/ contains=@jsExpression,jsFlowGroup,jsFlowMaybe
+syntax match   jsFlowTypeOperator   contained /=/
+syntax keyword jsFlowTypeKeyword    contained type
+
+syntax keyword jsFlowDeclare                  declare skipwhite skipempty nextgroup=jsFlowTypeStatement,jsClassDefinition,jsStorageClass,jsFlowModule,jsFlowInterface
+syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlowClassDef containedin=jsClassBlock
+syntax region  jsFlowClassDef       contained start=/:/    end=/\%(\s*[,=;)\n]\)\@=/ contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassValue
+
+syntax region  jsFlowModule         contained start=/module/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowDeclareBlock contains=jsString
+syntax region  jsFlowInterface      contained start=/interface/ end=/{\@=/ skipempty skipempty nextgroup=jsFlowInterfaceBlock contains=@jsFlowCluster
+syntax region  jsFlowDeclareBlock   contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsFlowDeclare,jsFlowNoise
+
+syntax region jsFlowInterfaceBlock  contained matchgroup=jsFlowNoise start=/{/ end=/}/ contains=jsObjectKey,jsObjectKeyString,jsObjectKeyComputed,jsObjectSeparator,jsObjectFuncName,jsObjectMethodType,jsGenerator,jsComment,jsObjectStringKey,jsSpreadExpression,jsFlowNoise keepend
+
+syntax cluster jsFlowReturnCluster            contains=jsFlowNoise,jsFlowReturnObject,jsFlowReturnArray,jsFlowReturnKeyword,jsFlowReturnGroup,jsFlowReturnMaybe,jsFlowReturnOrOp,jsFlowWildcardReturn
+syntax cluster jsFlowCluster                  contains=jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowTypeof,jsFlowType,jsFlowGroup,jsFlowArrowArguments,jsFlowMaybe,jsFlowParens,jsFlowOrOperator,jsFlowWildcard
 
 if version >= 508 || !exists("did_javascript_syn_inits")
   if version < 508
@@ -26,204 +56,40 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   else
     command -nargs=+ HiLink hi def link <args>
   endif
-  HiLink jsFlow                   PreProc
+  HiLink jsFlowDefinition         PreProc
-  HiLink jsFlowReturn             PreProc
+  HiLink jsFlowClassDef           jsFlowDefinition
-  HiLink jsFlowArray              PreProc
+  HiLink jsFlowArgumentDef        jsFlowDefinition
-  HiLink jsFlowDeclareBlock       PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowParenRegion        PreProc
-  HiLink jsFlowClass              PreProc
-  HiLink jsFlowTypeObject         PreProc
-  HiLink jsFlowTypeKey            PreProc
-  HiLink jsFlowTypeValue          PreProc
-  HiLink jsFlowClassProperty      jsClassProperty
   HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
+  HiLink jsFlowTypeCustom         PreProc
-  HiLink jsFlowNoise              Noise
+  HiLink jsFlowTypeof             PreProc
-  delcommand HiLink
+  HiLink jsFlowArray              PreProc
-endif
+  HiLink jsFlowObject             PreProc
-
+  HiLink jsFlowParens             PreProc
-endif
+  HiLink jsFlowGroup              PreProc
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
+  HiLink jsFlowReturn             PreProc
-  
+  HiLink jsFlowReturnObject       jsFlowReturn
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
+  HiLink jsFlowReturnArray        jsFlowArray
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
+  HiLink jsFlowReturnParens       jsFlowParens
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
+  HiLink jsFlowReturnGroup        jsFlowGroup
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
+  HiLink jsFlowFunctionGroup      PreProc
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
+  HiLink jsFlowClassGroup         PreProc
-syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
+  HiLink jsFlowArrowArguments     PreProc
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
+  HiLink jsFlowArrow              PreProc
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
+  HiLink jsFlowTypeStatement      PreProc
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
+  HiLink jsFlowTypeKeyword        PreProc
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
+  HiLink jsFlowTypeOperator       PreProc
-syntax keyword jsFlowDeclareKeyword contained declare
+  HiLink jsFlowMaybe              PreProc
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
+  HiLink jsFlowReturnMaybe        PreProc
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
+  HiLink jsFlowClassProperty      jsClassProperty
-syntax match   jsFlowNoise          contained /[:;,<>]/
+  HiLink jsFlowDeclare            PreProc
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
+  HiLink jsFlowModule             PreProc
-syntax keyword jsFlowStorageClass   contained const var let
+  HiLink jsFlowInterface          PreProc
-syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
-
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsFlow                   PreProc
-  HiLink jsFlowReturn             PreProc
-  HiLink jsFlowArray              PreProc
-  HiLink jsFlowDeclareBlock       PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowParenRegion        PreProc
-  HiLink jsFlowClass              PreProc
-  HiLink jsFlowTypeObject         PreProc
-  HiLink jsFlowTypeKey            PreProc
-  HiLink jsFlowTypeValue          PreProc
-  HiLink jsFlowClassProperty      jsClassProperty
-  HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
-  HiLink jsFlowNoise              Noise
-  delcommand HiLink
-endif
-
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
-syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
-syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
-syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
-syntax keyword jsFlowStorageClass   contained const var let
-syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
-
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsFlow                   PreProc
-  HiLink jsFlowReturn             PreProc
-  HiLink jsFlowArray              PreProc
-  HiLink jsFlowDeclareBlock       PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowParenRegion        PreProc
-  HiLink jsFlowClass              PreProc
-  HiLink jsFlowTypeObject         PreProc
-  HiLink jsFlowTypeKey            PreProc
-  HiLink jsFlowTypeValue          PreProc
-  HiLink jsFlowClassProperty      jsClassProperty
-  HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
-  HiLink jsFlowNoise              Noise
-  delcommand HiLink
-endif
-
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
-syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
-syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
-syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
-syntax keyword jsFlowStorageClass   contained const var let
-syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
-
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsFlow                   PreProc
-  HiLink jsFlowReturn             PreProc
-  HiLink jsFlowArray              PreProc
-  HiLink jsFlowDeclareBlock       PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowParenRegion        PreProc
-  HiLink jsFlowClass              PreProc
-  HiLink jsFlowTypeObject         PreProc
-  HiLink jsFlowTypeKey            PreProc
-  HiLink jsFlowTypeValue          PreProc
-  HiLink jsFlowClassProperty      jsClassProperty
-  HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
-  HiLink jsFlowNoise              Noise
-  delcommand HiLink
-endif
-
-endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
-syntax region  jsFlowTypeStatement            start=/type/    end=/=/     oneline skipwhite skipempty nextgroup=jsFlowTypeObject
-syntax region  jsFlowDeclareBlock             start=/declare/ end=/[;\n]/ oneline contains=jsFlow,jsFlowDeclareKeyword,jsFlowStorageClass
-syntax region  jsFlow                         start=/:/       end=/\%(\%([),=;\n]\|{\%(.*}\)\@!\|\%({.*}\)\@<=\s*{\)\@=\|void\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock
-syntax region  jsFlowReturn         contained start=/:/       end=/\%(\S\s*\%({\%(.*}\)\@!\)\@=\|\n\)/ contains=@jsFlowCluster oneline skipwhite skipempty nextgroup=jsFuncBlock keepend
-syntax region  jsFlowTypeObject     contained start=/{/       end=/}/ contains=jsFlowTypeKey skipwhite skipempty nextgroup=jsFunctionBlock extend
-syntax match   jsFlowTypeKey        contained /\<[0-9a-zA-Z_$?]*\>\(\s*:\)\@=/ skipwhite skipempty nextgroup=jsFlowTypeValue
-syntax region  jsFlowTypeValue      contained matchgroup=jsFlowNoise start=/:/       end=/[,}]/ contains=@jsFlowCluster
-syntax region  jsFlowObject         contained matchgroup=jsFlowNoise start=/{/       end=/}/     oneline contains=@jsFlowCluster
-syntax region  jsFlowArray          contained matchgroup=jsFlowNoise start=/\[/      end=/\]/    oneline contains=@jsFlowCluster
-syntax region  jsFlowArrow          contained matchgroup=jsFlowNoise start=/(/       end=/)\s*=>/     oneline contains=@jsFlowCluster
-syntax keyword jsFlowDeclareKeyword contained declare
-syntax keyword jsFlowType           contained boolean number string null void any mixed JSON array function object Array
-syntax match   jsFlowClassProperty  contained /\<[0-9a-zA-Z_$]*\>:\@=/ skipwhite skipempty nextgroup=jsFlow
-syntax match   jsFlowNoise          contained /[:;,<>]/
-syntax cluster jsFlowCluster        contains=jsFlowType,jsFlowArray,jsFlowObject,jsFlowNoise,jsFlowArrow
-syntax keyword jsFlowStorageClass   contained const var let
-syntax region  jsFlowParenRegion    contained start=/:\s*(/ end=/)\%(\s*:\)\@=/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsObjectValue
-syntax region  jsFlowClass          contained matchgroup=jsFlowNoise start=/</ end=/>/ oneline contains=@jsFlowCluster skipwhite skipempty nextgroup=jsClassBlock
-
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsFlow                   PreProc
-  HiLink jsFlowReturn             PreProc
-  HiLink jsFlowArray              PreProc
-  HiLink jsFlowDeclareBlock       PreProc
-  HiLink jsFlowObject             PreProc
-  HiLink jsFlowParenRegion        PreProc
-  HiLink jsFlowClass              PreProc
-  HiLink jsFlowTypeObject         PreProc
-  HiLink jsFlowTypeKey            PreProc
-  HiLink jsFlowTypeValue          PreProc
-  HiLink jsFlowClassProperty      jsClassProperty
-  HiLink jsFlowType               Type
-  HiLink jsFlowDeclareKeyword     Type
   HiLink jsFlowNoise              Noise
+  HiLink jsFlowObjectKey          jsObjectKey
+  HiLink jsFlowOrOperator         PreProc
+  HiLink jsFlowReturnOrOp         jsFlowOrOperator
+  HiLink jsFlowWildcard           PreProc
+  HiLink jsFlowWildcardReturn     PreProc
   delcommand HiLink
 endif
 

extras/jsdoc.vim

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

extras/ngdoc.vim

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

ftplugin/ansible.vim

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

ftplugin/blade.vim

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

ftplugin/caddyfile.vim

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

ftplugin/crystal.vim

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

ftplugin/dart.vim

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

ftplugin/eelixir.vim

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

ftplugin/elixir.vim

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

ftplugin/graphql.vim

@@ -0,0 +1,17 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+  
+" Vim filetype plugin
+" Language: GraphQL
+" Maintainer: Jon Parise <jon@indelible.org>
+
+if (exists("b:did_ftplugin"))
+  finish
+endif
+let b:did_ftplugin = 1
+
+setlocal comments=:#
+setlocal commentstring=#\ %s
+setlocal formatoptions-=t
+setlocal iskeyword+=$,@-@
+
+endif

ftplugin/i3.vim

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

ftplugin/javascript.vim

@@ -1,8 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') == -1
-  
-setlocal suffixesadd+=.js
-if (v:version < 704 || (v:version == 704 && !has('patch002'))) && exists('&regexpengine')
-  set re=1
-end
-
-endif

ftplugin/litcoffee.vim

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

ftplugin/mma.vim

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

ftplugin/nginx.vim

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

ftplugin/perl6.vim

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

ftplugin/plantuml.vim

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

ftplugin/ps1.vim

@@ -19,6 +19,8 @@ setlocal formatoptions=tcqro
 " Enable autocompletion of hyphenated PowerShell commands,
 " e.g. Get-Content or Get-ADUser
 setlocal iskeyword+=-
+" MS applications (including PowerShell) require a Byte Order Mark (BOM) for UTF-8.
+setlocal bomb
 
 " Change the browse dialog on Win32 to show mainly PowerShell-related files
 if has("gui_win32")

ftplugin/ps1xml.vim

@@ -16,6 +16,8 @@ let b:did_ftplugin = 1
 setlocal tw=0
 setlocal commentstring=#%s
 setlocal formatoptions=tcqro
+" MS applications (including PowerShell) require a Byte Order Mark (BOM) for UTF-8.
+setlocal bomb
 
 " Change the browse dialog on Win32 to show mainly PowerShell-related files
 if has("gui_win32")

ftplugin/purescript.vim

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

ftplugin/racket.vim

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

ftplugin/raml.vim

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

ftplugin/ruby.vim

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

ftplugin/rust.vim

@@ -48,7 +48,6 @@ endif
 " This includeexpr isn't perfect, but it's a good start
 setlocal includeexpr=substitute(v:fname,'::','/','g')
 
-" NOT adding .rc as it's being phased out (0.7)
 setlocal suffixesadd=.rs
 
 if exists("g:ftplugin_rust_source_path")
@@ -113,16 +112,6 @@ xnoremap <silent> <buffer> ]] :call rust#Jump('v', 'Forward')<CR>
 onoremap <silent> <buffer> [[ :call rust#Jump('o', 'Back')<CR>
 onoremap <silent> <buffer> ]] :call rust#Jump('o', 'Forward')<CR>
 
-" %-matching. <:> is handy for generics.
-set matchpairs+=<:>
-" There are two minor issues with it; (a) comparison operators in expressions,
-" where a less-than may match a greater-than later on—this is deemed a trivial
-" issue—and (b) `Fn() -> X` syntax. This latter issue is irremediable from the
-" highlighting perspective (built into Vim), but the actual % functionality
-" can be fixed by this use of matchit.vim.
-let b:match_skip = 's:comment\|string\|rustArrow'
-source $VIMRUNTIME/macros/matchit.vim
-
 " Commands {{{1
 
 " See |:RustRun| for docs
@@ -143,6 +132,9 @@ command! -range=% RustPlay :call rust#Play(<count>, <line1>, <line2>, <f-args>)
 " See |:RustFmt| for docs
 command! -buffer RustFmt call rustfmt#Format()
 
+" See |:RustFmtRange| for docs
+command! -range -buffer RustFmtRange call rustfmt#FormatRange(<line1>, <line2>)
+
 " Mappings {{{1
 
 " Bind ⌘R in MacVim to :RustRun
@@ -190,13 +182,27 @@ let b:undo_ftplugin = "
 		\|ounmap <buffer> ]]
 		\|set matchpairs-=<:>
 		\|unlet b:match_skip
-		\|augroup! rust.vim
 		\"
 
 " }}}1
 
+" Code formatting on save
+if get(g:, "rustfmt_autosave", 0)
+	autocmd BufWritePre *.rs silent! call rustfmt#Format()
+endif
+
 augroup END
 
+" %-matching. <:> is handy for generics.
+set matchpairs+=<:>
+" There are two minor issues with it; (a) comparison operators in expressions,
+" where a less-than may match a greater-than later on—this is deemed a trivial
+" issue—and (b) `Fn() -> X` syntax. This latter issue is irremediable from the
+" highlighting perspective (built into Vim), but the actual % functionality
+" can be fixed by this use of matchit.vim.
+let b:match_skip = 's:comment\|string\|rustArrow'
+source $VIMRUNTIME/macros/matchit.vim
+
 let &cpo = s:save_cpo
 unlet s:save_cpo
 

ftplugin/sass.vim

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

ftplugin/scala.vim

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

ftplugin/scss.vim

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

ftplugin/vue.vim

@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
+  
+" Vim filetype plugin
+" Language: Vue.js
+" Maintainer: Eduardo San Martin Morote
+" Author: Adriaan Zonnenberg
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+runtime! ftplugin/html.vim
+
+setlocal suffixesadd+=.vue
+
+if exists('g:loaded_ale')
+  let g:ale_linters = get(g:, 'ale_linters', {})
+  let g:ale_linters.vue = get(g:ale_linters, 'vue', ['eslint'])
+  let g:ale_linter_aliases = get(g:, 'ale_linter_aliases', {})
+  let g:ale_linter_aliases.vue = get(g:ale_linter_aliases, 'vue', 'javascript')
+endif
+
+endif

indent/ansible.vim

@@ -29,6 +29,11 @@ function GetAnsibleIndent(lnum)
   if a:lnum == 1 || !prevnonblank(a:lnum-1)
     return 0
   endif
+  if exists("g:ansible_unindent_after_newline")
+    if (a:lnum -1) != prevnonblank(a:lnum - 1)
+      return 0
+    endif
+  endif
   let prevlnum = prevnonblank(a:lnum - 1)
   let maintain = indent(prevlnum)
   let increase = maintain + &sw

indent/blade.vim

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

indent/caddyfile.vim

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

indent/clojure.vim

@@ -89,7 +89,7 @@ if exists("*searchpairpos")
 	function! s:match_pairs(open, close, stopat)
 		" Stop only on vector and map [ resp. {. Ignore the ones in strings and
 		" comments.
-		if a:stopat == 0
+		if a:stopat == 0 && g:clojure_maxlines > 0
 			let stopat = max([line(".") - g:clojure_maxlines, 0])
 		else
 			let stopat = a:stopat
@@ -123,7 +123,7 @@ if exists("*searchpairpos")
 			if s:syn_id_name() !~? "string"
 				return -1
 			endif
-			if s:current_char() != '\\'
+			if s:current_char() != '\'
 				return -1
 			endif
 			call cursor(0, col("$") - 1)

indent/dart.vim

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

indent/eelixir.vim

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

indent/elixir.vim

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

indent/erlang.vim

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

indent/eruby.vim

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

indent/gohtmltmpl.vim

@@ -32,13 +32,13 @@ function! GetGoHTMLTmplIndent(lnum)
 
   " If need to indent based on last line
   let last_line = getline(a:lnum-1)
-  if last_line =~ '^\s*{{\s*\%(if\|else\|range\|with\|define\|block\).*}}'
+  if last_line =~ '^\s*{{-\=\s*\%(if\|else\|range\|with\|define\|block\).*}}'
     let ind += sw
   endif
 
   " End of FuncMap block
   let current_line = getline(a:lnum)
-  if current_line =~ '^\s*{{\s*\%(else\|end\).*}}'
+  if current_line =~ '^\s*{{-\=\s*\%(else\|end\).*}}'
     let ind -= sw
   endif
 

indent/haskell.vim

@@ -13,6 +13,10 @@ if exists('b:did_indent')
   finish
 endif
 
+if get(g:, 'haskell_indent_disable', 0)
+  finish
+endif
+
 let b:did_indent = 1
 
 if !exists('g:haskell_indent_if')
@@ -60,18 +64,35 @@ if !exists('g:haskell_indent_guard')
 endif
 
 setlocal indentexpr=GetHaskellIndent()
-setlocal indentkeys=0{,0},0(,0),0[,0],!^F,o,O,0\=,0=where,0=let,0=deriving,0\,,<space>
+setlocal indentkeys=0},0),0],!^F,o,O,0=where,0=let,0=deriving,<space>
 
 function! s:isInBlock(hlstack)
-  return index(a:hlstack, 'haskellParens') > -1 || index(a:hlstack, 'haskellBrackets') > -1 || index(a:hlstack, 'haskellBlock') > -1
+  return index(a:hlstack, 'haskellDelimiter') > -1 || index(a:hlstack, 'haskellParens') > -1 || index(a:hlstack, 'haskellBrackets') > -1 || index(a:hlstack, 'haskellBlock') > -1 || index(a:hlstack, 'haskellBlockComment') > -1 || index(a:hlstack, 'haskellPragma') > -1
+endfunction
+
+function! s:stripComment(line)
+  if a:line =~ '^\s*--\(-*\s\+\|$\)'
+    return ''
+  else
+    let l:stripped = split(a:line, '-- ')
+    if len(l:stripped) > 1
+      return substitute(l:stripped[0], '\s*$', '', '')
+    else
+      return a:line
+    endif
+  endif
+endfunction
+
+function! s:isSYN(grp, line, col)
+  return index(s:getHLStack(a:line, a:col), a:grp) != -1
 endfunction
 
 function! s:getNesting(hlstack)
-  return filter(a:hlstack, 'v:val == "haskellBlock" || v:val == "haskellBrackets" || v:val == "haskellParens"')
+  return filter(a:hlstack, 'v:val == "haskellBlock" || v:val == "haskellBrackets" || v:val == "haskellParens" || v:val == "haskellBlockComment" || v:val == "haskellPragma" ')
 endfunction
 
-function! s:getHLStack()
+function! s:getHLStack(line, col)
-  return map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
+  return map(synstack(a:line, a:col), 'synIDattr(v:val, "name")')
 endfunction
 
 " indent matching character
@@ -110,14 +131,14 @@ function! s:indentGuard(pos, prevline)
 endfunction
 
 function! GetHaskellIndent()
-  let l:hlstack = s:getHLStack()
+  let l:hlstack = s:getHLStack(line('.'), col('.'))
 
   " do not indent in strings and quasiquotes
   if index(l:hlstack, 'haskellQuasiQuote') > -1 || index(l:hlstack, 'haskellBlockComment') > -1
     return -1
   endif
 
-  let l:prevline = getline(v:lnum - 1)
+  let l:prevline = s:stripComment(getline(v:lnum - 1))
   let l:line     = getline(v:lnum)
 
   " indent multiline strings
@@ -134,9 +155,34 @@ function! GetHaskellIndent()
     return 0
   endif
 
-  " comment indentation
+  "   { foo :: Int
-  if l:prevline =~ '^\s*--'
+  " >>,
-    return match(l:prevline, '\S')
+  "
+  "   |
+  "   ...
+  " >>,
+  if l:line =~ '^\s*,'
+    if s:isInBlock(s:getHLStack(line('.'), col('.')))
+      normal! 0
+      call search(',', 'cW')
+      let l:n = s:getNesting(s:getHLStack(line('.'), col('.')))
+      call search('[([{]', 'bW')
+      let l:cl = line('.')
+      let l:cc = col('.')
+
+      while l:n != s:getNesting(s:getHLStack(l:cl, l:cc)) || s:isSYN('haskellString', l:cl, l:cc) || s:isSYN('haskellChar', l:cl, l:cc)
+        call search('[([{]', 'bW')
+        let l:cl = line('.')
+        let l:cc = col('.')
+      endwhile
+
+      return l:cc - 1
+    else
+      let l:s = s:indentGuard(match(l:line, ','), l:prevline)
+      if l:s > -1
+        return l:s
+      end
+    endif
   endif
 
   " operator at end of previous line
@@ -166,11 +212,20 @@ function! GetHaskellIndent()
   " >>>>y = 2
   if l:prevline =~ '\C\<let\>\s\+.\+$'
     if l:line =~ '\C^\s*\<let\>'
-      return match(l:prevline, '\C\<let\>')
+      let l:s = match(l:prevline, '\C\<let\>')
+      if s:isSYN('haskellLet', v:lnum - 1, l:s + 1)
+        return l:s
+      endif
     elseif l:line =~ '\C^\s*\<in\>'
-      return match(l:prevline, '\C\<let\>') + g:haskell_indent_in
+      let l:s = match(l:prevline, '\C\<let\>')
+      if s:isSYN('haskellLet', v:lnum - 1, l:s + 1)
+        return l:s + g:haskell_indent_in
+      endif
     else
-      return match(l:prevline, '\C\<let\>') + g:haskell_indent_let
+      let l:s = match(l:prevline, '\C\<let\>')
+      if s:isSYN('haskellLet', v:lnum - 1, l:s + 1)
+        return l:s + g:haskell_indent_let
+      endif
     endif
   endif
 
@@ -190,35 +245,49 @@ function! GetHaskellIndent()
   " where
   " >>foo
   "
+  if l:prevline =~ '\C\<where\>\s*$'
+    return match(l:prevline, '\S') + get(g:, 'haskell_indent_after_bare_where', &shiftwidth)
+  endif
+
   " do
   " >>foo
   "
   " foo =
   " >>bar
-  if l:prevline =~ '\C\(\<where\>\|\<do\>\|=\)\s*$'
+  if l:prevline =~ '\C\(\<do\>\|=\)\s*$'
     return match(l:prevline, '\S') + &shiftwidth
   endif
 
+  " do foo
+  " >>>bar
+  if l:prevline =~ '\C\<do\>\s\+\S\+.*$'
+    let l:s = match(l:prevline, '\C\<do\>')
+    if s:isSYN('haskellKeyword', v:lnum - 1, l:s + 1)
+      return l:s + g:haskell_indent_do
+    endif
+  endif
+
+  " case foo of
+  " >>bar -> quux
+  if l:prevline =~ '\C\<case\>.\+\<of\>\s*$'
+    if get(g:,'haskell_indent_case_alternative', 0)
+      return match(l:prevline, '\S') + &shiftwidth
+    else
+      return match(l:prevline, '\C\<case\>') + g:haskell_indent_case
+    endif
+  endif
+
   "" where foo
   "" >>>>>>bar
   if l:prevline =~ '\C\<where\>\s\+\S\+.*$'
     if  l:line =~ '^\s*[=-]>\s' && l:prevline =~ ' :: '
       return match(l:prevline, ':: ')
     else
-      return match(l:prevline, '\C\<where\>') + g:haskell_indent_where
+      let l:s = match(l:prevline, '\C\<where\>')
+      if s:isSYN('haskellWhere', v:lnum - 1, l:s + 1)
+        return l:s + g:haskell_indent_where
       endif
     endif
-
-  " do foo
-  " >>>bar
-  if l:prevline =~ '\C\<do\>\s\+\S\+.*$'
-    return match(l:prevline, '\C\<do\>') + g:haskell_indent_do
-  endif
-
-  " case foo of
-  " >>bar -> quux
-  if l:prevline =~ '\C\<case\>.\+\<of\>\s*$'
-    return match(l:prevline, '\C\<case\>') + g:haskell_indent_case
   endif
 
   " newtype Foo = Foo
@@ -241,6 +310,14 @@ function! GetHaskellIndent()
     endif
   endif
 
+  " foo :: Int
+  "     -> Int
+  " >>>>-> Int
+  "
+  " foo :: Monad m
+  "     => Functor f
+  " >>>>=> Int
+  "
   " foo :: Int
   "     -> Int
   " foo x
@@ -249,9 +326,12 @@ function! GetHaskellIndent()
   "   :: Int
   "   -> Int
   " foo x
-  if l:prevline =~ '^\s*[-=]>' && l:line !~ '^\s*[-=]>'
+  if l:prevline =~ '^\s*[-=]>'
+    if l:line =~ '^\s*[-=]>'
+      return match(l:prevline, '[-=]')
+    else
       if s:isInBlock(l:hlstack)
-      return match(l:prevline, '[^\s-=>]')
+        return match(l:prevline, '[^-=]')
       else
         let l:m = matchstr(l:line, '^\s*\zs\<\S\+\>\ze')
         let l:l = l:prevline
@@ -259,8 +339,8 @@ function! GetHaskellIndent()
 
         while v:lnum != l:c
           " fun decl
+          if l:l =~ ('^\s*' . l:m . '\(\s*::\|\n\s\+::\)')
             let l:s = match(l:l, l:m)
-        if l:s >= 0
             if match(l:l, '\C^\s*\<default\>') > -1
               return l:s - 8
             else
@@ -277,6 +357,7 @@ function! GetHaskellIndent()
         return 0
       endif
     endif
+  endif
 
   "   | otherwise = ...
   " foo
@@ -316,7 +397,7 @@ function! GetHaskellIndent()
 
   " foo
   " >>{
-  if l:line =~ '^\s*{' && l:prevline !~ '^{'
+  if l:line =~ '^\s*{ '
     let l:s = match(l:prevline, '\S')
     if l:s >= 0
       return l:s + &shiftwidth
@@ -325,12 +406,17 @@ function! GetHaskellIndent()
 
   "  in foo
   " where bar
+  "
+  " or
+  "
+  " foo
+  " >>where
   if l:line =~ '\C^\s*\<where\>'
     if match(l:prevline, '\C^\s\+in\s\+') == 0
       return match(l:prevline, 'in') - g:haskell_indent_in
     endif
 
-    return match(l:prevline, '\S') + &shiftwidth
+    return match(l:prevline, '\S') + get(g:, 'haskell_indent_before_where', &shiftwidth)
   endif
 
   " let x = 1
@@ -362,32 +448,6 @@ function! GetHaskellIndent()
     endif
   endif
 
-  "   { foo :: Int
-  " >>,
-  "
-  "   |
-  "   ...
-  " >>,
-  if l:line =~ '^\s*,'
-    if s:isInBlock(l:hlstack)
-      normal! 0
-      call search(',', 'cW')
-      let l:n = s:getNesting(s:getHLStack())
-      call search('[(\[{]', 'bW')
-
-      while l:n != s:getNesting(s:getHLStack())
-        call search('[(\[{]', 'bW')
-      endwhile
-
-      return col('.') - 1
-    else
-      let l:s = s:indentGuard(match(l:line, ','), l:prevline)
-      if l:s > -1
-        return l:s
-      end
-    endif
-  endif
-
   "   |
   "   ...
   " >>|
@@ -423,22 +483,8 @@ function! GetHaskellIndent()
   if l:line =~ '^\s*]'
     return s:indentMatching(']')
   endif
-  "
-  " indent import
-  if l:line =~ '\C^\s*import'
-    return 0
-  endif
 
-  " do not reindent indented lines
-  if match(l:prevline, '\S') < match(l:line, '\S')
   return -1
-  endif
-
-  if l:line !~ '^\s*[=-]>\s' && l:line =~ '^\s*[!#$%&*+./<>?@\\^|~-]\+'
-    return -1
-  endif
-
-  return match(l:prevline, '\S')
 endfunction
 
 endif

indent/html.vim

@@ -42,6 +42,7 @@ setlocal indentkeys=o,O,*<Return>,<>>,{,},!^F
 
 
 let s:tags = []
+let s:no_tags = []
 
 " [-- <ELEMENT ? - - ...> --]
 call add(s:tags, 'a')
@@ -165,6 +166,44 @@ call add(s:tags, 'text')
 call add(s:tags, 'textPath')
 call add(s:tags, 'tref')
 call add(s:tags, 'tspan')
+" Common self closing SVG elements
+call add(s:no_tags, 'animate')
+call add(s:no_tags, 'animateTransform')
+call add(s:no_tags, 'circle')
+call add(s:no_tags, 'ellipse')
+call add(s:no_tags, 'feBlend')
+call add(s:no_tags, 'feColorMatrix')
+call add(s:no_tags, 'feComposite')
+call add(s:no_tags, 'feConvolveMatrix')
+call add(s:no_tags, 'feDisplacementMap')
+call add(s:no_tags, 'feFlood')
+call add(s:no_tags, 'feFuncR')
+call add(s:no_tags, 'feFuncG')
+call add(s:no_tags, 'feFuncB')
+call add(s:no_tags, 'feFuncA')
+call add(s:no_tags, 'feGaussianBlur')
+call add(s:no_tags, 'feImage')
+call add(s:no_tags, 'feMergeNode')
+call add(s:no_tags, 'feMorphology')
+call add(s:no_tags, 'feOffset')
+call add(s:no_tags, 'fePointLight')
+call add(s:no_tags, 'feSpotLight')
+call add(s:no_tags, 'feTile')
+call add(s:no_tags, 'feTurbulence')
+call add(s:no_tags, 'hatchpath')
+call add(s:no_tags, 'hkern')
+call add(s:no_tags, 'image')
+call add(s:no_tags, 'line')
+call add(s:no_tags, 'mpath')
+call add(s:no_tags, 'polygon')
+call add(s:no_tags, 'polyline')
+call add(s:no_tags, 'path')
+call add(s:no_tags, 'rect')
+call add(s:no_tags, 'solidColor')
+call add(s:no_tags, 'stop')
+call add(s:no_tags, 'use')
+call add(s:no_tags, 'view')
+call add(s:no_tags, 'vkern')
 
 call add(s:tags, 'html')
 call add(s:tags, 'head')
@@ -177,8 +216,6 @@ call add(s:tags, 'tr')
 call add(s:tags, 'th')
 call add(s:tags, 'td')
 
-let s:no_tags = []
-
 call add(s:no_tags, 'base')
 call add(s:no_tags, 'link')
 call add(s:no_tags, 'meta')

indent/javascript.vim

@@ -2,27 +2,40 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'javascript') ==
   
 " Vim indent file
 " Language: Javascript
-" Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
+" Maintainer: Chris Paul ( https://github.com/bounceme )
-
+" URL: https://github.com/pangloss/vim-javascript
-" 0. Initialization {{{1
+" Last Change: May 16, 2017
-" =================
 
 " Only load this indent file when no other was loaded.
-if exists("b:did_indent")
+if exists('b:did_indent')
   finish
 endif
 let b:did_indent = 1
 
-setlocal nosmartindent
+" indent correctly if inside <script>
+" vim/vim@690afe1 for the switch from cindent
+let b:html_indent_script1 = 'inc'
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal formatexpr=Fixedgq(v:lnum,v:count)
+setlocal autoindent nolisp nosmartindent
-setlocal indentkeys=0{,0},0),0],0\,*<Return>,:,!^F,o,O,e
+setlocal indentkeys+=0],0)
-setlocal cinoptions+=j1,J1,c1
+" Testable with something like:
+" vim  -eNs "+filetype plugin indent on" "+syntax on" "+set ft=javascript" \
+"       "+norm! gg=G" '+%print' '+:q!' testfile.js \
+"       | diff -uBZ testfile.js -
+
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
+
+" Regex of syntax group names that are or delimit string or are comments.
+let b:syng_strcom = get(b:,'syng_strcom','string\|comment\|regex\|special\|doc\|template\%(braces\)\@!')
+let b:syng_str = get(b:,'syng_str','string\|template\|special')
+" template strings may want to be excluded when editing graphql:
+" au! Filetype javascript let b:syng_str = '^\%(.*template\)\@!.*string\|special'
+" au! Filetype javascript let b:syng_strcom = '^\%(.*template\)\@!.*string\|comment\|regex\|special\|doc'
 
 " Only define the function once.
-if exists("*GetJavascriptIndent")
+if exists('*GetJavascriptIndent')
   finish
 endif
 
@@ -31,536 +44,418 @@ set cpo&vim
 
 " Get shiftwidth value
 if exists('*shiftwidth')
-  func s:sw()
+  function s:sw()
     return shiftwidth()
-  endfunc
+  endfunction
 else
-  func s:sw()
+  function s:sw()
-    return &sw
+    return &l:shiftwidth ? &l:shiftwidth : &l:tabstop
-  endfunc
+  endfunction
 endif
 
-" 1. Variables {{{1
+" Performance for forwards search(): start search at pos rather than masking
-" ============
+" matches before pos.
-
+let s:z = has('patch-7.4.984') ? 'z' : ''
-let s:line_pre = '^\s*\%(\/\*.*\*\/\s*\)*'
-let s:js_keywords = s:line_pre . '\%(break\|import\|export\|catch\|const\|continue\|debugger\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|let\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)\>\C'
-let s:expr_case = s:line_pre . '\%(\%(case\>.*\)\|default\)\s*:\C'
-" Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(string\|regex\|special\|doc\|comment\|template\)\c'
-
-" Regex of syntax group names that are strings.
-let s:syng_string = 'regex\c'
-
-" Regex of syntax group names that are strings or documentation.
-let s:syng_comment = '\%(comment\|doc\)\c'
 
+let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
+let s:skip_expr = "s:syn_at(line('.'),col('.')) =~? b:syng_strcom"
 
-func s:lookForParens(start,end,flags,stop)
+" searchpair() wrapper
+if has('reltime')
+  function s:GetPair(start,end,flags,skip,time,...)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
+  endfunction
+else
+  function s:GetPair(start,end,flags,skip,...)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
+  endfunction
+endif
+
+function s:syn_at(l,c)
+  let pos = join([a:l,a:c],',')
+  if has_key(s:synId_cache,pos)
+    return s:synId_cache[pos]
+  endif
+  let s:synId_cache[pos] = synIDattr(synID(a:l,a:c,0),'name')
+  return s:synId_cache[pos]
+endfunction
+
+function s:parse_cino(f)
+  let [cin, divider, n] = [strridx(&cino,a:f), 0, '']
+  if cin == -1
+    return
+  endif
+  let [sign, cstr] = &cino[cin+1] ==# '-' ? [-1, &cino[cin+2:]] : [1, &cino[cin+1:]]
+  for c in split(cstr,'\zs')
+    if c ==# '.' && !divider
+      let divider = 1
+    elseif c ==# 's'
+      if n is ''
+        let n = s:W
+      else
+        let n = str2nr(n) * s:W
+      endif
+      break
+    elseif c =~ '\d'
+      let [n, divider] .= [c, 0]
+    else
+      break
+    endif
+  endfor
+  return sign * str2nr(n) / max([str2nr(divider),1])
+endfunction
+
+" Optimized {skip} expr, used only once per GetJavascriptIndent() call
+function s:skip_func()
+  if s:topCol == 1 || line('.') < s:scriptTag
+    return {} " E728, used as limit condition for loops and searchpair()
+  endif
+  let s:topCol = col('.')
+  if getline('.') =~ '\%<'.s:topCol.'c\/.\{-}\/\|\%>'.s:topCol.'c[''"]\|\\$'
+    if eval(s:skip_expr)
+      let s:topCol = 0
+    endif
+    return !s:topCol
+  elseif s:checkIn || search('\m`\|\${\|\*\/','nW'.s:z,s:looksyn)
+    let s:checkIn = eval(s:skip_expr)
+    if s:checkIn
+      let s:topCol = 0
+    endif
+  endif
+  let s:looksyn = line('.')
+  return s:checkIn
+endfunction
+
+function s:alternatePair()
+  let [l:pos, pat, l:for] = [getpos('.'), '[][(){};]', 3]
+  while search('\m'.pat,'bW')
+    if s:skip_func() | continue | endif
+    let idx = stridx('])};',s:looking_at())
+    if idx is 3
+      if l:for is 1
+        return s:GetPair('{','}','bW','s:skip_func()',2000) > 0 || setpos('.',l:pos)
+      endif
+      let [pat, l:for] = ['[{}();]', l:for - 1]
+    elseif idx + 1
+      if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000) < 1
+        break
+      endif
+    else
+      return
+    endif
+  endwhile
+  call setpos('.',l:pos)
+endfunction
+
+function s:looking_at()
+  return getline('.')[col('.')-1]
+endfunction
+
+function s:token()
+  return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
+endfunction
+
+function s:previous_token()
+  let l:pos = getpos('.')
+  if search('\m\k\{1,}\|\S','ebW')
+    if (strpart(getline('.'),col('.')-2,2) == '*/' || line('.') != l:pos[1] &&
+          \ getline('.')[:col('.')-1] =~ '\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
+      while search('\m\S\ze\_s*\/[/*]','bW')
+        if s:syn_at(line('.'),col('.')) !~? s:syng_com
+          return s:token()
+        endif
+      endwhile
+    else
+      return s:token()
+    endif
+    call setpos('.',l:pos)
+  endif
+  return ''
+endfunction
+
+for s:__ in ['__previous_token','__IsBlock']
+  function s:{s:__}(...)
+    let l:pos = getpos('.')
     try
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,a:stop,300)
+      return call('s:'.matchstr(expand('<sfile>'),'.*__\zs\w\+'),a:000)
-  catch /E118/
+    catch
-    return searchpair(a:start,'',a:end,a:flags,0,a:stop)
+    finally
+      call setpos('.',l:pos)
     endtry
-endfunc
+  endfunction
+endfor
 
-let s:line_term = '\s*\%(\%(\/\/.*\)\=\|\%(\/\*.*\*\/\s*\)*\)$'
+function s:expr_col()
-
+  if getline('.')[col('.')-2] == ':'
-" Regex that defines continuation lines, not including (, {, or [.
-let s:continuation_regex = '\%([*.?:]\|+\@<!+\|-\@<!-\|\*\@<!\/\|=\|||\|&&\)' . s:line_term
-
-let s:one_line_scope_regex = '\%(\<else\>\|=>\)\C' . s:line_term
-
-function s:Onescope(lnum)
-  if getline(a:lnum) =~ s:one_line_scope_regex
     return 1
-  end
-  let mypos = col('.')
-  call cursor(a:lnum, 1)
-  if search('.*\zs\<\%(while\|for\|if\)\>\s*(\C', 'ce', a:lnum) > 0 &&
-        \ s:lookForParens('(', ')', 'W', a:lnum) > 0 &&
-        \ col('.') == strlen(s:RemoveTrailingComments(getline(a:lnum)))
-    call cursor(a:lnum, mypos)
-    return 1
-  else
-    call cursor(a:lnum, mypos)
-    return 0
-  end
-endfunction
-
-" Regex that defines blocks.
-let s:block_regex = '[{([]' . s:line_term
-
-let s:operator_first = s:line_pre . '\%([,:?]\|\([-/.+*]\)\%(\1\|\*\|\/\)\@!\|||\|&&\)'
-
-let s:var_stmt = s:line_pre . '\%(const\|let\|var\)\s\+\C'
-
-let s:comma_last = ',' . s:line_term
-
-" 2. Auxiliary Functions {{{1
-" ======================
-
-" Check if the character at lnum:col is inside a string, comment, or is ascii.
-function s:IsInStringOrComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_strcom
-endfunction
-
-" Check if the character at lnum:col is inside a string.
-function s:IsInString(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
-endfunction
-
-" Check if the character at lnum:col is inside a multi-line comment.
-function s:IsInComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_comment
-endfunction
-
-" Find line above 'lnum' that isn't empty, in a comment, or in a string.
-function s:PrevNonBlankNonString(lnum)
-  let lnum = prevnonblank(a:lnum)
-  while lnum > 0
-    let line = getline(lnum)
-    let com = match(line, '\%(\/\*.*\)\@<!\*\/') + 1
-    if s:IsInComment(lnum, com)
-      call cursor(lnum, com)
-      let parlnum = search('\%(\/\/.*\)\@<!\/\*', 'nbW')
-      if parlnum > 0
-        let lnum = parlnum
-      end
-    elseif line !~ '^' . s:line_term && !s:IsInStringOrComment(lnum,1)
-      break
   endif
-    let lnum = prevnonblank(lnum - 1)
+  let [bal, l:pos] = [0, getpos('.')]
-  endwhile
+  while bal < 1 && search('\m[{}?:;]','bW',s:scriptTag)
-  return lnum
+    if eval(s:skip_expr)
-endfunction
-
-" Find line above 'lnum' that started the continuation 'lnum' may be part of.
-function s:GetMSL(lnum, in_one_line_scope)
-  " Start on the line we're at and use its indent.
-  let msl = a:lnum
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-  while lnum > 0 && !s:Match(msl,s:line_pre . '[])}]')
-    " If we have a continuation line, or we're in a string, use line as MSL.
-    " Otherwise, terminate search as we have found our MSL already.
-    let line = getline(lnum)
-    let line2 = getline(msl)
-    if ((s:Match(lnum,s:continuation_regex) || s:Match(lnum, s:comma_last)) &&
-          \ !s:Match(lnum, s:expr_case)) || s:IsInString(lnum, strlen(line))
-      let msl = lnum
-      if s:Match(lnum, s:line_pre . '[]})]') && !a:in_one_line_scope
-        call cursor(lnum,1)
-        let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-        if parlnum > 0
-          let lnum = parlnum
       continue
-        end
+    elseif s:looking_at() == ':'
-      end
+      let bal -= strpart(getline('.'),col('.')-2,3) !~ '::'
+    elseif s:looking_at() == '?'
+      let bal += 1
+    elseif s:looking_at() == '{' && getpos('.')[1:2] != b:js_cache[1:] && !s:IsBlock()
+      let bal = 1
+    elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+      break
+    endif
+  endwhile
+  call setpos('.',l:pos)
+  return max([bal,0])
+endfunction
 
+" configurable regexes that define continuation lines, not including (, {, or [.
+let s:opfirst = '^' . get(g:,'javascript_opfirst',
+      \ '\C\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
+let s:continuation = get(g:,'javascript_continuation',
+      \ '\C\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|new\|delete\|void\|in\|instanceof\|await\)\)') . '$'
+
+function s:continues(ln,con)
+  let token = matchstr(a:con[-15:],s:continuation)
+  if strlen(token)
+    call cursor(a:ln,strlen(a:con))
+    if token =~ '[/>]'
+      return s:syn_at(a:ln,col('.')) !~? (token == '>' ? 'jsflow\|^html' : 'regex')
+    elseif token =~ '\l'
+      return s:previous_token() != '.'
+    elseif token == ':'
+      return s:expr_col()
+    endif
+    return 1
+  endif
+endfunction
+
+function s:Trim(ln)
+  let pline = substitute(getline(a:ln),'\s*$','','')
+  let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
+  while l:max != -1 && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
+    let pline = pline[: l:max]
+    let l:max = max([strridx(pline,'//'), strridx(pline,'/*')])
+    let pline = substitute(pline[:-2],'\s*$','','')
+  endwhile
+  return pline
+endfunction
+
+" Find line above 'lnum' that isn't empty or in a comment
+function s:PrevCodeLine(lnum)
+  let l:n = prevnonblank(a:lnum)
+  while l:n
+    if getline(l:n) =~ '^\s*\/[/*]'
+      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+            \ s:syn_at(l:n,1) =~? b:syng_str
+        break
+      endif
+      let l:n = prevnonblank(l:n-1)
+    elseif stridx(getline(l:n), '*/') + 1 && s:syn_at(l:n,1) =~? s:syng_com
+      let l:pos = getpos('.')
+      call cursor(l:n,1)
+      let l:n = search('\m\S\_s*\/\*','nbW')
+      call setpos('.',l:pos)
     else
-
-      " Don't use lines that are part of a one line scope as msl unless the
-      " flag in_one_line_scope is set to 1
-      "
-      if a:in_one_line_scope
-        break
-      end
-      let msl_one_line = s:Onescope(lnum)
-      if msl_one_line == 0
       break
     endif
-    end
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
   endwhile
-  return msl
+  return l:n
 endfunction
 
-function s:RemoveTrailingComments(content)
+" Check if line 'lnum' has a balanced amount of parentheses.
-  let single = '\/\/\%(.*\)\s*$'
+function s:Balanced(lnum)
-  let multi = '\/\*\%(.*\)\*\/\s*$'
+  let l:open = 0
-  return substitute(substitute(substitute(a:content, single, '', ''), multi, '', ''), '\s\+$', '', '')
+  let l:line = getline(a:lnum)
-endfunction
+  let pos = match(l:line, '[][(){}]', 0)
-
-" Find if the string is inside var statement (but not the first string)
-function s:InMultiVarStatement(lnum, cont, prev)
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-  let cont = a:cont
-  let prev = a:prev
-
-  "  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
-
-  " loop through previous expressions to find a var statement
-  while lnum > 0 && (s:Match(lnum, s:comma_last) ||(cont && getline(lnum) =~ s:line_pre . '[]})]') ||
-        \ s:Match(lnum,s:continuation_regex)) || (prev && (s:Match(prev, s:comma_last) ||
-        \ s:Match(prev,s:continuation_regex)))
-    " if the line is a js keyword
-    if cont
-      let cont = 0
-      call cursor(lnum,1)
-      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if parlnum > 0
-        let lnum = parlnum
-      end
-    end
-    if s:Match(lnum, s:js_keywords)
-      " check if the line is a var stmt
-      " if the line has a comma first or comma last then we can assume that we
-      " are in a multiple var statement
-      if s:Match(lnum, s:var_stmt) && (s:Match(lnum, s:comma_last)||s:Match(lnum,s:continuation_regex))
-        return lnum
-      endif
-
-      " other js keywords, not a var
-      if !s:Match(lnum, s:comma_last)||!s:Match(lnum,s:continuation_regex)
-        return 0
-      end
-    endif
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
-    let prev = prev && lnum > 0 ? prev : 0
-  endwhile
-
-  " beginning of program, not a var
-  return 0
-endfunction
-
-" Check if line 'lnum' has more opening brackets than closing ones.
-function s:LineHasOpeningBrackets(lnum)
-  let open_0 = 0
-  let open_2 = 0
-  let open_4 = 0
-  let line = getline(a:lnum)
-  let pos = match(line, '[][(){}]', 0)
   while pos != -1
-    if !s:IsInStringOrComment(a:lnum, pos + 1)
+    if s:syn_at(a:lnum,pos + 1) !~? b:syng_strcom
-      let idx = stridx('(){}[]', line[pos])
+      let l:open += match(' ' . l:line[pos],'[[({]')
-      if idx % 2 == 0
+      if l:open < 0
-        let open_{idx} = open_{idx} + 1
+        return
-      else
-        let open_{idx - 1} = open_{idx - 1} - 1
       endif
     endif
-    let pos = match(line, '[][(){}]', pos + 1)
+    let pos = match(l:line, (l:open ?
+          \ '['.matchstr(['][','()','{}'],l:line[pos]).']' :
+          \ '[][(){}]'), pos + 1)
   endwhile
-  return (open_0 > 0 ? 1 : (open_0 == 0 ? 0 : 2)) . (open_2 > 0 ? 1 : (open_2 == 0 ? 0 : 2)) . (open_4 > 0 ? 1 : (open_4 == 0 ? 0 : 2))
+  return !l:open
 endfunction
 
-function s:Match(lnum, regex)
+function s:OneScope(lnum)
-  let col = match(getline(a:lnum), a:regex) + 1
+  let pline = s:Trim(a:lnum)
-  return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
+  call cursor(a:lnum,strlen(pline))
-endfunction
+  let kw = 'else do'
-
+  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
-function s:IndentWithContinuation(lnum, ind, width)
+    if s:previous_token() =~# '^\%(await\|each\)$'
-  " Set up variables to use and search for MSL to the previous line.
+      call s:previous_token()
-  let p_lnum = a:lnum
+      let kw = 'for'
-  let lnum = s:GetMSL(a:lnum, 1)
-  let line = getline(lnum)
-
-  " If the previous line wasn't a MSL and is continuation return its indent.
-  " TODO: the || s:IsInString() thing worries me a bit.
-  if p_lnum != lnum
-    if s:Match(p_lnum,s:continuation_regex)||s:IsInString(p_lnum,strlen(line))
-      return a:ind
-    endif
-  endif
-
-  " Set up more variables now that we know we aren't continuation bound.
-  let msl_ind = indent(lnum)
-
-  " If the previous line ended with [*+/.-=], start a continuation that
-  " indents an extra level.
-  if s:Match(lnum, s:continuation_regex)
-    if lnum == p_lnum
-      return msl_ind + a:width
     else
-      return msl_ind
+      let kw = 'for if let while with'
-    end
-  elseif s:InMultiVarStatement(p_lnum, 0, s:PrevNonBlankNonString(p_lnum - 1))
-    return indent(p_lnum) - s:sw()
     endif
-
+  endif
-  return a:ind
+  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
+        \ s:__previous_token() != '.' && !s:doWhile()
 endfunction
 
-function s:InOneLineScope(lnum)
+function s:doWhile()
-  let msl = s:GetMSL(a:lnum, 1)
+  if expand('<cword>') ==# 'while'
-  if msl > 0 && s:Onescope(msl)
+    let [bal, l:pos] = [0, getpos('.')]
-    return msl
+    call search('\m\<','cbW')
+    while bal < 1 && search('\m\C[{}]\|\<\%(do\|while\)\>','bW')
+      if eval(s:skip_expr)
+        continue
+      elseif s:looking_at() ==# 'd'
+        let bal += s:__IsBlock(1)
+      elseif s:looking_at() ==# 'w'
+        let bal -= s:__previous_token() != '.'
+      elseif s:looking_at() != '}' || s:GetPair('{','}','bW',s:skip_expr,200) < 1
+        break
+      endif
+    endwhile
+    call setpos('.',l:pos)
+    return max([bal,0])
   endif
-  return 0
 endfunction
 
-function s:ExitingOneLineScope(lnum)
+" returns braceless levels started by 'i' and above lines * &sw. 'num' is the
-  let msl = s:GetMSL(a:lnum, 1)
+" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
-  if msl > 0
+" a continued expression, which could have started in a braceless context
-    " if the current line is in a one line scope ..
+function s:iscontOne(i,num,cont)
-    if s:Onescope(msl)
+  let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
-      return 0
+  let pind = a:num ? indent(l:num) + s:W : 0
-    else
+  let ind = indent(l:i) + (a:cont ? 0 : s:W)
-      let prev_msl = s:GetMSL(msl - 1, 1)
+  while l:i >= l:num && (ind > pind || l:i == l:num)
-      if s:Onescope(prev_msl)
+    if indent(l:i) < ind && s:OneScope(l:i)
-        return prev_msl
+      let bL += s:W
+      let l:i = line('.')
+    elseif !a:cont || bL || ind < indent(a:i)
+      break
+    endif
+    let ind = min([ind, indent(l:i)])
+    let l:i = s:PrevCodeLine(l:i - 1)
+  endwhile
+  return bL
+endfunction
+
+" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
+function s:IsBlock(...)
+  if a:0 || s:looking_at() == '{'
+    let l:n = line('.')
+    let char = s:previous_token()
+    if match(s:stack,'\cxml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
+      return char != '{'
+    elseif char =~ '\k'
+      if char ==# 'type'
+        return s:__previous_token() !~# '^\%(im\|ex\)port$'
+      endif
+      return index(split('return const let import export extends yield default delete var await void typeof throw case new of in instanceof')
+            \ ,char) < (line('.') != l:n) || s:__previous_token() == '.'
+    elseif char == '>'
+      return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? 'jsflow\|^html'
+    elseif char == '*'
+      return s:__previous_token() == ':'
+    elseif char == ':'
+      return !s:expr_col()
+    elseif char == '/'
+      return s:syn_at(line('.'),col('.')) =~? 'regex'
+    endif
+    return char !~ '[=~!<,.?^%|&([]' &&
+          \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
-    endif
-  endif
-  return 0
 endfunction
 
-" 3. GetJavascriptIndent Function {{{1
-" =========================
 
 function GetJavascriptIndent()
-  " 3.1. Setup {{{1
+  let b:js_cache = get(b:,'js_cache',[0,0,0])
-  " ----------
+  let s:synId_cache = {}
-  " Set up variables for restoring position in file.  Could use v:lnum here.
-  " Avoid use of line('.')/col('.') type functions as the curpos can change
-  let vcol = col('.')
-
-  " 3.2. Work on the current line {{{1
-  " -----------------------------
-
-  let ind = -1
   " Get the current line.
-  let line = getline(v:lnum)
+  call cursor(v:lnum,1)
-  " previous nonblank line number
+  let l:line = getline('.')
-  let prevline = prevnonblank(v:lnum - 1)
+  " use synstack as it validates syn state and works in an empty line
-  " previous line of code
+  let s:stack = map(synstack(v:lnum,1),"synIDattr(v:val,'name')")
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
+  let syns = get(s:stack,-1,'')
 
-  " to not change multiline string values 
+  " start with strings,comments,etc.
-  if line !~ '^[''"`]' && synIDattr(synID(v:lnum, 1, 1), 'name') =~? 'string\|template'
+  if syns =~? s:syng_com
+    if l:line =~ '^\s*\*'
+      return cindent(v:lnum)
+    elseif l:line !~ '^\s*\/[/*]'
       return -1
     endif
-
+  elseif syns =~? b:syng_str
-  " If we are in a multi-line comment, cindent does the right thing.
+    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
-  if line !~ '^\%(\/\*\|\s*\/\/\)' && s:IsInComment(v:lnum, 1)
+      let b:js_cache[0] = v:lnum
-    return cindent(v:lnum)
+    endif
+    return -1
+  endif
+  let l:lnum = s:PrevCodeLine(v:lnum - 1)
+  if !l:lnum
+    return
   endif
 
-  " single opening bracket will assume you want a c style of indenting
+  let l:line = substitute(l:line,'^\s*','','')
-  if line =~ s:line_pre . '{' && !s:Match(lnum,s:block_regex) &&
+  if l:line[:1] == '/*'
-        \ !s:Match(lnum,s:comma_last)
+    let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
-    return cindent(v:lnum)
+  endif
+  if l:line =~ '^\/[/*]'
+    let l:line = ''
   endif
 
-  " cindent each line which has a switch label
+  " the containing paren, bracket, or curly. Many hacks for performance
-  if (line =~ s:expr_case)
+  let [ s:scriptTag, idx ] = [ get(get(b:,'hi_indent',{}),'blocklnr'),
-    let s:cpo_switch = &cpo
+        \ index([']',')','}'],l:line[0]) ]
-    set cpo+=%
+  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
-    let ind = cindent(v:lnum)
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
-    let &cpo = s:cpo_switch
+    call call('cursor',b:js_cache[2] ? b:js_cache[1:] : [0,0])
-    return ind
-  endif
-
-  " If we got a closing bracket on an empty line, find its match and indent
-  " according to it.
-  let col = line =~ s:line_pre . '[]})]'
-  if col > 0
-    let parlnum = v:lnum
-    while col
-      call cursor(parlnum, 1)
-      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      let col = s:Match(parlnum,  s:line_pre . '[]})]')
-      if col
-        continue
-      end
-      if parlnum > 0
-        let ind = s:InMultiVarStatement(parlnum, 0, 0)|| s:LineHasOpeningBrackets(parlnum) !~ '2' ?
-              \ indent(parlnum) : indent(s:GetMSL(parlnum, 0))
-      endif
-    endwhile
-    return ind
-  endif
-
-
-  " If line starts with an operator...
-  if (line =~ s:operator_first)
-    if (s:Match(lnum, s:operator_first) || (s:Match(lnum, s:line_pre . '[])}]') &&
-          \ !(s:Match(v:lnum,s:line_pre . '\.') && s:Match(lnum, ')' . s:line_term))))
-      " and so does previous line, don't indent
-      return indent(lnum)
-    end
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts =~ '2'
-      call cursor(lnum, 1)
-      " Search for the opening tag
-      let parlnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if parlnum > 0
-        return !s:Match(parlnum, s:operator_first) &&
-              \ synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsbracket\|jsparen\|jsobject' ?
-              \ indent(lnum) + s:sw() : indent(parlnum)
-      end
-    elseif synIDattr(synID(v:lnum, 1, 1), 'name') !~? 'jsbracket\|jsparen\|jsobject'
-      " otherwise, if not in an key/val;array item;param, indent 1 level
-      return indent(lnum) + s:sw()
-    end
-
-    " If previous line starts with an operator...
-  elseif (s:Match(lnum, s:operator_first) && !s:Match(lnum,s:continuation_regex)) ||
-        \ getline(lnum) =~ '[]})];\=' . s:line_term
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts =~ '2' && !s:Match(lnum, s:operator_first)
-      call cursor(lnum, 1)
-      " Search for the opening tag
-      let mnum = s:lookForParens('(\|{\|\[', ')\|}\|\]', 'nbW', 0)
-      if mnum > 0 && (s:Match(mnum, s:operator_first) ||
-            \ (s:Onescope(s:PrevNonBlankNonString(mnum - 1))) && !s:Match(mnum, s:line_pre . '{'))
-        return indent(mnum) - s:sw()
-      end
-    elseif s:Match(lnum, s:operator_first)
-      if counts !~ '1'
-        return indent(lnum) - s:sw()
-      end
-    end
-  end
-
-  " 3.3. Work on the previous line. {{{1
-  " -------------------------------
-
-  " If the line is empty and the previous nonblank line was a multi-line
-  " comment, use that comment's indent. Deduct one char to account for the
-  " space in ' */'.
-  if line =~ '^\s*$' && getline(prevline) =~ '\%(\%(^\s*\/\/\|\/\*\).*\)\@<!\*\/' &&
-        \ s:IsInComment(prevline, 1)
-    return indent(prevline) - 1
-  endif
-
-  " Find a non-blank, non-multi-line string line above the current line.
-
-  " If the line is empty and inside a string, use the previous line.
-  if line =~ '^\s*$' && lnum != prevline
-    return indent(prevnonblank(v:lnum))
-  endif
-
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-  " If the previous line ended with a block opening, add a level of indent.
-  if s:Match(lnum, s:block_regex)
-    return s:InMultiVarStatement(lnum, 0, 0) || s:LineHasOpeningBrackets(lnum) !~ '2' ?
-          \ indent(lnum) + s:sw() : indent(s:GetMSL(lnum, 0)) + s:sw()
-  endif
-
-  " Set up variables for current line.
-  let line = getline(lnum)
-  let ind = indent(lnum)
-  " If the previous line contained an opening bracket, and we are still in it,
-  " add indent depending on the bracket type.
-  if s:Match(lnum, '[[({})\]]')
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts =~ '2'
-      call cursor(lnum,matchend(s:RemoveTrailingComments(line), '.*\zs[])}]'))
-      while s:lookForParens('(\|{\|\[', ')\|}\|\]', 'bW', 0) == lnum
-        call cursor(lnum, matchend(s:RemoveTrailingComments(strpart(line,0,col('.'))), '.*\zs[])}]'))
-      endwhile
-      let cur = line('.')
-      if cur < lnum && !s:InMultiVarStatement(cur,0,0)
-        return indent(s:GetMSL(cur, 0))
-      end
-    elseif counts =~ '1' || s:Onescope(lnum)
-      return ind + s:sw()
-    end
-  end
-
-  " 3.4. Work on the MSL line. {{{1
-  " --------------------------
-  if s:Match(lnum, s:comma_last) && !s:Match(lnum,  s:continuation_regex)
-    return s:Match(lnum, s:var_stmt) ? indent(lnum) + s:sw() : indent(lnum)
-
-  elseif s:Match(s:PrevNonBlankNonString(lnum - 1), s:comma_last)
-    if !s:Match(lnum, s:comma_last) && s:InMultiVarStatement(lnum,1,0)
-      return indent(lnum) - s:sw()
-    end
-  end
-  let ind_con = ind
-  let ind = s:IndentWithContinuation(lnum, ind_con, s:sw())
-
-  " }}}2
-  "
-  "
-  let ols = s:InOneLineScope(lnum)
-  if ols > 0
-    let ind = ind + s:sw()
   else
-    let ols = s:ExitingOneLineScope(lnum)
+    let [s:looksyn, s:checkIn, s:topCol] = [v:lnum - 1, 0, 0]
-    while ols > 0 && ind > 0
+    if idx + 1
-      let ind = ind - s:sw()
+      call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000)
-      let ols = s:InOneLineScope(ols - 1)
+    elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
-    endwhile
+      call s:GetPair('{','}','bW','s:skip_func()',2000)
+    else
+      call s:alternatePair()
+    endif
   endif
 
-  return ind
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [s:scriptTag,0] : getpos('.')[1:2])
-endfunction
+  let num = b:js_cache[1]
 
-" }}}1
+  let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
+  if !b:js_cache[2] || s:IsBlock()
+    let ilnum = line('.')
+    let pline = s:Trim(l:lnum)
+    if b:js_cache[2] && s:looking_at() == ')' && s:GetPair('(',')','bW',s:skip_expr,100) > 0
+      let num = ilnum == num ? line('.') : num
+      if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
+        let switch_offset = &cino !~ ':' ? s:W : max([-indent(num),s:parse_cino(':')])
+        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
+          return indent(num) + switch_offset
+        endif
+      endif
+    endif
+    if idx < 0 && pline[-1:] !~ '[{;]'
+      let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
+      let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
+      let bL -= (bL && l:line[0] == '{') * s:W
+    endif
+  elseif idx < 0 && getline(b:js_cache[1])[b:js_cache[2]-1] == '(' && &cino =~ '('
+    let pval = s:parse_cino('(')
+    return !pval || !search('\m\S','nbW',num) && !s:parse_cino('U') ?
+          \ (s:parse_cino('w') ? 0 : -!!search('\m\S','W'.s:z,num)) + virtcol('.') :
+          \ max([indent('.') + pval + s:GetPair('(',')','nbrmW',s:skip_expr,100,num) * s:W,0])
+  endif
+
+  " main return
+  if l:line =~ '^[])}]\|^|}'
+    return max([indent(num),0])
+  elseif num
+    return indent(num) + s:W + switch_offset + bL + isOp
+  endif
+  return bL + isOp
+endfunction
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
-" gq{{{2
-function! Fixedgq(lnum, count)
-  let l:tw = &tw ? &tw : 80;
-
-  let l:count = a:count
-  let l:first_char = indent(a:lnum) + 1
-
-  if mode() == 'i' " gq was not pressed, but tw was set
-    return 1
-  endif
-
-  " This gq is only meant to do code with strings, not comments
-  if s:IsInComment(a:lnum, l:first_char)
-    return 1
-  endif
-
-  if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
-    return 1
-  endif
-
-  " Put all the lines on one line and do normal spliting after that
-  if l:count > 1
-    while l:count > 1
-      let l:count -= 1
-      normal J
-    endwhile
-  endif
-
-  let l:winview = winsaveview()
-
-  call cursor(a:lnum, l:tw + 1)
-  let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
-  call cursor(a:lnum, l:tw + 1)
-  let breakpoint = searchpairpos(' ', '', '\.', 'bcW', s:skip_expr, a:lnum)
-
-  " No need for special treatment, normal gq handles edgecases better
-  if breakpoint[1] == orig_breakpoint[1]
-    call winrestview(l:winview)
-    return 1
-  endif
-
-  " Try breaking after string
-  if breakpoint[1] <= indent(a:lnum)
-    call cursor(a:lnum, l:tw + 1)
-    let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
-  endif
-
-
-  if breakpoint[1] != 0
-    call feedkeys("r\<CR>")
-  else
-    let l:count = l:count - 1
-  endif
-
-  " run gq on new lines
-  if l:count == 1
-    call feedkeys("gqq")
-  endif
-
-  return 0
-endfunction
-"}}}
-" vim: foldmethod=marker:foldlevel=1
 
 endif

indent/litcoffee.vim

@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'coffee-script') == -1
+  
+if exists('b:did_indent')
+  finish
+endif
+
+runtime! indent/coffee.vim
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetLitCoffeeIndent()
+
+if exists('*GetLitCoffeeIndent')
+  finish
+endif
+
+function GetLitCoffeeIndent()
+  if searchpair('^    \|\t', '', '$', 'bWnm') > 0
+    return GetCoffeeIndent(v:lnum)
+  else
+    return -1
+  endif
+endfunc
+
+
+endif

indent/perl6.vim

@@ -1,131 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'perl') == -1
-  
-" Vim indent file
-" Language:      Perl 6
-" Maintainer:    vim-perl <vim-perl@googlegroups.com>
-" Homepage:      http://github.com/vim-perl/vim-perl
-" Bugs/requests: http://github.com/vim-perl/vim-perl/issues
-" Last Change:   {{LAST_CHANGE}}
-" Contributors:  Andy Lester <andy@petdance.com>
-"                Hinrik Örn Sigurðsson <hinrik.sig@gmail.com>
-"
-" Adapted from indent/perl.vim by Rafael Garcia-Suarez <rgarciasuarez@free.fr>
-
-" Suggestions and improvements by :
-"   Aaron J. Sherman (use syntax for hints)
-"   Artem Chuprina (play nice with folding)
-" TODO:
-" This file still relies on stuff from the Perl 5 syntax file, which Perl 6
-" does not use.
-"
-" Things that are not or not properly indented (yet) :
-" - Continued statements
-"     print "foo",
-"       "bar";
-"     print "foo"
-"       if bar();
-" - Multiline regular expressions (m//x)
-" (The following probably needs modifying the perl syntax file)
-" - qw() lists
-" - Heredocs with terminators that don't match \I\i*
-
-" Only load this indent file when no other was loaded.
-if exists("b:did_indent")
-    finish
-endif
-let b:did_indent = 1
-
-" Is syntax highlighting active ?
-let b:indent_use_syntax = has("syntax")
-
-setlocal indentexpr=GetPerl6Indent()
-
-" we reset it first because the Perl 5 indent file might have been loaded due
-" to a .pl/pm file extension, and indent files don't clean up afterwards
-setlocal indentkeys&
-
-setlocal indentkeys+=0=,0),0],0>,0»,0=or,0=and
-if !b:indent_use_syntax
-    setlocal indentkeys+=0=EO
-endif
-
-let s:cpo_save = &cpo
-set cpo-=C
-
-function! GetPerl6Indent()
-
-    " Get the line to be indented
-    let cline = getline(v:lnum)
-
-    " Indent POD markers to column 0
-    if cline =~ '^\s*=\L\@!'
-        return 0
-    endif
-
-    " Get current syntax item at the line's first char
-    let csynid = ''
-    if b:indent_use_syntax
-        let csynid = synIDattr(synID(v:lnum,1,0),"name")
-    endif
-
-    " Don't reindent POD and heredocs
-    if csynid =~ "^p6Pod"
-        return indent(v:lnum)
-    endif
-
-
-    " Now get the indent of the previous perl line.
-
-    " Find a non-blank line above the current line.
-    let lnum = prevnonblank(v:lnum - 1)
-    " Hit the start of the file, use zero indent.
-    if lnum == 0
-        return 0
-    endif
-    let line = getline(lnum)
-    let ind = indent(lnum)
-    " Skip heredocs, POD, and comments on 1st column
-    if b:indent_use_syntax
-        let skippin = 2
-        while skippin
-            let synid = synIDattr(synID(lnum,1,0),"name")
-            if (synid =~ "^p6Pod" || synid =~ "p6Comment")
-                let lnum = prevnonblank(lnum - 1)
-                if lnum == 0
-                    return 0
-                endif
-                let line = getline(lnum)
-                let ind = indent(lnum)
-                let skippin = 1
-            else
-                let skippin = 0
-            endif
-        endwhile
-    endif
-
-        if line =~ '[<«\[{(]\s*\(#[^)}\]»>]*\)\=$'
-            let ind = ind + &sw
-        endif
-        if cline =~ '^\s*[)}\]»>]'
-            let ind = ind - &sw
-        endif
-
-    " Indent lines that begin with 'or' or 'and'
-    if cline =~ '^\s*\(or\|and\)\>'
-        if line !~ '^\s*\(or\|and\)\>'
-            let ind = ind + &sw
-        endif
-    elseif line =~ '^\s*\(or\|and\)\>'
-        let ind = ind - &sw
-    endif
-
-    return ind
-
-endfunction
-
-let &cpo = s:cpo_save
-unlet s:cpo_save
-
-" vim:ts=8:sts=4:sw=4:expandtab:ft=vim
-
-endif

indent/plantuml.vim

@@ -0,0 +1,59 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'plantuml') == -1
+  
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+setlocal indentexpr=GetPlantUMLIndent()
+setlocal indentkeys=o,O,<CR>,<:>,!^F,0end,0else,}
+
+" only define the indent code once
+if exists('*GetPlantUMLIndent')
+  finish
+endif
+
+let s:incIndent =
+      \ '^\s*\%(loop\|alt\|opt\|group\|critical\|else\|legend\|box\|if\|while\)\>\|' .
+      \ '^\s*ref\>[^:]*$\|' .
+      \ '^\s*[hr]\?note\>\%(\%("[^"]*" \<as\>\)\@![^:]\)*$\|' .
+      \ '^\s*title\s*$\|' .
+      \ '^\s*skinparam\>.*{\s*$\|' .
+      \ '^\s*\%(state\|class\|partition\|rectangle\|enum\|interface\|namespace\)\>.*{'
+
+let s:decIndent = '^\s*\%(end\|else\|}\)'
+
+function! GetPlantUMLIndent(...) abort
+  "for current line, use arg if given or v:lnum otherwise
+  let clnum = a:0 ? a:1 : v:lnum
+
+  if !s:insidePlantUMLTags(clnum)
+    return indent(clnum)
+  endif
+
+  let pnum = prevnonblank(clnum-1)
+  let pindent = indent(pnum)
+  let pline = getline(pnum)
+  let cline = getline(clnum)
+
+  if cline =~ s:decIndent
+    if pline =~ s:incIndent
+      return pindent
+    else
+      return pindent - shiftwidth()
+    endif
+
+  elseif pline =~ s:incIndent
+    return pindent + shiftwidth()
+  endif
+
+  return pindent
+
+endfunction
+
+function! s:insidePlantUMLTags(lnum) abort
+  call cursor(a:lnum, 1)
+  return search('@startuml', 'Wbn') && search('@enduml', 'Wn')
+endfunction
+
+endif

indent/racket.vim

@@ -0,0 +1,16 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'racket') == -1
+  
+" Language:     Racket
+" Maintainer:   Will Langstroth <will@langstroth.com>
+" URL:          http://github.com/wlangstroth/vim-racket
+
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+setlocal ai nosi
+
+let b:undo_indent = "setl ai< si<"
+
+endif

indent/sass.vim

@@ -1,42 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
-" Vim indent file
-" Language:	Sass
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 May 21
-
-if exists("b:did_indent")
-  finish
-endif
-let b:did_indent = 1
-
-setlocal autoindent sw=2 et
-setlocal indentexpr=GetSassIndent()
-setlocal indentkeys=o,O,*<Return>,<:>,!^F
-
-" Only define the function once.
-if exists("*GetSassIndent")
-  finish
-endif
-
-let s:property = '^\s*:\|^\s*[[:alnum:]#{}-]\+\%(:\|\s*=\)'
-let s:extend = '^\s*\%(@extend\|@include\|+\)'
-
-function! GetSassIndent()
-  let lnum = prevnonblank(v:lnum-1)
-  let line = substitute(getline(lnum),'\s\+$','','')
-  let cline = substitute(substitute(getline(v:lnum),'\s\+$','',''),'^\s\+','','')
-  let lastcol = strlen(line)
-  let line = substitute(line,'^\s\+','','')
-  let indent = indent(lnum)
-  let cindent = indent(v:lnum)
-  if line !~ s:property && line !~ s:extend && cline =~ s:property
-    return indent + (exists('*shiftwidth') ? shiftwidth() : &sw)
-  else
-    return -1
-  endif
-endfunction
-
-" vim:set sw=2:
-
-endif

indent/scala.vim

@@ -378,12 +378,17 @@ function! GetScalaIndent()
   let prevline = scala#GetLine(prevlnum)
   let curlnum = v:lnum
   let curline = scala#GetLine(curlnum)
+  if get(g:, 'scala_scaladoc_indent', 0)
+    let star_indent = 2
+  else
+    let star_indent = 1
+  end
 
   if prevline =~ '^\s*/\*\*'
     if prevline =~ '\*/\s*$'
       return ind
     else
-      return ind + 1
+      return ind + star_indent
     endif
   endif
 
@@ -538,7 +543,7 @@ function! GetScalaIndent()
   if prevline =~ '^\s*\*/'
    \ || prevline =~ '*/\s*$'
     call scala#ConditionalConfirm("18")
-    let ind = ind - 1
+    let ind = ind - star_indent
   endif
 
   if scala#LineEndsInIncomplete(prevline)

indent/scss.vim

@@ -1,16 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'haml') == -1
-  
-" Vim indent file
-" Language:	SCSS
-" Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 Jul 26
-
-if exists("b:did_indent")
-  finish
-endif
-
-runtime! indent/css.vim
-
-" vim:set sw=2:
-
-endif

indent/terraform.vim

@@ -0,0 +1,48 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'terraform') == -1
+  
+if exists("b:did_indent")
+  finish
+endif
+
+let b:did_indent = 1
+
+setlocal nolisp
+setlocal autoindent
+setlocal indentexpr=TerraformIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=)
+
+if exists("*TerraformIndent")
+  finish
+endif
+
+function! TerraformIndent(lnum)
+  " previous non-blank line
+  let prevlnum = prevnonblank(a:lnum-1)
+
+  " beginning of file?
+  if prevlnum == 0
+    return 0
+  endif
+
+  " previous line without comments
+  let prevline = substitute(getline(prevlnum), '//.*$', '', '')
+  let previndent = indent(prevlnum)
+  let thisindent = previndent
+
+  " block open?
+  if prevline =~ '[\[{]\s*$'
+    let thisindent += &sw
+  endif
+
+  " current line without comments
+  let thisline = substitute(getline(a:lnum), '//.*$', '', '')
+
+  " block close?
+  if thisline =~ '^\s*[\]}]'
+    let thisindent -= &sw
+  endif
+
+  return thisindent
+endfunction
+
+endif

indent/twig.vim

@@ -0,0 +1,80 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'twig') == -1
+  
+if exists("b:ran_once")
+	finish
+endif
+
+let b:ran_once = 1
+
+let s:baseIndentExpr=&indentexpr
+setlocal indentexpr=GetTwigIndent(v:lnum)
+
+fun! GetTwigIndent(currentLineNumber)
+	let currentLine = getline(a:currentLineNumber)
+	let previousLineNumber = prevnonblank(a:currentLineNumber - 1)
+	let previousLine = getline(previousLineNumber)
+
+	if (previousLine =~ s:startStructures || previousLine =~ s:middleStructures) && (currentLine !~ s:endStructures && currentLine !~ s:middleStructures)
+		return indent(previousLineNumber) + &shiftwidth
+	elseif currentLine =~ s:endStructures || currentLine =~ s:middleStructures
+		let previousOpenStructureNumber = s:FindPreviousOpenStructure(a:currentLineNumber)
+		let previousOpenStructureLine = getline(previousOpenStructureNumber)
+		return indent(previousOpenStructureNumber)
+	endif
+
+    return s:CallBaseIndent()
+endf
+
+function! s:CallBaseIndent()
+    exe 'redir => s:outputOfBaseIndent'
+    exe 'silent echo ' . s:baseIndentExpr
+    exe 'redir END'
+    return split(s:outputOfBaseIndent)[0]
+endf
+
+
+function! s:FindPreviousOpenStructure(lineNumber)
+	let countOpen = 0
+	let countClosed = 0
+	let lineNumber = a:lineNumber
+	while lineNumber != 1 && countOpen <= countClosed
+		let lineNumber -= 1
+		let currentLine = getline(lineNumber)
+
+		if currentLine =~ s:startStructures
+			let countOpen += 1
+		elseif currentLine =~ s:endStructures
+			let countClosed += 1
+		endif
+	endwhile
+
+	return lineNumber
+endfunction
+
+function! s:StartStructure(name)
+	return '^\s*{%\s*' . a:name . '.*%}'
+endfunction
+
+function! s:EndStructure(name)
+	return '^\s*{%\s*end' . a:name . '.*%}'
+endfunction
+
+function! s:Map(Fun, list)
+    if len(a:list) == 0
+        return []
+    else
+        return [a:Fun(a:list[0])] + s:Map(a:Fun, a:list[1:])
+    endif
+endfunction
+
+fun! s:BuildStructures()
+	let structures = ['if','for','block']
+	let mStructures = ['elseif','else']
+	let s:startStructures = join(s:Map(function('s:StartStructure'), structures), '\|')
+	let s:endStructures = join(s:Map(function('s:EndStructure'), structures), '\|')
+	let s:middleStructures = join(s:Map(function('s:StartStructure'), mStructures), '\|')
+endfun
+
+call s:BuildStructures()
+
+endif

indent/typescript.vim

@@ -2,504 +2,362 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') ==
   
 " Vim indent file
 " Language: Typescript
-" Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org
+" Acknowledgement: Almost direct copy from https://github.com/pangloss/vim-javascript
-
-" 0. Initialization {{{1
-" =================
 
 " Only load this indent file when no other was loaded.
-if exists("b:did_indent")
+if exists('b:did_indent') || get(g:, 'typescript_indent_disable', 0)
   finish
 endif
 let b:did_indent = 1
 
-setlocal nosmartindent
-
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetTypescriptIndent()
-setlocal formatexpr=Fixedgq(v:lnum,v:count)
+setlocal autoindent nolisp nosmartindent
-setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e
+setlocal indentkeys+=0],0)
+
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 
 " Only define the function once.
-if exists("*GetTypescriptIndent")
+if exists('*GetTypescriptIndent')
   finish
 endif
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-" 1. Variables {{{1
+" Get shiftwidth value
-" ============
+if exists('*shiftwidth')
+  function s:sw()
+	return shiftwidth()
+  endfunction
+else
+  function s:sw()
+	return &sw
+  endfunction
+endif
 
-let s:ts_keywords = '^\s*\(break\|case\|catch\|continue\|debugger\|default\|delete\|do\|else\|finally\|for\|function\|if\|in\|instanceof\|new\|return\|switch\|this\|throw\|try\|typeof\|var\|void\|while\|with\)'
+" searchpair() wrapper
+if has('reltime')
+  function s:GetPair(start,end,flags,skip,time,...)
+	return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
+  endfunction
+else
+  function s:GetPair(start,end,flags,skip,...)
+	return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
+  endfunction
+endif
 
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = 'string\|regex\|comment\c'
+let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template\%(braces\)\@!'
-
+let s:syng_str = 'string\|template\|special'
-" Regex of syntax group names that are strings.
+let s:syng_com = 'comment\|doc'
-let s:syng_string = 'regex\c'
-
-" Regex of syntax group names that are strings or documentation.
-let s:syng_multiline = 'comment\c'
-
-" Regex of syntax group names that are line comment.
-let s:syng_linecom = 'linecomment\c'
-
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
+let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
-let s:line_term = '\s*\%(\%(\/\/\).*\)\=$'
+function s:skip_func()
-
+  if !s:free || search('\m`\|\${\|\*\/','nW',s:looksyn)
-" Regex that defines continuation lines, not including (, {, or [.
+	let s:free = !eval(s:skip_expr)
-let s:continuation_regex = '\%([\\*+/.:]\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\|[^=]=[^=].*,\)' . s:line_term
+	let s:looksyn = line('.')
-
+	return !s:free
-" Regex that defines continuation lines.
+  endif
-" TODO: this needs to deal with if ...: and so on
+  let s:looksyn = line('.')
-let s:msl_regex = s:continuation_regex
+  return getline('.') =~ '\%<'.col('.').'c\/.\{-}\/\|\%>'.col('.').'c[''"]\|\\$' &&
-
+		\ eval(s:skip_expr)
-let s:one_line_scope_regex = '\<\%(if\|else\|for\|while\)\>[^{;]*' . s:line_term
-
-" Regex that defines blocks.
-let s:block_regex = '\%([{[]\)\s*\%(|\%([*@]\=\h\w*,\=\s*\)\%(,\s*[*@]\=\h\w*\)*|\)\=' . s:line_term
-
-let s:var_stmt = '^\s*var'
-
-let s:comma_first = '^\s*,'
-let s:comma_last = ',\s*$'
-
-let s:ternary = '^\s\+[?|:]'
-let s:ternary_q = '^\s\+?'
-
-" 2. Auxiliary Functions {{{1
-" ======================
-
-" Check if the character at lnum:col is inside a string, comment, or is ascii.
-function s:IsInStringOrComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_strcom
 endfunction
 
-" Check if the character at lnum:col is inside a string.
+function s:alternatePair(stop)
-function s:IsInString(lnum, col)
+  let pos = getpos('.')[1:2]
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_string
+  while search('\m[][(){}]','bW',a:stop)
-endfunction
+	if !s:skip_func()
-
+	  let idx = stridx('])}',s:looking_at())
-" Check if the character at lnum:col is inside a multi-line comment.
+	  if idx + 1
-function s:IsInMultilineComment(lnum, col)
+		if s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop) <= 0
-  return !s:IsLineComment(a:lnum, a:col) && synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_multiline
+		  break
-endfunction
+		endif
-
-" Check if the character at lnum:col is a line comment.
-function s:IsLineComment(lnum, col)
-  return synIDattr(synID(a:lnum, a:col, 1), 'name') =~ s:syng_linecom
-endfunction
-
-" Find line above 'lnum' that isn't empty, in a comment, or in a string.
-function s:PrevNonBlankNonString(lnum)
-  let in_block = 0
-  let lnum = prevnonblank(a:lnum)
-  while lnum > 0
-    " Go in and out of blocks comments as necessary.
-    " If the line isn't empty (with opt. comment) or in a string, end search.
-    let line = getline(lnum)
-    if line =~ '/\*'
-      if in_block
-        let in_block = 0
 	  else
-        break
+		return
 	  endif
-    elseif !in_block && line =~ '\*/'
-      let in_block = 1
-    elseif !in_block && line !~ '^\s*\%(//\).*$' && !(s:IsInStringOrComment(lnum, 1) && s:IsInStringOrComment(lnum, strlen(line)))
-      break
 	endif
-    let lnum = prevnonblank(lnum - 1)
   endwhile
-  return lnum
+  call call('cursor',pos)
 endfunction
 
-" Find line above 'lnum' that started the continuation 'lnum' may be part of.
+function s:save_pos(f,...)
-function s:GetMSL(lnum, in_one_line_scope)
+  let l:pos = getpos('.')[1:2]
-  " Start on the line we're at and use its indent.
+  let ret = call(a:f,a:000)
-  let msl = a:lnum
+  call call('cursor',l:pos)
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
+  return ret
-  while lnum > 0
+endfunction
-    " If we have a continuation line, or we're in a string, use line as MSL.
+
-    " Otherwise, terminate search as we have found our MSL already.
+function s:syn_at(l,c)
-    let line = getline(lnum)
+  return synIDattr(synID(a:l,a:c,0),'name')
-    let col = match(line, s:msl_regex) + 1
+endfunction
-    if (col > 0 && !s:IsInStringOrComment(lnum, col)) || s:IsInString(lnum, strlen(line))
+
-      let msl = lnum
+function s:looking_at()
+  return getline('.')[col('.')-1]
+endfunction
+
+function s:token()
+  return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
+endfunction
+
+function s:previous_token()
+  let l:n = line('.')
+  if (s:looking_at() !~ '\k' || search('\m\<','cbW')) && search('\m\S','bW')
+	if (getline('.')[col('.')-2:col('.')-1] == '*/' || line('.') != l:n &&
+		  \ getline('.') =~ '\%<'.col('.').'c\/\/') && s:syn_at(line('.'),col('.')) =~? s:syng_com
+	  while search('\m\/\ze[/*]','cbW')
+		if !search('\m\S','bW')
+		  break
+		elseif s:syn_at(line('.'),col('.')) !~? s:syng_com
+		  return s:token()
+		endif
+	  endwhile
 	else
-      " Don't use lines that are part of a one line scope as msl unless the
+	  return s:token()
-      " flag in_one_line_scope is set to 1
-      "
-      if a:in_one_line_scope
-        break
-      end
-      let msl_one_line = s:Match(lnum, s:one_line_scope_regex)
-      if msl_one_line == 0
-        break
 	endif
   endif
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
+  return ''
-  endwhile
-  return msl
 endfunction
 
-function s:RemoveTrailingComments(content)
+function s:others(p)
-  let single = '\/\/\(.*\)\s*$'
+  return "((line2byte(line('.')) + col('.')) <= ".(line2byte(a:p[0]) + a:p[1]).") || ".s:skip_expr
-  let multi = '\/\*\(.*\)\*\/\s*$'
-  return substitute(substitute(a:content, single, '', ''), multi, '', '')
 endfunction
 
-" Find if the string is inside var statement (but not the first string)
+function s:tern_skip(p)
-function s:InMultiVarStatement(lnum)
+  return s:GetPair('{','}','nbW',s:others(a:p),200,a:p[0]) > 0
-  let lnum = s:PrevNonBlankNonString(a:lnum - 1)
-
-"  let type = synIDattr(synID(lnum, indent(lnum) + 1, 0), 'name')
-
-  " loop through previous expressions to find a var statement
-  while lnum > 0
-    let line = getline(lnum)
-
-    " if the line is a ts keyword
-    if (line =~ s:ts_keywords)
-      " check if the line is a var stmt
-      " if the line has a comma first or comma last then we can assume that we
-      " are in a multiple var statement
-      if (line =~ s:var_stmt)
-        return lnum
-      endif
-
-      " other ts keywords, not a var
-      return 0
-    endif
-
-    let lnum = s:PrevNonBlankNonString(lnum - 1)
-  endwhile
-
-  " beginning of program, not a var
-  return 0
 endfunction
 
-" Find line above with beginning of the var statement or returns 0 if it's not
+function s:tern_col(p)
-" this statement
+  return s:GetPair('?',':\@<!::\@!','nbW',s:others(a:p)
-function s:GetVarIndent(lnum)
+		\ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
-  let lvar = s:InMultiVarStatement(a:lnum)
+endfunction
-  let prev_lnum = s:PrevNonBlankNonString(a:lnum - 1)
 
-  if lvar
+function s:label_col()
-    let line = s:RemoveTrailingComments(getline(prev_lnum))
+  let pos = getpos('.')[1:2]
+  let [s:looksyn,s:free] = pos
+  call s:alternatePair(0)
+  if s:save_pos('s:IsBlock')
+	let poss = getpos('.')[1:2]
+	return call('cursor',pos) || !s:tern_col(poss)
+  elseif s:looking_at() == ':'
+	return !s:tern_col([0,0])
+  endif
+endfunction
 
-    " if the previous line doesn't end in a comma, return to regular indent
+" configurable regexes that define continuation lines, not including (, {, or [.
-    if (line !~ s:comma_last)
+let s:opfirst = '^' . get(g:,'typescript_opfirst',
-      return indent(prev_lnum) - &sw
+	  \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
+let s:continuation = get(g:,'typescript_continuation',
+	  \ '\%([-+<>=,.~!?/*^%|&:]\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
+
+function s:continues(ln,con)
+  return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
+		\ eval( (['s:syn_at(line("."),col(".")) !~? "regex"'] +
+		\ repeat(['getline(".")[col(".")-2] != tr(s:looking_at(),">","=")'],3) +
+		\ repeat(['s:previous_token() != "."'],5) + [1])[
+		\ index(split('/ > - + typeof in instanceof void delete'),s:token())])
+endfunction
+
+" get the line of code stripped of comments and move cursor to the last
+" non-comment char.
+function s:Trim(ln)
+  call cursor(a:ln+1,1)
+  call s:previous_token()
+  return strpart(getline('.'),0,col('.'))
+endfunction
+
+" Find line above 'lnum' that isn't empty or in a comment
+function s:PrevCodeLine(lnum)
+  let l:n = prevnonblank(a:lnum)
+  while l:n
+	if getline(l:n) =~ '^\s*\/[/*]' 
+	  if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+			\ s:syn_at(l:n,1) =~? s:syng_str
+		return l:n
+	  endif
+	  let l:n = prevnonblank(l:n-1)
+	elseif getline(l:n) =~ '\([/*]\)\1\@![/*]' && s:syn_at(l:n,1) =~? s:syng_com
+	  let l:n = s:save_pos('eval',
+			\ 'cursor('.l:n.',1) + search(''\m\/\*'',"bW")')
 	else
-      return indent(lvar) + &sw
+	  return l:n
 	endif
-  endif
+  endwhile
-
-  return -1
 endfunction
 
-
+" Check if line 'lnum' has a balanced amount of parentheses.
-" Check if line 'lnum' has more opening brackets than closing ones.
+function s:Balanced(lnum)
-function s:LineHasOpeningBrackets(lnum)
+  let l:open = 0
-  let open_0 = 0
+  let l:line = getline(a:lnum)
-  let open_2 = 0
+  let pos = match(l:line, '[][(){}]', 0)
-  let open_4 = 0
-  let line = getline(a:lnum)
-  let pos = match(line, '[][(){}]', 0)
   while pos != -1
-    if !s:IsInStringOrComment(a:lnum, pos + 1)
+	if s:syn_at(a:lnum,pos + 1) !~? s:syng_strcom
-      let idx = stridx('(){}[]', line[pos])
+	  let l:open += match(' ' . l:line[pos],'[[({]')
-      if idx % 2 == 0
+	  if l:open < 0
-        let open_{idx} = open_{idx} + 1
+		return
-      else
-        let open_{idx - 1} = open_{idx - 1} - 1
 	  endif
 	endif
-    let pos = match(line, '[][(){}]', pos + 1)
+	let pos = match(l:line, '[][(){}]', pos + 1)
   endwhile
-  return (open_0 > 0) . (open_2 > 0) . (open_4 > 0)
+  return !l:open
 endfunction
 
-function s:Match(lnum, regex)
+function s:OneScope(lnum)
-  let col = match(getline(a:lnum), a:regex) + 1
+  let pline = s:Trim(a:lnum)
-  return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
+  let kw = 'else do'
+  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+	call s:previous_token()
+	let kw = 'for if let while with'
+	if index(split('await each'),s:token()) + 1
+	  call s:previous_token()
+	  let kw = 'for'
+	endif
+  endif
+  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
+		\ s:save_pos('s:previous_token') != '.'
 endfunction
 
-function s:IndentWithContinuation(lnum, ind, width)
+" returns braceless levels started by 'i' and above lines * &sw. 'num' is the
-  " Set up variables to use and search for MSL to the previous line.
+" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
-  let p_lnum = a:lnum
+" a continued expression, which could have started in a braceless context
-  let lnum = s:GetMSL(a:lnum, 1)
+function s:iscontOne(i,num,cont)
-  let line = getline(lnum)
+  let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
-
+  let pind = a:num ? indent(l:num) + s:W : 0
-  " If the previous line wasn't a MSL and is continuation return its indent.
+  let ind = indent(l:i) + (a:cont ? 0 : s:W)
-  " TODO: the || s:IsInString() thing worries me a bit.
+  while l:i >= l:num && (ind > pind || l:i == l:num)
-  if p_lnum != lnum
+	if indent(l:i) < ind && s:OneScope(l:i)
-    if s:Match(p_lnum,s:continuation_regex)||s:IsInString(p_lnum,strlen(line))
+	  let bL += s:W
-      return a:ind
+	  let l:i = line('.')
+	elseif !a:cont || bL || ind < indent(a:i)
+	  break
 	endif
-  endif
+	let ind = min([ind, indent(l:i)])
-
+	let l:i = s:PrevCodeLine(l:i - 1)
-  " Set up more variables now that we know we aren't continuation bound.
+  endwhile
-  let msl_ind = indent(lnum)
+  return bL
-
-  " If the previous line ended with [*+/.-=], start a continuation that
-  " indents an extra level.
-  if s:Match(lnum, s:continuation_regex)
-    if lnum == p_lnum
-      return msl_ind + a:width
-    else
-      return msl_ind
-    endif
-  endif
-
-  return a:ind
 endfunction
 
-function s:InOneLineScope(lnum)
+" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-  let msl = s:GetMSL(a:lnum, 1)
+function s:IsBlock()
-  if msl > 0 && s:Match(msl, s:one_line_scope_regex)
+  if s:looking_at() == '{'
-    return msl
+	let l:n = line('.')
+	let char = s:previous_token()
+	if match(s:stack,'xml\|jsx') + 1 && s:syn_at(line('.'),col('.')-1) =~? 'xml\|jsx'
+	  return char != '{'
+	elseif char =~ '\k'
+	  return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
+			\ ,char) < (line('.') != l:n) || s:previous_token() == '.'
+	elseif char == '>'
+	  return getline('.')[col('.')-2] == '=' || s:syn_at(line('.'),col('.')) =~? '^jsflow'
+	elseif char == ':'
+	  return getline('.')[col('.')-2] != ':' && s:label_col()
+	elseif char == '/'
+	  return s:syn_at(line('.'),col('.')) =~? 'regex'
+	endif
+	return char !~ '[=~!<*,?^%|&([]' &&
+		  \ (char !~ '[-+]' || l:n != line('.') && getline('.')[col('.')-2] == char)
   endif
-  return 0
 endfunction
 
-function s:ExitingOneLineScope(lnum)
-  let msl = s:GetMSL(a:lnum, 1)
-  if msl > 0
-    " if the current line is in a one line scope ..
-    if s:Match(msl, s:one_line_scope_regex)
-      return 0
-    else
-      let prev_msl = s:GetMSL(msl - 1, 1)
-      if s:Match(prev_msl, s:one_line_scope_regex)
-        return prev_msl
-      endif
-    endif
-  endif
-  return 0
-endfunction
-
-" 3. GetTypescriptIndent Function {{{1
-" =========================
-
 function GetTypescriptIndent()
-  " 3.1. Setup {{{2
+  let b:js_cache = get(b:,'js_cache',[0,0,0])
-  " ----------
-
-  " Set up variables for restoring position in file.  Could use v:lnum here.
-  let vcol = col('.')
-
-  " 3.2. Work on the current line {{{2
-  " -----------------------------
-
-  let ind = -1
   " Get the current line.
-  let line = getline(v:lnum)
+  call cursor(v:lnum,1)
-  " previous nonblank line number
+  let l:line = getline('.')
-  let prevline = prevnonblank(v:lnum - 1)
+  " use synstack as it validates syn state and works in an empty line
+  let s:stack = synstack(v:lnum,1)
+  let syns = synIDattr(get(s:stack,-1),'name')
 
-  " If we got a closing bracket on an empty line, find its match and indent
+  " start with strings,comments,etc.
-  " according to it.  For parentheses we indent to its column - 1, for the
+  if syns =~? s:syng_com
-  " others we indent to the containing line's MSL's level.  Return -1 if fail.
+	if l:line =~ '^\s*\*'
-  let col = matchend(line, '^\s*[],})]')
-  if col > 0 && !s:IsInStringOrComment(v:lnum, col)
-    call cursor(v:lnum, col)
-
-    let lvar = s:InMultiVarStatement(v:lnum)
-    if lvar
-      let prevline_contents = s:RemoveTrailingComments(getline(prevline))
-
-      " check for comma first
-      if (line[col - 1] =~ ',')
-        " if the previous line ends in comma or semicolon don't indent
-        if (prevline_contents =~ '[;,]\s*$')
-          return indent(s:GetMSL(line('.'), 0))
-        " get previous line indent, if it's comma first return prevline indent
-        elseif (prevline_contents =~ s:comma_first)
-          return indent(prevline)
-        " otherwise we indent 1 level
-        else
-          return indent(lvar) + &sw
-        endif
-      endif
-    endif
-
-
-    let bs = strpart('(){}[]', stridx(')}]', line[col - 1]) * 2, 2)
-    if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
-      if line[col-1]==')' && col('.') != col('$') - 1
-        let ind = virtcol('.')-1
-      else
-        let ind = indent(s:GetMSL(line('.'), 0))
-      endif
-    endif
-    return ind
-  endif
-
-  " If the line is comma first, dedent 1 level
-  if (getline(prevline) =~ s:comma_first)
-    return indent(prevline) - &sw
-  endif
-
-  if (line =~ s:ternary)
-    if (getline(prevline) =~ s:ternary_q)
-      return indent(prevline)
-    else
-      return indent(prevline) + &sw
-    endif
-  endif
-
-  " If we are in a multi-line comment, cindent does the right thing.
-  if s:IsInMultilineComment(v:lnum, 1) && !s:IsLineComment(v:lnum, 1)
 	  return cindent(v:lnum)
+	elseif l:line !~ '^\s*\/[/*]'
+	  return -1
+	endif
+  elseif syns =~? s:syng_str && l:line !~ '^[''"]'
+	if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
+	  let b:js_cache[0] = v:lnum
+	endif
+	return -1
+  endif
+  let l:lnum = s:PrevCodeLine(v:lnum - 1)
+  if !l:lnum
+	return
   endif
 
-  " Check for multiple var assignments
+  let l:line = substitute(l:line,'^\s*','','')
-"  let var_indent = s:GetVarIndent(v:lnum)
+  if l:line[:1] == '/*'
-"  if var_indent >= 0
+	let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
-"    return var_indent
+  endif
-"  endif
+  if l:line =~ '^\/[/*]'
-
+	let l:line = ''
-  " 3.3. Work on the previous line. {{{2
-  " -------------------------------
-
-  " If the line is empty and the previous nonblank line was a multi-line
-  " comment, use that comment's indent. Deduct one char to account for the
-  " space in ' */'.
-  if line =~ '^\s*$' && s:IsInMultilineComment(prevline, 1)
-    return indent(prevline) - 1
   endif
 
-  " Find a non-blank, non-multi-line string line above the current line.
+  " the containing paren, bracket, or curly. Many hacks for performance
-  let lnum = s:PrevNonBlankNonString(v:lnum - 1)
+  let idx = index([']',')','}'],l:line[0])
-
+  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
-  " If the line is empty and inside a string, use the previous line.
+		\ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
-  if line =~ '^\s*$' && lnum != prevline
+	call call('cursor',b:js_cache[1:])
-    return indent(prevnonblank(v:lnum))
-  endif
-
-  " At the start of the file use zero indent.
-  if lnum == 0
-    return 0
-  endif
-
-  " Set up variables for current line.
-  let line = getline(lnum)
-  let ind = indent(lnum)
-
-  " If the previous line ended with a block opening, add a level of indent.
-  if s:Match(lnum, s:block_regex)
-    return indent(s:GetMSL(lnum, 0)) + &sw
-  endif
-
-  " If the previous line contained an opening bracket, and we are still in it,
-  " add indent depending on the bracket type.
-  if line =~ '[[({]'
-    let counts = s:LineHasOpeningBrackets(lnum)
-    if counts[0] == '1' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
-      if col('.') + 1 == col('$')
-        return ind + &sw
   else
-        return virtcol('.')
+	let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
-      endif
+		  \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
-    elseif counts[1] == '1' || counts[2] == '1'
+	if idx + 1
-      return ind + &sw
+	  call s:GetPair(['\[','(','{'][idx],'])}'[idx],'bW','s:skip_func()',2000,top)
+	elseif getline(v:lnum) !~ '^\S' && syns =~? 'block'
+	  call s:GetPair('{','}','bW','s:skip_func()',2000,top)
 	else
-      call cursor(v:lnum, vcol)
+	  call s:alternatePair(top)
-    end
+	endif
   endif
 
-  " 3.4. Work on the MSL line. {{{2
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
-  " --------------------------
+  let num = b:js_cache[1]
 
-  let ind_con = ind
+  let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
-  let ind = s:IndentWithContinuation(lnum, ind_con, &sw)
+  if !num || s:IsBlock()
-
+	let ilnum = line('.')
-  " }}}2
+	let pline = s:save_pos('s:Trim',l:lnum)
-  "
+	if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
-  "
+	  let num = ilnum == num ? line('.') : num
-  let ols = s:InOneLineScope(lnum)
+	  if idx < 0 && s:previous_token() ==# 'switch' && s:previous_token() != '.'
-  if ols > 0
+		if &cino !~ ':'
-    let ind = ind + &sw
+		  let switch_offset = s:W
 		else
-    let ols = s:ExitingOneLineScope(lnum)
+		  let cinc = matchlist(&cino,'.*:\zs\(-\)\=\(\d*\)\(\.\d\+\)\=\(s\)\=\C')
-    while ols > 0 && ind > 0
+		  let switch_offset = max([cinc[0] is '' ? 0 : (cinc[1].1) *
-      let ind = ind - &sw
+				\ ((strlen(cinc[2].cinc[3]) ? str2nr(cinc[2].str2nr(cinc[3][1])) : 10) *
-      let ols = s:InOneLineScope(ols - 1)
+				\ (cinc[4] is '' ? 1 : s:W)) / 10, -indent(num)])
-    endwhile
+		endif
+		if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
+		  return indent(num) + switch_offset
+		endif
+	  endif
+	endif
+	if idx < 0 && pline !~ '[{;]$'
+	  if pline =~# ':\@<!:$'
+		call cursor(l:lnum,strlen(pline))
+		let isOp = s:tern_col(b:js_cache[1:2]) * s:W
+	  else
+		let isOp = (l:line =~# s:opfirst || s:continues(l:lnum,pline)) * s:W
+	  endif
+	  let bL = s:iscontOne(l:lnum,b:js_cache[1],isOp)
+	  let bL -= (bL && l:line[0] == '{') * s:W
+	endif
   endif
 
-  return ind
+  " main return
+  if idx + 1 || l:line[:1] == '|}'
+	return indent(num)
+  elseif num
+	return indent(num) + s:W + switch_offset + bL + isOp
+  endif
+  return bL + isOp
 endfunction
 
-" }}}1
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
 
-function! Fixedgq(lnum, count)
-    let l:tw = &tw ? &tw : 80
-
-    let l:count = a:count
-    let l:first_char = indent(a:lnum) + 1
-
-    if mode() == 'i' " gq was not pressed, but tw was set
-        return 1
-    endif
-
-    " This gq is only meant to do code with strings, not comments
-    if s:IsLineComment(a:lnum, l:first_char) || s:IsInMultilineComment(a:lnum, l:first_char)
-        return 1
-    endif
-
-    if len(getline(a:lnum)) < l:tw && l:count == 1 " No need for gq
-        return 1
-    endif
-
-    " Put all the lines on one line and do normal spliting after that
-    if l:count > 1
-        while l:count > 1
-            let l:count -= 1
-            normal J
-        endwhile
-    endif
-
-    let l:winview = winsaveview()
-
-    call cursor(a:lnum, l:tw + 1)
-    let orig_breakpoint = searchpairpos(' ', '', '\.', 'bcW', '', a:lnum)
-    call cursor(a:lnum, l:tw + 1)
-    let breakpoint = searchpairpos(' ', '', '\.', 'bcW', s:skip_expr, a:lnum)
-
-    " No need for special treatment, normal gq handles edgecases better
-    if breakpoint[1] == orig_breakpoint[1]
-        call winrestview(l:winview)
-        return 1
-    endif
-
-    " Try breaking after string
-    if breakpoint[1] <= indent(a:lnum)
-        call cursor(a:lnum, l:tw + 1)
-        let breakpoint = searchpairpos('\.', '', ' ', 'cW', s:skip_expr, a:lnum)
-    endif
-
-
-    if breakpoint[1] != 0
-        call feedkeys("r\<CR>")
-    else
-        let l:count = l:count - 1
-    endif
-
-    " run gq on new lines
-    if l:count == 1
-        call feedkeys("gqq")
-    endif
-
-    return 0
-endfunction
 
 endif

indent/vala.vim

@@ -1,36 +1,87 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vala') == -1
   
-" Copyright (c) 2012 Takezoe Tomoaki <tkztmk@outlook.com>
+" Vim indent file
-"
+" Language:         Vala
-" Permission is hereby granted, free of charge, to any person obtaining a copy
+" Author:           Adrià Arrufat <adria.arrufat@protonmail.ch>
-" of
+" Last Change:      2016 Dec 04
-" 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.
 
-" Vim indent file for Vala. 
+" Only load this indent file when no other was loaded.
-" It just sets cindent for Vala files...
 if exists("b:did_indent")
   finish
 endif
 let b:did_indent = 1
-setl cin
-let b:undo_indent = "setl cin<"
 
+setlocal cindent
+setlocal cinoptions=L0,(0,Ws,J1,j1
+setlocal cinkeys=0{,0},!^F,o,O,0[,0]
+
+" Some preliminary settings
+setlocal nolisp		" Make sure lisp indenting doesn't supersede us
+setlocal autoindent	" indentexpr isn't much help otherwise
+
+setlocal indentexpr=GetValaIndent(v:lnum)
+
+" Only define the function once.
+if exists("*GetValaIndent")
+  finish
+endif
+
+" Come here when loading the script the first time.
+
+function GetValaIndent(lnum)
+
+	" Hit the start of the file, use zero indent.
+	if a:lnum == 0
+		return 0
+	endif
+
+	" Starting assumption: cindent (called at the end) will do it right
+	" normally. We just want to fix up a few cases.
+
+	let line = getline(a:lnum)
+	" Search backwards for the previous non-empty line.
+	let prevlinenum = prevnonblank(a:lnum - 1)
+	let prevline = getline(prevlinenum)
+	while prevlinenum > 1 && prevline !~ '[^[:blank:]]'
+		let prevlinenum = prevnonblank(prevlinenum - 1)
+		let prevline = s:getline(prevlinenum)
+	endwhile
+
+	" If previous line contains a code attribute (e.g. [CCode (...)])
+	" don't increase the indentation
+	if prevline =~? '^\s*\[[A-Za-z]' && prevline =~? '\]$'
+		return indent(prevlinenum)
+	endif
+
+	" cindent gets lambda body wrong, as it treats the comma as indicating an
+	" unfinished statement (fix borrowed from rust.vim indent file):
+	"
+	" list.foreach ((entry) => {
+	"		stdout.puts (entry);
+	"		stdout.putc ('\n');
+	"		if (entry == null) {
+	" 		print ("empty entry\n");
+	"		}
+	" });
+	"
+	" and we want it to be:
+	" list.foreach ((entry) => {
+	"	stdout.puts (entry);
+	"	stdout.putc ('\n');
+	" 	if (entry == null) {
+	" 		print ("empty entry\n");
+	" 	}
+	" });
+
+	if prevline[len(prevline) - 1] == ","
+				\ && line !~ '^\s*[\[\]{}]'
+				\ && prevline !~ '([^()]\+,$'
+				\ && line !~ '^\s*\S\+\s*=>'
+		return indent(prevlinenum)
+	endif
+
+	" Fall back on cindent, which does it mostly right
+	return cindent(a:lnum)
+endfunction
 
 endif

indent/vue.vim

@@ -0,0 +1,68 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'vue') == -1
+  
+" Vim indent file
+" Language: Vue.js
+" Maintainer: Eduardo San Martin Morote
+" Author: Adriaan Zonnenberg
+
+if exists('b:did_indent')
+  finish
+endif
+
+function! s:get_indentexpr(language)
+  unlet! b:did_indent
+  execute 'runtime! indent/' . a:language . '.vim'
+  return &indentexpr
+endfunction
+
+" The order is important here, tags without attributes go last.
+" HTML is left out, it will be used when there is no match.
+let s:languages = [
+      \   { 'name': 'pug', 'pairs': ['<template lang="pug"', '</template>'] },
+      \   { 'name': 'stylus', 'pairs': ['<style lang="stylus"', '</style>'] },
+      \   { 'name': 'css', 'pairs': ['<style', '</style>'] },
+      \   { 'name': 'coffee', 'pairs': ['<script lang="coffee"', '</script>'] },
+      \   { 'name': 'javascript', 'pairs': ['<script', '</script>'] },
+      \ ]
+
+for language in s:languages
+  " Set 'indentexpr' if the user has an indent file installed for the language
+  if strlen(globpath(&rtp, 'indent/'. language.name .'.vim'))
+    let language.indentexpr = s:get_indentexpr(language.name)
+  endif
+endfor
+
+let s:html_indent = s:get_indentexpr('html')
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetVueIndent()
+
+if exists('*GetVueIndent')
+  finish
+endif
+
+function! GetVueIndent()
+  for language in s:languages
+    let opening_tag_line = searchpair(language.pairs[0], '', language.pairs[1], 'bWr')
+
+    if opening_tag_line
+      execute 'let indent = ' . get(language, 'indentexpr', -1)
+      break
+    endif
+  endfor
+
+  if exists('l:indent')
+    if (opening_tag_line == prevnonblank(v:lnum - 1) || opening_tag_line == v:lnum)
+          \ || getline(v:lnum) =~ '\v^\s*\</(script|style|template)'
+      return 0
+    endif
+  else
+    " Couldn't find language, fall back to html
+    execute 'let indent = ' . s:html_indent
+  endif
+
+  return indent
+endfunction
+
+endif

syntax/apiblueprint.vim

@@ -0,0 +1,38 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'apiblueprint') == -1
+  
+runtime! syntax/markdown.vim
+unlet! b:current_syntax
+
+" Metadata
+syntax region apibMarkdownMetadata start=/\%^.*:.*$/ end=/^$/ contains=apibMarkdownMetadataKey,apibMarkdownMetadataValue fold
+syntax match apibMarkdownMetadataKey /^[^:]*\ze:/ contained
+syntax match apibMarkdownMetadataValue /:.*/ contained
+
+syntax region apibHTTPStatusCode start=/\d\d\d/ end=// contained containedin=apibResponseSection
+syntax region apibHTTPContentType start=/(.*)/ end=// contained containedin=apibResponseSection
+
+syntax region apibModelSection start=/^+ Model/ end=/$/ oneline
+syntax region apibRequestSection start=/^[-+*] Request.*/ end=/^$/ contains=apibHTTPContentType
+syntax region apibResponseSection start=/^[-+*] Response \d\d\d/ end=/^$/ contains=apibHTTPStatusCode,apibHTTPContentType
+syntax region apibHeadersSection start=/^+ Headers$/ end=/^\S.*$/ contains=apibHeadersSectionKey,apibHeadersSectionValue
+
+syntax region apibActionRelationKey start=/: .*/ end=/$/ contained
+syntax region apibActionRelation start=/^[-+*] Relation: .*$/ end=/$/ oneline contains=apibActionRelationKey
+
+syntax match apibHeadersSectionKey /^[^:]*\ze:/ contained
+syntax match apibHeadersSectionValue /:.*/ contained
+
+highlight default link apibMarkdownMetadataKey Function
+highlight default link apibRequestSection Function
+highlight default link apibResponseSection Function
+highlight default link apibModelSection Function
+highlight default link apibHeadersSectionKey Function
+highlight default link apibHTTPStatusCode Delimiter
+highlight default link apibHTTPContentType Comment
+highlight default link apibActionRelation Function
+highlight default link apibActionRelationKey Identifier
+
+let b:current_syntax = 'apiblueprint'
+
+
+endif

syntax/asciidoc.vim

@@ -0,0 +1,187 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'asciidoc') == -1
+  
+" Vim syntax file
+" Language:     AsciiDoc
+" Author:       Stuart Rackham <srackham@gmail.com> (inspired by Felix
+"               Obenhuber's original asciidoc.vim script).
+" URL:          http://asciidoc.org/
+" Licence:      GPL (http://www.gnu.org)
+" Remarks:      Vim 6 or greater
+" Limitations:
+" 
+" - Nested quoted text formatting is highlighted according to the outer
+"   format.
+" - If a closing Example Block delimiter may be mistaken for a title
+"   underline. A workaround is to insert a blank line before the closing
+"   delimiter.
+" - Lines within a paragraph starting with equals characters are
+"   highlighted as single-line titles.
+" - Lines within a paragraph beginning with a period are highlighted as
+"   block titles.
+
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn clear
+syn sync fromstart
+syn sync linebreaks=100
+
+" Run :help syn-priority to review syntax matching priority.
+syn keyword asciidocToDo TODO FIXME CHECK TEST XXX ZZZ DEPRECATED
+syn match asciidocBackslash /\\/
+syn region asciidocIdMarker start=/^\$Id:\s/ end=/\s\$$/
+syn match asciidocCallout /\\\@<!<\d\{1,2}>/
+syn match asciidocOpenBlockDelimiter /^--$/
+syn match asciidocLineBreak /[ \t]+$/ containedin=asciidocList
+syn match asciidocRuler /^'\{3,}$/
+syn match asciidocPagebreak /^<\{3,}$/
+syn match asciidocEntityRef /\\\@<!&[#a-zA-Z]\S\{-};/
+syn region asciidocLiteralParagraph start=/\(\%^\|\_^\s*\n\)\@<=\s\+\S\+/ end=/\(^\(+\|--\)\?\s*$\)\@=/ contains=asciidocToDo
+syn match asciidocURL /\\\@<!\<\(http\|https\|ftp\|file\|irc\):\/\/[^| \t]*\(\w\|\/\)/
+syn match asciidocEmail /[\\.:]\@<!\(\<\|<\)\w\(\w\|[.-]\)*@\(\w\|[.-]\)*\w>\?[0-9A-Za-z_]\@!/
+syn match asciidocAttributeRef /\\\@<!{\w\(\w\|[-,+]\)*\([=!@#$%?:].*\)\?}/
+
+" As a damage control measure quoted patterns always terminate at a blank
+" line (see 'Limitations' above).
+syn match asciidocQuotedAttributeList /\\\@<!\[[a-zA-Z0-9_-][a-zA-Z0-9 _-]*\][+_'`#*]\@=/
+syn match asciidocQuotedSubscript /\\\@<!\~\S\_.\{-}\(\~\|\n\s*\n\)/ contains=asciidocEntityRef
+syn match asciidocQuotedSuperscript /\\\@<!\^\S\_.\{-}\(\^\|\n\s*\n\)/ contains=asciidocEntityRef
+
+syn match asciidocQuotedMonospaced /\(^\|[| \t([.,=\]]\)\@<=+\([+ \n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(+\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef
+syn match asciidocQuotedMonospaced2 /\(^\|[| \t([.,=\]]\)\@<=`\([` \n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(`\([| \t)[\],.?!;:=]\|$\)\@=\)/
+syn match asciidocQuotedUnconstrainedMonospaced /[\\+]\@<!++\S\_.\{-}\(++\|\n\s*\n\)/ contains=asciidocEntityRef
+
+syn match asciidocQuotedEmphasized /\(^\|[| \t([.,=\]]\)\@<=_\([_ \n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(_\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef
+syn match asciidocQuotedEmphasized2 /\(^\|[| \t([.,=\]]\)\@<='\([' \n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\('\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef
+syn match asciidocQuotedUnconstrainedEmphasized /\\\@<!__\S\_.\{-}\(__\|\n\s*\n\)/ contains=asciidocEntityRef
+
+syn match asciidocQuotedBold /\(^\|[| \t([.,=\]]\)\@<=\*\([* \n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(\*\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef
+syn match asciidocQuotedUnconstrainedBold /\\\@<!\*\*\S\_.\{-}\(\*\*\|\n\s*\n\)/ contains=asciidocEntityRef
+
+" Don't allow ` in single quoted (a kludge to stop confusion with `monospaced`).
+syn match asciidocQuotedSingleQuoted /\(^\|[| \t([.,=\]]\)\@<=`\([` \n\t]\)\@!\([^`]\|\n\(\s*\n\)\@!\)\{-}[^` \t]\('\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef
+
+syn match asciidocQuotedDoubleQuoted /\(^\|[| \t([.,=\]]\)\@<=``\([` \n\t]\)\@!\(.\|\n\(\s*\n\)\@!\)\{-}\S\(''\([| \t)[\],.?!;:=]\|$\)\@=\)/ contains=asciidocEntityRef
+
+syn match asciidocDoubleDollarPassthrough /\\\@<!\(^\|[^0-9a-zA-Z$]\)\@<=\$\$..\{-}\(\$\$\([^0-9a-zA-Z$]\|$\)\@=\|^$\)/
+syn match asciidocTriplePlusPassthrough /\\\@<!\(^\|[^0-9a-zA-Z$]\)\@<=+++..\{-}\(+++\([^0-9a-zA-Z$]\|$\)\@=\|^$\)/
+
+syn match asciidocAdmonition /^\u\{3,15}:\(\s\+.*\)\@=/
+
+syn region asciidocTable_OLD start=/^\([`.']\d*[-~_]*\)\+[-~_]\+\d*$/ end=/^$/
+syn match asciidocBlockTitle /^\.[^. \t].*[^-~_]$/ contains=asciidocQuoted.*,asciidocAttributeRef
+syn match asciidocTitleUnderline /[-=~^+]\{2,}$/ transparent contained contains=NONE
+syn match asciidocOneLineTitle /^=\{1,5}\s\+\S.*$/ contains=asciidocQuoted.*,asciidocMacroAttributes,asciidocAttributeRef,asciidocEntityRef,asciidocEmail,asciidocURL,asciidocBackslash
+syn match asciidocTwoLineTitle /^[^. +/].*[^.]\n[-=~^+]\{3,}$/ contains=asciidocQuoted.*,asciidocMacroAttributes,asciidocAttributeRef,asciidocEntityRef,asciidocEmail,asciidocURL,asciidocBackslash,asciidocTitleUnderline
+
+syn match asciidocAttributeList /^\[[^[ \t].*\]$/
+syn match asciidocQuoteBlockDelimiter /^_\{4,}$/
+syn match asciidocExampleBlockDelimiter /^=\{4,}$/
+syn match asciidocSidebarDelimiter /^*\{4,}$/
+
+" See http://vimdoc.sourceforge.net/htmldoc/usr_44.html for excluding region
+" contents from highlighting.
+syn match asciidocTablePrefix /\(\S\@<!\(\([0-9.]\+\)\([*+]\)\)\?\([<\^>.]\{,3}\)\?\([a-z]\)\?\)\?|/ containedin=asciidocTableBlock contained
+syn region asciidocTableBlock matchgroup=asciidocTableDelimiter start=/^|=\{3,}$/ end=/^|=\{3,}$/ keepend contains=ALL
+syn match asciidocTablePrefix /\(\S\@<!\(\([0-9.]\+\)\([*+]\)\)\?\([<\^>.]\{,3}\)\?\([a-z]\)\?\)\?!/ containedin=asciidocTableBlock contained
+syn region asciidocTableBlock2 matchgroup=asciidocTableDelimiter2 start=/^!=\{3,}$/ end=/^!=\{3,}$/ keepend contains=ALL
+
+syn match asciidocListContinuation /^+$/
+syn region asciidocLiteralBlock start=/^\.\{4,}$/ end=/^\.\{4,}$/ contains=asciidocCallout,asciidocToDo keepend
+syn region asciidocListingBlock start=/^-\{4,}$/ end=/^-\{4,}$/ contains=asciidocCallout,asciidocToDo keepend
+syn region asciidocCommentBlock start="^/\{4,}$" end="^/\{4,}$" contains=asciidocToDo
+syn region asciidocPassthroughBlock start="^+\{4,}$" end="^+\{4,}$"
+
+" Allowing leading \w characters in the filter delimiter is to accomodate
+" the pre version 8.2.7 syntax and may be removed in future releases.
+syn region asciidocFilterBlock start=/^\w*\~\{4,}$/ end=/^\w*\~\{4,}$/
+
+syn region asciidocMacroAttributes matchgroup=asciidocRefMacro start=/\\\@<!<<"\{-}\(\w\|-\|_\|:\|\.\)\+"\?,\?/ end=/\(>>\)\|^$/ contains=asciidocQuoted.* keepend
+syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\\\@<!\[\{2}\(\w\|-\|_\|:\|\.\)\+,\?/ end=/\]\{2}/ keepend
+syn region asciidocMacroAttributes matchgroup=asciidocAnchorMacro start=/\\\@<!\[\{3}\(\w\|-\|_\|:\|\.\)\+/ end=/\]\{3}/ keepend
+syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/[\\0-9a-zA-Z]\@<!\w\(\w\|-\)*:\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.*,asciidocAttributeRef,asciidocEntityRef keepend
+" Highlight macro that starts with an attribute reference (a common idiom).
+syn region asciidocMacroAttributes matchgroup=asciidocMacro start=/\(\\\@<!{\w\(\w\|[-,+]\)*\([=!@#$%?:].*\)\?}\)\@<=\S\{-}\[/ skip=/\\\]/ end=/\]\|^$/ contains=asciidocQuoted.*,asciidocAttributeRef keepend
+syn region asciidocMacroAttributes matchgroup=asciidocIndexTerm start=/\\\@<!(\{2,3}/ end=/)\{2,3}/ contains=asciidocQuoted.*,asciidocAttributeRef keepend
+
+syn match asciidocCommentLine "^//\([^/].*\|\)$" contains=asciidocToDo
+
+syn region asciidocAttributeEntry start=/^:\w/ end=/:\(\s\|$\)/ oneline
+
+" Lists.
+syn match asciidocListBullet /^\s*\zs\(-\|\*\{1,5}\)\ze\s/
+syn match asciidocListNumber /^\s*\zs\(\(\d\+\.\)\|\.\{1,5}\|\(\a\.\)\|\([ivxIVX]\+)\)\)\ze\s\+/
+syn region asciidocListLabel start=/^\s*/ end=/\(:\{2,4}\|;;\)$/ oneline contains=asciidocQuoted.*,asciidocMacroAttributes,asciidocAttributeRef,asciidocEntityRef,asciidocEmail,asciidocURL,asciidocBackslash,asciidocToDo keepend
+" DEPRECATED: Horizontal label.
+syn region asciidocHLabel start=/^\s*/ end=/\(::\|;;\)\(\s\+\|\\$\)/ oneline contains=asciidocQuoted.*,asciidocMacroAttributes keepend
+" Starts with any of the above.
+syn region asciidocList start=/^\s*\(-\|\*\{1,5}\)\s/ start=/^\s*\(\(\d\+\.\)\|\.\{1,5}\|\(\a\.\)\|\([ivxIVX]\+)\)\)\s\+/ start=/.\+\(:\{2,4}\|;;\)$/ end=/\(^[=*]\{4,}$\)\@=/ end=/\(^\(+\|--\)\?\s*$\)\@=/ contains=asciidocList.\+,asciidocQuoted.*,asciidocMacroAttributes,asciidocAttributeRef,asciidocEntityRef,asciidocEmail,asciidocURL,asciidocBackslash,asciidocCommentLine,asciidocAttributeList,asciidocToDo
+
+hi def link asciidocAdmonition Special
+hi def link asciidocAnchorMacro Macro
+hi def link asciidocAttributeEntry Special
+hi def link asciidocAttributeList Special
+hi def link asciidocAttributeMacro Macro
+hi def link asciidocAttributeRef Special
+hi def link asciidocBackslash Special
+hi def link asciidocBlockTitle Title
+hi def link asciidocCallout Label
+hi def link asciidocCommentBlock Comment
+hi def link asciidocCommentLine Comment
+hi def link asciidocDoubleDollarPassthrough Special
+hi def link asciidocEmail Macro
+hi def link asciidocEntityRef Special
+hi def link asciidocExampleBlockDelimiter Type
+hi def link asciidocFilterBlock Type
+hi def link asciidocHLabel Label
+hi def link asciidocIdMarker Special
+hi def link asciidocIndexTerm Macro
+hi def link asciidocLineBreak Special
+hi def link asciidocOpenBlockDelimiter Label
+hi def link asciidocListBullet Label
+hi def link asciidocListContinuation Label
+hi def link asciidocListingBlock Identifier
+hi def link asciidocListLabel Label
+hi def link asciidocListNumber Label
+hi def link asciidocLiteralBlock Identifier
+hi def link asciidocLiteralParagraph Identifier
+hi def link asciidocMacroAttributes Label
+hi def link asciidocMacro Macro
+hi def link asciidocOneLineTitle Title
+hi def link asciidocPagebreak Type
+hi def link asciidocPassthroughBlock Identifier
+hi def link asciidocQuoteBlockDelimiter Type
+hi def link asciidocQuotedAttributeList Special
+hi def link asciidocQuotedBold Special
+hi def link asciidocQuotedDoubleQuoted Label
+hi def link asciidocQuotedEmphasized2 Type
+hi def link asciidocQuotedEmphasized Type
+hi def link asciidocQuotedMonospaced2 Identifier
+hi def link asciidocQuotedMonospaced Identifier
+hi def link asciidocQuotedSingleQuoted Label
+hi def link asciidocQuotedSubscript Type
+hi def link asciidocQuotedSuperscript Type
+hi def link asciidocQuotedUnconstrainedBold Special
+hi def link asciidocQuotedUnconstrainedEmphasized Type
+hi def link asciidocQuotedUnconstrainedMonospaced Identifier
+hi def link asciidocRefMacro Macro
+hi def link asciidocRuler Type
+hi def link asciidocSidebarDelimiter Type
+hi def link asciidocTableBlock2 NONE
+hi def link asciidocTableBlock NONE
+hi def link asciidocTableDelimiter2 Label
+hi def link asciidocTableDelimiter Label
+hi def link asciidocTable_OLD Type
+hi def link asciidocTablePrefix2 Label
+hi def link asciidocTablePrefix Label
+hi def link asciidocToDo Todo
+hi def link asciidocTriplePlusPassthrough Special
+hi def link asciidocTwoLineTitle Title
+hi def link asciidocURL Macro
+let b:current_syntax = "asciidoc"
+
+" vim: wrap et sw=2 sts=2:
+
+endif

syntax/blade.vim

@@ -31,8 +31,15 @@ syn region  bladeEcho       matchgroup=bladeDelimiter start="@\@<!{{" end="}}"
 syn region  bladeEcho       matchgroup=bladeDelimiter start="{!!" end="!!}"  contains=@bladePhp,bladePhpParenBlock  containedin=ALLBUT,@bladeExempt keepend
 syn region  bladeComment    matchgroup=bladeDelimiter start="{{--" end="--}}"  contains=bladeTodo  containedin=ALLBUT,@bladeExempt keepend
 
-syn keyword bladeKeyword    @if @elseif @foreach @forelse @for @while @can @cannot @elsecan @elsecannot @include @includeIf @each @inject @extends @section @stack @push @unless @yield @parent @hasSection @break @continue @unset @lang @choice nextgroup=bladePhpParenBlock skipwhite containedin=ALLBUT,@bladeExempt
+syn keyword bladeKeyword @if @elseif @foreach @forelse @for @while @can @cannot @elsecan @elsecannot @include
-syn keyword bladeKeyword    @else @endif @endunless @endfor @endforeach @empty @endforelse @endwhile @endcan @endcannot @stop @append @endsection @endpush @show @overwrite @verbatim @endverbatim containedin=ALLBUT,@bladeExempt
+    \ @includeIf @each @inject @extends @section @stack @push @unless @yield @parent @hasSection @break @continue
+    \ @unset @lang @choice @component @slot @prepend
+    \ nextgroup=bladePhpParenBlock skipwhite containedin=ALLBUT,@bladeExempt
+
+syn keyword bladeKeyword @else @endif @endunless @endfor @endforeach @empty @endforelse @endwhile @endcan
+    \ @endcannot @stop @append @endsection @endpush @show @overwrite @verbatim @endverbatim @endcomponent
+    \ @endslot @endprepend
+    \ containedin=ALLBUT,@bladeExempt
 
 if exists('g:blade_custom_directives')
     exe "syn keyword bladeKeyword @" . join(g:blade_custom_directives, ' @') . " nextgroup=bladePhpParenBlock skipwhite containedin=ALLBUT,@bladeExempt"
@@ -42,7 +49,7 @@ if exists('g:blade_custom_directives_pairs')
     exe "syn keyword bladeKeyword @" . join(values(g:blade_custom_directives_pairs), ' @') . " containedin=ALLBUT,@bladeExempt"
 endif
 
-syn region  bladePhpRegion  matchgroup=bladeKeyword start="\<@php\>\%(\s*(\)\@!" end="\<@endphp\>"  contains=@bladePhp  containedin=ALLBUT,@bladeExempt keepend
+syn region  bladePhpRegion  matchgroup=bladeKeyword start="\<@php\>\s*(\@!" end="\<@endphp\>"  contains=@bladePhp  containedin=ALLBUT,@bladeExempt keepend
 syn match   bladeKeyword "@php\ze\s*(" nextgroup=bladePhpParenBlock skipwhite containedin=ALLBUT,@bladeExempt
 
 syn region  bladePhpParenBlock  matchgroup=bladeDelimiter start="\s*(" end=")" contains=@bladePhp,bladePhpParenBlock skipwhite contained

syntax/c.vim

@@ -3,7 +3,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Apr 10
+" Last Change:	2016 Nov 18
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -184,11 +184,6 @@ syn match	cNumbersCom	display contained transparent "\<\d\|\.\d" contains=cNumbe
 syn match	cNumber		display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>"
 "hex number
 syn match	cNumber		display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>"
-if s:ft ==# 'cpp' && !exists("cpp_no_cpp14")
-  syn match	cNumber		display contained "\d\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
-  syn match	cNumber		display contained "0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
-  syn match	cNumber		display contained "0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
-endif
 " Flag the first zero of an octal number as something special
 syn match	cOctal		display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=cOctalZero
 syn match	cOctalZero	display contained "\<0"
@@ -365,36 +360,36 @@ if !exists("c_no_c99") " ISO C99
 endif
 
 " Accept %: for # (C99)
-syn region	cPreCondit	start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
+syn region	cPreCondit	start="^\s*\zs\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
-syn match	cPreConditMatch	display "^\s*\(%:\|#\)\s*\(else\|endif\)\>"
+syn match	cPreConditMatch	display "^\s*\zs\(%:\|#\)\s*\(else\|endif\)\>"
 if !exists("c_no_if0")
   syn cluster	cCppOutInGroup	contains=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip
-  syn region	cCppOutWrapper	start="^\s*\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
+  syn region	cCppOutWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
   syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
   if !exists("c_no_if0_fold")
     syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
   else
     syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
   endif
-  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
+  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\zs\(%:\|#\)\s*\(else\|elif\)" end="^\s*\zs\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
-  syn region	cCppInWrapper	start="^\s*\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
+  syn region	cCppInWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
-  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
+  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\zs\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
   if !exists("c_no_if0_fold")
-    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
+    syn region	cCppInElse	contained start="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
   else
-    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
+    syn region	cCppInElse	contained start="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
   endif
-  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
+  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\zs\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\zs\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
-  syn region	cCppOutSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
+  syn region	cCppOutSkip	contained start="^\s*\zs\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\zs\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
-  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
+  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\zs\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\zs\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
 endif
 syn region	cIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
 syn match	cIncluded	display contained "<[^>]*>"
-syn match	cInclude	display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
+syn match	cInclude	display "^\s*\zs\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
 "syn match cLineSkip	"\\$"
 syn cluster	cPreProcGroup	contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock
-syn region	cDefine		start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cDefine		start="^\s*\zs\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
-syn region	cPreProc	start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cPreProc	start="^\s*\zs\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
 
 " Highlight User Labels
 syn cluster	cMultiGroup	contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
@@ -403,21 +398,21 @@ if s:ft ==# 'c' || exists("cpp_no_cpp11")
 endif
 " Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
 syn cluster	cLabelGroup	contains=cUserLabel
-syn match	cUserCont	display "^\s*\I\i*\s*:$" contains=@cLabelGroup
+syn match	cUserCont	display "^\s*\zs\I\i*\s*:$" contains=@cLabelGroup
-syn match	cUserCont	display ";\s*\I\i*\s*:$" contains=@cLabelGroup
+syn match	cUserCont	display ";\s*\zs\I\i*\s*:$" contains=@cLabelGroup
 if s:ft ==# 'cpp'
-  syn match	cUserCont	display "^\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display "^\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
-  syn match	cUserCont	display ";\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display ";\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 else
-  syn match	cUserCont	display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display "^\s*\zs\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
-  syn match	cUserCont	display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display ";\s*\zs\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 endif
 
 syn match	cUserLabel	display "\I\i*" contained
 
 " Avoid recognizing most bitfields as labels
-syn match	cBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display "^\s*\zs\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
-syn match	cBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display ";\s*\zs\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
 
 if exists("c_minlines")
   let b:c_minlines = c_minlines

syntax/caddyfile.vim

@@ -0,0 +1,33 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'caddyfile') == -1
+  
+" Language: Caddyfile
+" Author:   Josh Glendenning <josh@isobit.io>
+
+if exists("b:current_syntax")
+	finish
+endif
+
+syn match caddyDirective "^\s*\([a-z]\+\)" nextgroup=caddyDirectiveArgs skipwhite
+syn region caddyDirectiveArgs start="" end="\({\|#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString nextgroup=caddyDirectiveBlock skipwhite
+syn region caddyDirectiveBlock start="{" skip="\\}" end="}" contained contains=caddySubdirective,caddyComment
+
+syn match caddySubdirective "^\s*\([a-zA-Z0-9_]\+\)" contained nextgroup=caddySubdirectiveArgs skipwhite
+syn region caddySubdirectiveArgs start="" end="\(#\|$\)"me=s-1 oneline contained contains=caddyPlaceholder,caddyString
+
+syn match caddyHost "\(https\?:\/\/\)\?\(\(\w\{1,}\.\)\(\w\{2,}\.\?\)\+\|localhost\)\(:[0-9]\{1,5}\)\?" nextgroup=caddyHostBlock skipwhite
+syn region caddyHostBlock start="{" skip="\\}" end="}" contained contains=caddyDirective,caddyComment
+
+syn region caddyPlaceholder start="{" skip="\\}" end="}" oneline contained
+syn region caddyString start='"' skip='\\\\\|\\"' end='"' oneline
+syn match caddyComment "#.*$"
+
+hi link caddyDirective Keyword
+hi link caddySubdirective Structure
+hi link caddyHost Identifier
+hi link caddyPlaceholder Special
+hi link caddyString String
+hi link caddyComment Comment
+
+let b:current_syntax = "caddyfile"
+
+endif

syntax/coffee.vim

@@ -34,7 +34,7 @@ hi def link coffeeConditional Conditional
 syn match coffeeException /\<\%(try\|catch\|finally\)\>/ display
 hi def link coffeeException Exception
 
-syn match coffeeKeyword /\<\%(new\|in\|of\|by\|and\|or\|not\|is\|isnt\|class\|extends\|super\|do\|yield\)\>/
+syn match coffeeKeyword /\<\%(new\|in\|of\|by\|and\|or\|not\|is\|isnt\|class\|extends\|super\|do\|yield\|debugger\|import\|export\|await\)\>/
 \                       display
 " The `own` keyword is only a keyword after `for`.
 syn match coffeeKeyword /\<for\s\+own\>/ contained containedin=coffeeRepeat
@@ -109,7 +109,7 @@ hi def link coffeeFloat Float
 
 " An error for reserved keywords, taken from the RESERVED array:
 " http://coffeescript.org/documentation/docs/lexer.html#section-67
-syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|export\|import\|native\|__hasProp\|__extends\|__slice\|__bind\|__indexOf\|implements\|interface\|package\|private\|protected\|public\|static\)\>/
+syn match coffeeReservedError /\<\%(case\|default\|function\|var\|void\|with\|const\|let\|enum\|native\|implements\|interface\|package\|private\|protected\|public\|static\)\>/
 \                             display
 hi def link coffeeReservedError Error
 

syntax/cpp.vim

@@ -4,23 +4,16 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'c/c++') == -1
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2015 Nov 10
+" Last Change:	2016 Oct 28
 
-" For version 5.x: Clear all syntax items
+" quit when a syntax file was already loaded
-" For version 6.x: Quit when a syntax file was already loaded
+if exists("b:current_syntax")
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
+runtime! syntax/c.vim
-  so <sfile>:p:h/c.vim
+unlet b:current_syntax
-else
-  runtime! syntax/c.vim
-  unlet b:current_syntax
-endif
 
 " C++ extensions
 syn keyword cppStatement	new delete this friend using
@@ -39,8 +32,8 @@ syn keyword cppConstant		__cplusplus
 
 " C++ 11 extensions
 if !exists("cpp_no_cpp11")
-  syn keyword cppModifier	override final auto
+  syn keyword cppModifier	override final
-  syn keyword cppType		nullptr_t
+  syn keyword cppType		nullptr_t auto
   syn keyword cppExceptions	noexcept
   syn keyword cppStorageClass	constexpr decltype thread_local
   syn keyword cppConstant	nullptr
@@ -55,36 +48,31 @@ endif
 
 " C++ 14 extensions
 if !exists("cpp_no_cpp14")
-  syn match cppNumber		display "\<0b[01]\+\(u\=l\{0,2}\|ll\=u\)\>"
+  syn case ignore
+  syn match cppNumber		display "\<0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
+  syn match cppNumber		display "\<[1-9]\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
+  syn match cppNumber		display "\<0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
+  syn case match
 endif
 
 " The minimum and maximum operators in GNU C++
 syn match cppMinMax "[<>]?"
 
 " Default highlighting
-if version >= 508 || !exists("did_cpp_syntax_inits")
+hi def link cppAccess		cppStatement
-  if version < 508
+hi def link cppCast		cppStatement
-    let did_cpp_syntax_inits = 1
+hi def link cppExceptions		Exception
-    command -nargs=+ HiLink hi link <args>
+hi def link cppOperator		Operator
-  else
+hi def link cppStatement		Statement
-    command -nargs=+ HiLink hi def link <args>
+hi def link cppModifier		Type
-  endif
+hi def link cppType		Type
-  HiLink cppAccess		cppStatement
+hi def link cppStorageClass	StorageClass
-  HiLink cppCast		cppStatement
+hi def link cppStructure		Structure
-  HiLink cppExceptions		Exception
+hi def link cppBoolean		Boolean
-  HiLink cppOperator		Operator
+hi def link cppConstant		Constant
-  HiLink cppStatement		Statement
+hi def link cppRawStringDelimiter	Delimiter
-  HiLink cppModifier		Type
+hi def link cppRawString		String
-  HiLink cppType		Type
+hi def link cppNumber		Number
-  HiLink cppStorageClass	StorageClass
-  HiLink cppStructure		Structure
-  HiLink cppBoolean		Boolean
-  HiLink cppConstant		Constant
-  HiLink cppRawStringDelimiter	Delimiter
-  HiLink cppRawString		String
-  HiLink cppNumber		Number
-  delcommand HiLink
-endif
 
 let b:current_syntax = "cpp"
 

syntax/crystal.vim

@@ -177,7 +177,7 @@ end
 syn match  crystalAliasDeclaration    "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable nextgroup=crystalAliasDeclaration2 skipwhite
 syn match  crystalAliasDeclaration2   "[^[:space:];#.()]\+" contained contains=crystalSymbol,crystalGlobalVariable,crystalPredefinedVariable
 syn match  crystalMethodDeclaration   "[^[:space:];#(]\+"	 contained contains=crystalConstant,crystalBoolean,crystalPseudoVariable,crystalInstanceVariable,crystalClassVariable,crystalGlobalVariable
-syn match  crystalFunctionDeclaration "[^[:space:];#=]\+"	 contained contains=crystalConstant
+syn match  crystalFunctionDeclaration "[^[:space:];#(=]\+"	 contained contains=crystalConstant
 syn match  crystalTypeDeclaration     "[^[:space:];#=]\+"	 contained contains=crystalConstant
 syn match  crystalClassDeclaration    "[^[:space:];#<]\+"	 contained contains=crystalConstant,crystalOperator
 syn match  crystalModuleDeclaration   "[^[:space:];#<]\+"	 contained contains=crystalConstant,crystalOperator

syntax/dockerfile.vim

@@ -1,7 +1,7 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'dockerfile') == -1
   
 " dockerfile.vim - Syntax highlighting for Dockerfiles
-" Maintainer:   Honza Pokorny <http://honza.ca>
+" Maintainer:   Honza Pokorny <https://honza.ca>
 " Version:      0.5
 
 
@@ -9,10 +9,11 @@ if exists("b:current_syntax")
     finish
 endif
 
+let b:current_syntax = "dockerfile"
+
 syntax case ignore
 
-syntax match dockerfileKeyword /\v^\s*(FROM|MAINTAINER|RUN|CMD|EXPOSE|ENV|ADD)\s/
+syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\s/
-syntax match dockerfileKeyword /\v^\s*(ENTRYPOINT|VOLUME|USER|WORKDIR|COPY)\s/
 highlight link dockerfileKeyword Keyword
 
 syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
@@ -21,15 +22,14 @@ highlight link dockerfileString String
 syntax match dockerfileComment "\v^\s*#.*$"
 highlight link dockerfileComment Comment
 
-syntax include @DockerSh syntax/sh.vim
+set commentstring=#\ %s
-try
-  syntax include @DockerSh after/syntax/sh.vim
-catch
-endtry
 
-syntax region dockerShSnip matchgroup=DockerShGroup start="^\s*\%(RUN\|CMD\)\s\+" end="$" contains=@DockerSh
+" match "RUN", "CMD", and "ENTRYPOINT" lines, and parse them as shell
-highlight link DockerShGroup dockerfileKeyword
+let s:current_syntax = b:current_syntax
-
+unlet b:current_syntax
-let b:current_syntax = "dockerfile"
+syntax include @SH syntax/sh.vim
+let b:current_syntax = s:current_syntax
+syntax region shLine matchgroup=dockerfileKeyword start=/\v^\s*(RUN|CMD|ENTRYPOINT)\s/ end=/\v$/ contains=@SH
+" since @SH will handle "\" as part of the same line automatically, this "just works" for line continuation too, but with the caveat that it will highlight "RUN echo '" followed by a newline as if it were a block because the "'" is shell line continuation...  not sure how to fix that just yet (TODO)
 
 endif

syntax/eelixir.vim

@@ -4,6 +4,9 @@ if exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 if !exists("main_syntax")
   let main_syntax = 'eelixir'
 endif
@@ -62,4 +65,7 @@ if main_syntax == 'eelixir'
   unlet main_syntax
 endif
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 endif

syntax/elixir.vim

@@ -4,25 +4,29 @@ if exists("b:current_syntax")
   finish
 endif
 
+let s:cpo_save = &cpo
+set cpo&vim
+
 " syncing starts 2000 lines before top line so docstrings don't screw things up
 syn sync minlines=2000
 
-syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@elixirDeclaration,elixirTodo,elixirArguments,elixirBlockDefinition
+syn cluster elixirNotTop contains=@elixirRegexSpecial,@elixirStringContained,@elixirDeclaration,elixirTodo,elixirArguments,elixirBlockDefinition,elixirUnusedVariable,elixirStructDelimiter
+syn cluster elixirRegexSpecial contains=elixirRegexEscape,elixirRegexCharClass,elixirRegexQuantifier,elixirRegexEscapePunctuation
+syn cluster elixirStringContained contains=elixirInterpolation,elixirRegexEscape,elixirRegexCharClass
+syn cluster elixirDeclaration contains=elixirFunctionDeclaration,elixirModuleDeclaration,elixirProtocolDeclaration,elixirImplDeclaration,elixirRecordDeclaration,elixirMacroDeclaration,elixirDelegateDeclaration,elixirOverridableDeclaration,elixirExceptionDeclaration,elixirCallbackDeclaration,elixirStructDeclaration
 
 syn match elixirComment '#.*' contains=elixirTodo,@Spell
 syn keyword elixirTodo FIXME NOTE TODO OPTIMIZE XXX HACK contained
 
-syn keyword elixirKeyword case when with cond for if unless try receive send
+syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>'
-syn keyword elixirKeyword exit raise throw after rescue catch else
-syn keyword elixirKeyword quote unquote super spawn spawn_link spawn_monitor
 
-" Functions used on guards
+syn match elixirKeyword '\(\.\)\@<!\<\(for\|case\|when\|with\|cond\|if\|unless\|try\|receive\|send\)\>'
-syn keyword elixirKeyword contained is_atom is_binary is_bitstring is_boolean
+syn match elixirKeyword '\(\.\)\@<!\<\(exit\|raise\|throw\|after\|rescue\|catch\|else\)\>'
-syn keyword elixirKeyword contained is_float is_function is_integer is_list
+syn match elixirKeyword '\(\.\)\@<!\<\(quote\|unquote\|super\|spawn\|spawn_link\|spawn_monitor\)\>'
-syn keyword elixirKeyword contained is_map is_nil is_number is_pid is_port
+
-syn keyword elixirKeyword contained is_record is_reference is_tuple is_exception
+" Kernel functions
-syn keyword elixirKeyword contained abs bit_size byte_size div elem hd length
+syn match elixirKernelFunction contained containedin=elixirGuard '\<\(is_atom\|is_binary\|is_bitstring\|is_boolean\|is_float\|is_function\|is_integer\|is_list\|is_map\|is_nil\|is_number\|is_pid\|is_port\)\>\([ (]\)\@='
-syn keyword elixirKeyword contained map_size node rem round tl trunc tuple_size
+syn match elixirKernelFunction contained containedin=elixirGuard '\<\(is_record\|is_reference\|is_tuple\|is_exception\|abs\|bit_size\|byte_size\|div\|elem\|hd\|length\|map_size\|node\|rem\|round\|tl\|trunc\|tuple_size\)\>\([ (]\)\@='
 
 syn match elixirGuard '.*when.*' contains=ALLBUT,@elixirNotTop
 
@@ -30,12 +34,10 @@ syn keyword elixirInclude import require alias use
 
 syn keyword elixirSelf self
 
-syn match elixirId '\<[_a-zA-Z]\w*[!?]\?\>'
-
 " This unfortunately also matches function names in function calls
-syn match elixirUnusedVariable '\(([^)]*\)\@<=\<_\w*\>'
+syn match elixirUnusedVariable contained '\<_\w*\>'
 
-syn keyword elixirOperator and not or when xor in
+syn keyword elixirOperator and not or in
 syn match   elixirOperator '!==\|!=\|!'
 syn match   elixirOperator '=\~\|===\|==\|='
 syn match   elixirOperator '<<<\|<<\|<=\|<-\|<'
@@ -52,7 +54,9 @@ syn match   elixirAtom '\(:\)\@<!:\%([a-zA-Z_]\w*\%([?!]\|=[>=]\@!\)\?\|<>\|===\
 syn match   elixirAtom '\(:\)\@<!:\%(<=>\|&&\?\|%\(()\|\[\]\|{}\)\|++\?\|--\?\|||\?\|!\|//\|[%&`/|]\)'
 syn match   elixirAtom "\%([a-zA-Z_]\w*[?!]\?\):\(:\)\@!"
 
-syn match   elixirAlias '\<[!]\?[A-Z]\w*\(\.[A-Z]\w*\)*\>'
+syn match   elixirBlockInline "\<\(do\|else\)\>:\@="
+
+syn match   elixirAlias '\([a-z]\)\@<![A-Z]\w*'
 
 syn keyword elixirBoolean true false nil
 
@@ -73,25 +77,27 @@ syn match elixirRegexCharClass         "\[:\(alnum\|alpha\|ascii\|blank\|cntrl\|
 
 syn region elixirRegex matchgroup=elixirRegexDelimiter start="%r/" end="/[uiomxfr]*" skip="\\\\" contains=@elixirRegexSpecial
 
-syn cluster elixirRegexSpecial    contains=elixirRegexEscape,elixirRegexCharClass,elixirRegexQuantifier,elixirRegexEscapePunctuation
+syn region elixirTuple matchgroup=elixirTupleDelimiter start="\(\w\|#\)\@<!{" end="}" contains=ALLBUT,@elixirNotTop
-syn cluster elixirStringContained contains=elixirInterpolation,elixirRegexEscape,elixirRegexCharClass
 
-syn region elixirString        matchgroup=elixirStringDelimiter start="'" end="'" skip="\\'\|\\\\" contains=@elixirStringContained
+syn match elixirStructDelimiter '{' contained containedin=elixirStruct
-syn region elixirString        matchgroup=elixirStringDelimiter start='"' end='"' skip='\\"' contains=@elixirStringContained
+syn region elixirStruct matchgroup=elixirStructDelimiter start="%\(\w\+{\)\@=" end="}" contains=ALLBUT,@elixirNotTop
-syn region elixirInterpolation matchgroup=elixirInterpolationDelimiter start="#{" end="}" contained contains=ALLBUT,elixirComment,@elixirNotTop
 
-syn region elixirDocStringStart matchgroup=elixirDocString start=+"""+ end=+$+ oneline contains=ALLBUT,@elixirNotTop
+syn region elixirMap matchgroup=elixirMapDelimiter start="%{" end="}" contains=ALLBUT,@elixirNotTop
-syn region elixirDocStringStart matchgroup=elixirDocString start=+'''+ end=+$+ oneline contains=ALLBUT,@elixirNotTop
+
-syn region elixirDocString     start=+\z("""\)+ end=+^\s*\zs\z1+ contains=elixirDocStringStart,elixirTodo,elixirInterpolation,@Spell keepend fold
+syn region elixirString  matchgroup=elixirStringDelimiter start=+\z('\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@elixirStringContained
-syn region elixirDocString     start=+\z('''\)+ end=+^\s*\zs\z1+ contains=elixirDocStringStart,elixirTodo,elixirInterpolation,@Spell keepend fold
+syn region elixirString  matchgroup=elixirStringDelimiter start=+\z("\)+   end=+\z1+ skip=+\\\\\|\\\z1+  contains=@elixirStringContained
+syn region elixirString  matchgroup=elixirStringDelimiter start=+\z('''\)+ end=+^\s*\z1+ contains=@elixirStringContained
+syn region elixirString  matchgroup=elixirStringDelimiter start=+\z("""\)+ end=+^\s*\z1+ contains=@elixirStringContained
+syn region elixirInterpolation matchgroup=elixirInterpolationDelimiter start="#{" end="}" contained contains=ALLBUT,elixirKernelFunction,elixirComment,@elixirNotTop
 
 syn match elixirAtomInterpolated   ':\("\)\@=' contains=elixirString
 syn match elixirString             "\(\w\)\@<!?\%(\\\(x\d{1,2}\|\h{1,2}\h\@!\>\|0[0-7]{0,2}[0-7]\@!\>\|[^x0MC]\)\|(\\[MC]-)+\w\|[^\s\\]\)"
 
-syn region elixirBlock              matchgroup=elixirBlockDefinition start="\<do\>:\@!" end="\<end\>" contains=ALLBUT,@elixirNotTop fold
+syn region elixirBlock              matchgroup=elixirBlockDefinition start="\<do\>:\@!" end="\<end\>" contains=ALLBUT,elixirKernelFunction,@elixirNotTop fold
-syn region elixirAnonymousFunction  matchgroup=elixirBlockDefinition start="\<fn\>"         end="\<end\>" contains=ALLBUT,@elixirNotTop fold
+syn region elixirElseBlock          matchgroup=elixirBlockDefinition start="\<else\>:\@!" end="\<end\>" contains=ALLBUT,elixirKernelFunction,@elixirNotTop fold
+syn region elixirAnonymousFunction  matchgroup=elixirBlockDefinition start="\<fn\>"     end="\<end\>" contains=ALLBUT,elixirKernelFunction,@elixirNotTop fold
 
-syn region elixirArguments start="(" end=")" contained contains=elixirOperator,elixirAtom,elixirPseudoVariable,elixirAlias,elixirBoolean,elixirVariable,elixirUnusedVariable,elixirNumber,elixirDocString,elixirAtomInterpolated,elixirRegex,elixirString,elixirStringDelimiter,elixirRegexDelimiter,elixirInterpolationDelimiter,elixirSigilDelimiter
+syn region elixirArguments start="(" end=")" contained contains=elixirOperator,elixirAtom,elixirPseudoVariable,elixirAlias,elixirBoolean,elixirVariable,elixirUnusedVariable,elixirNumber,elixirDocString,elixirAtomInterpolated,elixirRegex,elixirString,elixirStringDelimiter,elixirRegexDelimiter,elixirInterpolationDelimiter,elixirSigilDelimiter,elixirAnonymousFunction
 
 syn match elixirDelimEscape "\\[(<{\[)>}\]/\"'|]" transparent display contained contains=NONE
 
@@ -106,26 +112,49 @@ syn region elixirSigil matchgroup=elixirSigilDelimiter start="\~\l{"
 syn region elixirSigil matchgroup=elixirSigilDelimiter start="\~\l<"                end=">"   skip="\\\\\|\\>"   contains=@elixirStringContained,elixirRegexEscapePunctuation fold
 syn region elixirSigil matchgroup=elixirSigilDelimiter start="\~\l\["               end="\]"  skip="\\\\\|\\\]"  contains=@elixirStringContained,elixirRegexEscapePunctuation fold
 syn region elixirSigil matchgroup=elixirSigilDelimiter start="\~\l("                end=")"   skip="\\\\\|\\)"   contains=@elixirStringContained,elixirRegexEscapePunctuation fold
+syn region elixirSigil matchgroup=elixirSigilDelimiter start="\~\l\/"               end="\/"  skip="\\\\\|\\\/"  contains=@elixirStringContained,elixirRegexEscapePunctuation fold
 
-" Sigils surrounded with docString
+" Sigils surrounded with heredoc
-syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z("""\)+ end=+^\s*\zs\z1+ skip=+\\"+ fold
+syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z("""\)+ end=+^\s*\zs\z1\s*$+ skip=+\\"+ fold
-syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z('''\)+ end=+^\s*\zs\z1+ skip=+\\'+ fold
+syn region elixirSigil matchgroup=elixirSigilDelimiter start=+\~\a\z('''\)+ end=+^\s*\zs\z1\s*$+ skip=+\\'+ fold
+
+" Documentation
+if exists('g:elixir_use_markdown_for_docs') && g:elixir_use_markdown_for_docs
+  syn include @markdown syntax/markdown.vim
+  syn cluster elixirDocStringContained contains=@markdown,@Spell
+else
+  let g:elixir_use_markdown_for_docs = 0
+  syn cluster elixirDocStringContained contains=elixirDocTest,elixirTodo,@Spell
+
+  " doctests
+  syn region elixirDocTest start="^\s*\%(iex\|\.\.\.\)\%((\d*)\)\?>\s" end="^\s*$" contained
+endif
+
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start="\%(@\w*doc\s\+\)\@<=\~[Ss]\z(/\|\"\|'\||\)" end="\z1" skip="\\\\\|\\\z1" contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start="\%(@\w*doc\s\+\)\@<=\~[Ss]{"                   end="}"   skip="\\\\\|\\}"   contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start="\%(@\w*doc\s\+\)\@<=\~[Ss]<"                   end=">"   skip="\\\\\|\\>"   contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start="\%(@\w*doc\s\+\)\@<=\~[Ss]\["                  end="\]"  skip="\\\\\|\\\]"  contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start="\%(@\w*doc\s\+\)\@<=\~[Ss]("                   end=")"   skip="\\\\\|\\)"   contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirStringDelimiter start=+\%(@\w*doc\s\+\)\@<=\z("\)+                 end=+\z1+ skip=+\\\\\|\\\z1+  contains=@elixirDocStringContained keepend
+syn region elixirDocString matchgroup=elixirStringDelimiter start=+\%(@\w*doc\s\+\)\@<=\z("""\)+               end=+\z1+ contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start=+\%(@\w*doc\s\+\)\@<=\~[Ss]\z('''\)+ end=+\z1+ skip=+\\'+ contains=@elixirDocStringContained fold keepend
+syn region elixirDocString matchgroup=elixirSigilDelimiter  start=+\%(@\w*doc\s\+\)\@<=\~[Ss]\z("""\)+ end=+\z1+ skip=+\\"+ contains=@elixirDocStringContained fold keepend
 
 " Defines
-syn keyword elixirDefine              def            nextgroup=elixirFunctionDeclaration    skipwhite skipnl
+syn match elixirDefine              '\<def\>\(:\)\@!'             nextgroup=elixirFunctionDeclaration    skipwhite skipnl
-syn keyword elixirPrivateDefine       defp           nextgroup=elixirFunctionDeclaration    skipwhite skipnl
+syn match elixirPrivateDefine       '\<defp\>\(:\)\@!'            nextgroup=elixirFunctionDeclaration    skipwhite skipnl
-syn keyword elixirModuleDefine        defmodule      nextgroup=elixirModuleDeclaration      skipwhite skipnl
+syn match elixirModuleDefine        '\<defmodule\>\(:\)\@!'       nextgroup=elixirModuleDeclaration      skipwhite skipnl
-syn keyword elixirProtocolDefine      defprotocol    nextgroup=elixirProtocolDeclaration    skipwhite skipnl
+syn match elixirProtocolDefine      '\<defprotocol\>\(:\)\@!'     nextgroup=elixirProtocolDeclaration    skipwhite skipnl
-syn keyword elixirImplDefine          defimpl        nextgroup=elixirImplDeclaration        skipwhite skipnl
+syn match elixirImplDefine          '\<defimpl\>\(:\)\@!'         nextgroup=elixirImplDeclaration        skipwhite skipnl
-syn keyword elixirRecordDefine        defrecord      nextgroup=elixirRecordDeclaration      skipwhite skipnl
+syn match elixirRecordDefine        '\<defrecord\>\(:\)\@!'       nextgroup=elixirRecordDeclaration      skipwhite skipnl
-syn keyword elixirPrivateRecordDefine defrecordp     nextgroup=elixirRecordDeclaration      skipwhite skipnl
+syn match elixirPrivateRecordDefine '\<defrecordp\>\(:\)\@!'      nextgroup=elixirRecordDeclaration      skipwhite skipnl
-syn keyword elixirMacroDefine         defmacro       nextgroup=elixirMacroDeclaration       skipwhite skipnl
+syn match elixirMacroDefine         '\<defmacro\>\(:\)\@!'        nextgroup=elixirMacroDeclaration       skipwhite skipnl
-syn keyword elixirPrivateMacroDefine  defmacrop      nextgroup=elixirMacroDeclaration       skipwhite skipnl
+syn match elixirPrivateMacroDefine  '\<defmacrop\>\(:\)\@!'       nextgroup=elixirMacroDeclaration       skipwhite skipnl
-syn keyword elixirDelegateDefine      defdelegate    nextgroup=elixirDelegateDeclaration    skipwhite skipnl
+syn match elixirDelegateDefine      '\<defdelegate\>\(:\)\@!'     nextgroup=elixirDelegateDeclaration    skipwhite skipnl
-syn keyword elixirOverridableDefine   defoverridable nextgroup=elixirOverridableDeclaration skipwhite skipnl
+syn match elixirOverridableDefine   '\<defoverridable\>\(:\)\@!'  nextgroup=elixirOverridableDeclaration skipwhite skipnl
-syn keyword elixirExceptionDefine     defexception   nextgroup=elixirExceptionDeclaration   skipwhite skipnl
+syn match elixirExceptionDefine     '\<defexception\>\(:\)\@!'    nextgroup=elixirExceptionDeclaration   skipwhite skipnl
-syn keyword elixirCallbackDefine      defcallback    nextgroup=elixirCallbackDeclaration    skipwhite skipnl
+syn match elixirCallbackDefine      '\<defcallback\>\(:\)\@!'     nextgroup=elixirCallbackDeclaration    skipwhite skipnl
-syn keyword elixirStructDefine        defstruct      skipwhite skipnl
+syn match elixirStructDefine        '\<defstruct\>\(:\)\@!'       skipwhite skipnl
 
 " Declarations
 syn match  elixirModuleDeclaration      "[^[:space:];#<]\+"        contained                      nextgroup=elixirBlock     skipwhite skipnl
@@ -140,8 +169,12 @@ syn match  elixirOverridableDeclaration "[^[:space:];#<]\+"        contained con
 syn match  elixirExceptionDeclaration   "[^[:space:];#<]\+"        contained contains=elixirAlias                           skipwhite skipnl
 syn match  elixirCallbackDeclaration    "[^[:space:];#<,()\[\]]\+" contained contains=elixirFunctionDeclaration             skipwhite skipnl
 
-syn cluster elixirDeclaration contains=elixirFunctionDeclaration,elixirModuleDeclaration,elixirProtocolDeclaration,elixirImplDeclaration,elixirRecordDeclaration,elixirMacroDeclaration,elixirDelegateDeclaration,elixirOverridableDeclaration,elixirExceptionDeclaration,elixirCallbackDeclaration,elixirStructDeclaration
+" ExUnit
+syn match  elixirExUnitMacro "\(^\s*\)\@<=\<\(test\|describe\|setup\|setup_all\|on_exit\|doctest\)\>"
+syn match  elixirExUnitAssert "\(^\s*\)\@<=\<\(assert\|assert_in_delta\|assert_raise\|assert_receive\|assert_received\|catch_error\)\>"
+syn match  elixirExUnitAssert "\(^\s*\)\@<=\<\(catch_exit\|catch_throw\|flunk\|refute\|refute_in_delta\|refute_receive\|refute_received\)\>"
 
+hi def link elixirBlockInline            Keyword
 hi def link elixirBlockDefinition        Keyword
 hi def link elixirDefine                 Define
 hi def link elixirPrivateDefine          Define
@@ -157,12 +190,16 @@ hi def link elixirOverridableDefine      Define
 hi def link elixirExceptionDefine        Define
 hi def link elixirCallbackDefine         Define
 hi def link elixirStructDefine           Define
+hi def link elixirExUnitMacro            Define
+hi def link elixirModuleDeclaration      Type
 hi def link elixirFunctionDeclaration    Function
 hi def link elixirMacroDeclaration       Macro
 hi def link elixirInclude                Include
 hi def link elixirComment                Comment
 hi def link elixirTodo                   Todo
 hi def link elixirKeyword                Keyword
+hi def link elixirExUnitAssert           Keyword
+hi def link elixirKernelFunction         Keyword
 hi def link elixirOperator               Operator
 hi def link elixirAtom                   Constant
 hi def link elixirPseudoVariable         Constant
@@ -172,7 +209,8 @@ hi def link elixirVariable               Identifier
 hi def link elixirSelf                   Identifier
 hi def link elixirUnusedVariable         Comment
 hi def link elixirNumber                 Number
-hi def link elixirDocString              String
+hi def link elixirDocString              Comment
+hi def link elixirDocTest                elixirKeyword
 hi def link elixirAtomInterpolated       elixirAtom
 hi def link elixirRegex                  elixirString
 hi def link elixirRegexEscape            elixirSpecial
@@ -189,4 +227,7 @@ hi def link elixirSigilDelimiter         Delimiter
 
 let b:current_syntax = "elixir"
 
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
 endif