Fix jsx indentation, closes #543

It causes issues:
- https://github.com/dracula/vim/pull/163
- https://github.com/stephpy/vim-yaml/issues/22

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
       run: |
         sudo add-apt-repository ppa:jonathonf/vim -y
         sudo apt-get update -q
-        sudo apt-get install -y vim
+        sudo apt-get install -y vim expect
         vim --version
     - uses: actions/checkout@v2
     - name: Run Tests

README.md

@@ -7,7 +7,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 120+ times faster** than the <!--Package Count-->190<!--/Package Count--> packages it consists of.
+- It **installs and updates 120+ times faster** than the <!--Package Count-->194<!--/Package Count--> packages it consists of.
 - It is more secure because scripts loaded for all extensions are generated by vim-polyglot (ftdetect).
 - Solid syntax and indentation support (other features skipped). Only the best language packs.
 - All unnecessary files are ignored (like enormous documentation from php support).
@@ -78,6 +78,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [automake](https://github.com/vim/vim/tree/master/runtime)
 - [ave](https://github.com/vim/vim/tree/master/runtime)
 - [awk](https://github.com/vim/vim/tree/master/runtime)
+- [basic](https://github.com/vim/vim/tree/master/runtime)
 - [blade](https://github.com/jwalton512/vim-blade)
 - [brewfile](https://github.com/bfontaine/Brewfile.vim)
 - [c/c++](https://github.com/vim-jp/vim-cpp)
@@ -117,6 +118,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [go](https://github.com/fatih/vim-go)
 - [gradle](https://github.com/tfnico/vim-gradle)
 - [graphql](https://github.com/jparise/vim-graphql)
+- [groovy](https://github.com/vim/vim/tree/master/runtime)
 - [grub](https://github.com/vim/vim/tree/master/runtime)
 - [haml](https://github.com/sheerun/vim-haml)
 - [handlebars](https://github.com/sheerun/vim-mustache-handlebars)
@@ -130,6 +132,7 @@ If you need full functionality of any plugin, please use it directly with your p
 - [html5](https://github.com/othree/html5.vim)
 - [i3](https://github.com/mboughaba/i3config.vim)
 - [icalendar](https://github.com/chutzpah/icalendar.vim)
+- [idris2](https://github.com/edwinb/idris2-vim)
 - [idris](https://github.com/idris-hackers/idris-vim)
 - [ion](https://github.com/vmchale/ion-vim)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
@@ -223,12 +226,13 @@ If you need full functionality of any plugin, please use it directly with your p
 - [vbnet](https://github.com/vim-scripts/vbnet.vim)
 - [vcl](https://github.com/smerrill/vcl-vim-plugin)
 - [velocity](https://github.com/lepture/vim-velocity)
+- [visual-basic](https://github.com/vim/vim/tree/master/runtime)
 - [vmasm](https://github.com/vim/vim/tree/master/runtime)
 - [vue](https://github.com/posva/vim-vue)
 - [xdc](https://github.com/amal-khailtash/vim-xdc-syntax)
 - [xml](https://github.com/amadeus/vim-xml)
 - [xsl](https://github.com/vim-scripts/XSLT-syntax)
-- [yaml](https://github.com/stephpy/vim-yaml)
+- [yaml](https://github.com/vim/vim/tree/df44a27b53586fccfc6a3aedc89061fdd9a515ff/runtime)
 - [yard](https://github.com/sheerun/vim-yardoc)
 - [zephir](https://github.com/xwsoul/vim-zephir)
 - [zig](https://github.com/ziglang/zig.vim)

after/ftplugin/idris2.vim

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

after/ftplugin/javascript-1.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/javascript-2.vim

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

after/ftplugin/javascript.vim

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

after/ftplugin/javascriptreact.vim

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

after/ftplugin/jsx.vim

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

after/ftplugin/yaml.vim

@@ -1,11 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-
-" Vim indent file
-" Language: Yaml
-" Author: Henrique Barcelos
-" Date: 2014-10-08
-" URL: https://github.com/hjpbarcelos
-setlocal autoindent sw=2 ts=2 expandtab
-" vim:set sw=2:
-
-endif

after/indent/javascript.vim

@@ -1,80 +1,9 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
+if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
 
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to
-" deal in the Software without restriction, including without limitation the
-" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-" sell copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-" IN THE SOFTWARE.
-"
-" Language: GraphQL
-" Maintainer: Jon Parise <jon@indelible.org>
-
-runtime! indent/graphql.vim
-
-" Don't redefine our function and also require the standard Javascript indent
-" function to exist.
-if exists('*GetJavascriptGraphQLIndent') || !exists('*GetJavascriptIndent')
+if get(g:, 'vim_jsx_pretty_disable_js', 0)
   finish
 endif
 
-" Set the indentexpr with our own version that will call GetGraphQLIndent when
-" we're inside of a GraphQL string and otherwise defer to GetJavascriptIndent.
-setlocal indentexpr=GetJavascriptGraphQLIndent()
-
-function GetJavascriptGraphQLIndent()
-  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
-  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
-    return GetGraphQLIndent()
-  endif
-
-  return GetJavascriptIndent()
-endfunction
-
-endif
-if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)
-
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Vim indent file
-"
-" Language: javascript.jsx
-" Maintainer: MaxMellon <maxmellon1994@gmail.com>
-"
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-if exists('b:did_indent')
-  let s:did_indent = b:did_indent
-  unlet b:did_indent
-endif
-
-let s:keepcpo = &cpo
-set cpo&vim
-
-if exists('s:did_indent')
-  let b:did_indent = s:did_indent
-endif
-
-setlocal indentexpr=GetJsxIndent()
-setlocal indentkeys=0.,0{,0},0),0],0?,0\*,0\,,!^F,:,<:>,o,O,e,<>>,=*/
-
-function! GetJsxIndent()
-  return jsx_pretty#indent#get(function('GetJavascriptIndent'))
-endfunction
-
-let &cpo = s:keepcpo
-unlet s:keepcpo
+source <sfile>:h/jsx.vim
 
 endif

after/indent/javascriptreact.vim

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

after/indent/jsx.vim

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

after/indent/typescript.vim

@@ -1,47 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'graphql') == -1
-
-" Copyright (c) 2016-2020 Jon Parise <jon@indelible.org>
-"
-" Permission is hereby granted, free of charge, to any person obtaining a copy
-" of this software and associated documentation files (the "Software"), to
-" deal in the Software without restriction, including without limitation the
-" rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-" sell copies of the Software, and to permit persons to whom the Software is
-" furnished to do so, subject to the following conditions:
-"
-" The above copyright notice and this permission notice shall be included in
-" all copies or substantial portions of the Software.
-"
-" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-" IN THE SOFTWARE.
-"
-" Language: GraphQL
-" Maintainer: Jon Parise <jon@indelible.org>
-
-runtime! indent/graphql.vim
-
-" Don't redefine our function and also require the standard Typescript indent
-" function to exist.
-if exists('*GetTypescriptGraphQLIndent') || !exists('*GetTypescriptIndent')
-  finish
-endif
-
-" Set the indentexpr with our own version that will call GetGraphQLIndent when
-" we're inside of a GraphQL string and otherwise defer to GetTypescriptIndent.
-setlocal indentexpr=GetTypescriptGraphQLIndent()
-
-function GetTypescriptGraphQLIndent()
-  let l:stack = map(synstack(v:lnum, 1), "synIDattr(v:val,'name')")
-  if !empty(l:stack) && l:stack[0] ==# 'graphqlTemplateString'
-    return GetGraphQLIndent()
-  endif
-
-  return GetTypescriptIndent()
-endfunction
-
-endif

after/syntax/idris2.vim

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

after/syntax/javascript.vim

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

after/syntax/javascriptreact.vim

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

after/syntax/jsx.vim

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

after/syntax/reason/graphql.vim

@@ -32,6 +32,6 @@ if exists('s:current_syntax')
   let b:current_syntax = s:current_syntax
 endif
 
-syntax region graphqlMultilineString matchgroup=reasonMultilineString start=+graphql\_s*\zs{|+ end=+|}+ contains=@GraphQLSyntax,reasonEscape,reasonEscapeUnicode,reasonEscapeError,reasonStringContinuation keepend
+syntax region graphqlExtensionPoint matchgroup=Noise start=+\[%graphql\_s*{|+lc=10 end=+|}\_s*]+he=s+1 contains=@GraphQLSyntax keepend
 
 endif

after/syntax/yaml.vim

@@ -1,65 +0,0 @@
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
-
-" To make this file do stuff, add something like the following (without the
-" leading ") to your ~/.vimrc:
-" au BufNewFile,BufRead *.yaml,*.yml so ~/src/PyYaml/YAML.vim
-
-" Vim syntax/macro file
-" Language:	YAML
-" Author:	Igor Vergeichik <iverg@mail.ru>
-" Sponsor: Tom Sawyer <transami@transami.net>
-" Stayven: Ryan King <jking@panoptic.com>
-" Copyright (c) 2002 Tom Saywer
-
-" Add an item to a gangly list:
-"map , o<bs><bs><bs><bs>-<esc>o
-" Convert to Canonical form:
-"map \c :%!python -c 'from yaml.redump import redump; import sys; print redump(sys.stdin.read()).rstrip()'
-
-if version < 600
-  syntax clear
-endif
-syntax clear
-
-syn match yamlInline "[\[\]\{\}]"
-syn match yamlBlock "[>|]\d\?[+-]"
-
-syn region yamlComment	start="\#" end="$"
-syn match yamlIndicator	"#YAML:\S\+"
-
-syn region yamlString	start="\(^\|\s\|\[\|\,\|\-\)\@<='" end="'" skip="\\'"
-syn region yamlString	start='"' end='"' skip='\\"' contains=yamlEscape
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\s*\n\+\z(\s\+\)\S/rs=s+1 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+2 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn region yamlString	matchgroup=yamlBlock start=/[>|]\d\(\d\|[+-]\)\s*\n\+\z(\s\+\)\S/rs=s+3 skip=/^\%(\z1\S\|^$\)/ end=/^\z1\@!.*/me=s-1
-syn match  yamlEscape	+\\[abfnrtv'"\\]+ contained
-syn match  yamlEscape	"\\\o\o\=\o\=" contained
-syn match  yamlEscape	"\\x\x\+" contained
-
-syn match  yamlType	"!\S\+"
-
-syn keyword yamlConstant NULL Null null NONE None none NIL Nil nil
-syn keyword yamlConstant TRUE True true YES Yes yes ON On on
-syn keyword yamlConstant FALSE False false NO No no OFF Off off
-
-syn match  yamlKey	"^\s*\zs[^ \t\"\'#]\+\ze\s*:"
- syn match  yamlKey	"^\s*-\s*\zs[^ \t\"\'#]\+\ze\s*:"
-syn match  yamlAnchor	"&\S\+"
-syn match  yamlAlias	"*\S\+"
-
-" Setup the highlighting links
-
-hi link yamlConstant Keyword
-hi link yamlIndicator PreCondit
-hi link yamlAnchor	Function
-hi link yamlAlias	Function
-hi link yamlKey		Identifier
-hi link yamlType	Type
-
-hi link yamlComment	Comment
-hi link yamlInline	Operator
-hi link yamlBlock	Operator
-hi link yamlString	String
-hi link yamlEscape	Special
-
-endif

autoload/cargo/quickfix.vim

@@ -1,7 +1,8 @@
 if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 function! cargo#quickfix#CmdPre() abort
-    if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo'
+    if &filetype ==# 'rust' && get(b:, 'current_compiler', '') ==# 'cargo' &&
+         \ &makeprg =~ '\V\^cargo\ \.\*'
         " Preserve the current directory, and 'lcd' to the nearest Cargo file.
         let b:rust_compiler_cargo_qf_has_lcd = haslocaldir()
         let b:rust_compiler_cargo_qf_prev_cd = getcwd()

autoload/go/config.vim

@@ -552,6 +552,14 @@ function! go#config#GoplsLocal() abort
   return get(g:, 'go_gopls_local', v:null)
 endfunction
 
+function! go#config#GoplsGofumpt() abort
+  return get(g:, 'go_gopls_gofumpt', v:null)
+endfunction
+
+function! go#config#GoplsSettings() abort
+  return get(g:, 'go_gopls_settings', v:null)
+endfunction
+
 function! go#config#GoplsEnabled() abort
   return get(g:, 'go_gopls_enabled', 1)
 endfunction

autoload/polyglot.vim

@@ -21,6 +21,7 @@ let s:interpreters = {
   \ 'escript': 'erlang',
   \ 'fish': 'fish',
   \ 'gnuplot': 'gnuplot',
+  \ 'groovy': 'groovy',
   \ 'runhaskell': 'haskell',
   \ 'chakra': 'javascript',
   \ 'd8': 'javascript',
@@ -154,6 +155,25 @@ func! polyglot#DetectAspFiletype()
   setf aspvbs | return
 endfunc
 
+func! polyglot#DetectHFiletype()
+  for lnum in range(1, min([line("$"), 200]))
+    let line = getline(lnum)
+    if line =~# '^\s*\(@\(interface\|class\|protocol\|property\|end\|synchronised\|selector\|implementation\)\(\<\|\>\)\|#import\s\+.\+\.h[">]\)'
+      if exists("g:c_syntax_for_h")
+        setf objc | return
+      endif
+      setf objcpp | return
+    endif
+  endfor
+  if exists("g:c_syntax_for_h")
+    setf c | return
+  endif
+  if exists("g:ch_syntax_for_h")
+    setf ch | return
+  endif
+  setf cpp | return
+endfunc
+
 func! polyglot#DetectMFiletype()
   let saw_comment = 0
   for lnum in range(1, min([line("$"), 100]))
@@ -212,6 +232,60 @@ func! polyglot#DetectReFiletype()
   endfor
 endfunc
 
+func! polyglot#DetectIdrFiletype()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~# '^\s*--.*[Ii]dris \=1'
+      setf idris | return
+    endif
+    if line =~# '^\s*--.*[Ii]dris \=2'
+      setf idris2 | return
+    endif
+  endfor
+  for lnum in range(1, min([line("$"), 30]))
+    let line = getline(lnum)
+    if line =~# '^pkgs =.*'
+      setf idris | return
+    endif
+    if line =~# '^depends =.*'
+      setf idris2 | return
+    endif
+    if line =~# '^%language \(TypeProviders\|ElabReflection\)'
+      setf idris | return
+    endif
+    if line =~# '^%language PostfixProjections'
+      setf idris2 | return
+    endif
+    if line =~# '^%access .*'
+      setf idris | return
+    endif
+    if exists("g:filetype_idr")
+      exe "setf " . g:filetype_idr | return
+    endif
+  endfor
+  setf idris2 | return
+endfunc
+
+func! polyglot#DetectLidrFiletype()
+  for lnum in range(1, min([line("$"), 200]))
+    let line = getline(lnum)
+    if line =~# '^>\s*--.*[Ii]dris \=1'
+      setf lidris | return
+    endif
+  endfor
+  setf lidris2 | return
+endfunc
+
+func! polyglot#DetectBasFiletype()
+  for lnum in range(1, min([line("$"), 5]))
+    let line = getline(lnum)
+    if line =~? 'VB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)'
+      setf vb | return
+    endif
+  endfor
+  setf basic | return
+endfunc
+
 " Restore 'cpoptions'
 let &cpo = s:cpo_save
 unlet s:cpo_save

autoload/rustfmt.vim

@@ -65,12 +65,12 @@ endfunction
 function! s:RustfmtConfigOptions()
     let l:rustfmt_toml = findfile('rustfmt.toml', expand('%:p:h') . ';')
     if l:rustfmt_toml !=# ''
-        return '--config-path '.fnamemodify(l:rustfmt_toml, ":p")
+        return '--config-path '.shellescape(fnamemodify(l:rustfmt_toml, ":p"))
     endif
 
     let l:_rustfmt_toml = findfile('.rustfmt.toml', expand('%:p:h') . ';')
     if l:_rustfmt_toml !=# ''
-        return '--config-path '.fnamemodify(l:_rustfmt_toml, ":p")
+        return '--config-path '.shellescape(fnamemodify(l:_rustfmt_toml, ":p"))
     endif
 
     " Default to edition 2018 in case no rustfmt.toml was found.

autoload/sleuth.vim

@@ -10,14 +10,14 @@ let s:globs = {
   \ 'abc': '*.abc',
   \ 'abel': '*.abl',
   \ 'acedb': '*.wrm',
-  \ 'ada': '*.adb,*.ads,*.ada,*.gpr',
+  \ 'ada': '*.adb,*.ads,*.ada,*.adc,*.gpr,*.ada_m',
   \ 'ahdl': '*.tdf',
   \ 'aidl': '*.aidl',
   \ 'alsaconf': '',
   \ 'aml': '*.aml',
   \ 'ampl': '*.run',
   \ 'ant': 'build.xml',
-  \ 'apache': '',
+  \ 'apache': 'access.conf*,apache.conf*,apache2.conf*,httpd.conf*,srm.conf*',
   \ 'apiblueprint': '*.apib',
   \ 'applescript': '*.applescript,*.scpt',
   \ 'aptconf': 'apt.conf',
@@ -34,16 +34,17 @@ let s:globs = {
   \ 'autoit': '*.au3',
   \ 'automake': '[Mm]akefile.am,GNUmakefile.am',
   \ 'ave': '*.ave',
-  \ 'awk': '*.awk',
+  \ 'awk': '*.awk,*.gawk',
+  \ 'basic': '*.basic',
   \ 'blade': '*.blade,*.blade.php',
   \ 'brewfile': 'Brewfile',
-  \ 'c': '*.c,*.cats,*.h,*.idc',
+  \ 'c': '*.c,*.cats,*.h,*.idc,*.qc',
   \ 'caddyfile': 'Caddyfile',
   \ 'carp': '*.carp',
   \ 'clojure': '*.clj,*.boot,*.cl2,*.cljc,*.cljs,*.cljs.hl,*.cljscm,*.cljx,*.hic,*.edn,riemann.config,build.boot,profile.boot',
   \ 'cmake': '*.cmake,*.cmake.in,CMakeLists.txt',
   \ 'coffee': '*.coffee,*._coffee,*.cake,*.cjsx,*.iced,*.coffeekup,Cakefile',
-  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp',
+  \ 'cpp': '*.cpp,*.c++,*.cc,*.cp,*.cxx,*.h,*.h++,*.hh,*.hpp,*.hxx,*.inc,*.inl,*.ipp,*.tcc,*.tpp,*.moc,*.tlh',
   \ 'cql': '*.cql',
   \ 'cryptol': '*.cry,*.cyl,*.lcry,*.lcyl',
   \ 'crystal': '*.cr,Projectfile',
@@ -51,7 +52,7 @@ let s:globs = {
   \ 'cucumber': '*.feature,*.story',
   \ 'cuesheet': '*.cue',
   \ 'd': '*.d,*.di',
-  \ 'dart': '*.dart',
+  \ 'dart': '*.dart,*.drt',
   \ 'dcov': '*.lst',
   \ 'dd': '*.dd',
   \ 'ddoc': '*.ddoc',
@@ -77,18 +78,18 @@ let s:globs = {
   \ 'forth': '*.fs,*.ft,*.fth',
   \ 'fsharp': '*.fs,*.fsi,*.fsx',
   \ 'gdscript3': '*.gd',
-  \ 'gitcommit': '',
+  \ 'gitcommit': 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG',
   \ 'gitconfig': '*.gitconfig',
   \ 'gitrebase': 'git-rebase-todo',
   \ 'gitsendemail': '',
   \ 'glsl': '*.glsl,*.fp,*.frag,*.frg,*.fs,*.fsh,*.fshader,*.geo,*.geom,*.glslf,*.glslv,*.gs,*.gshader,*.shader,*.tesc,*.tese,*.vert,*.vrx,*.vsh,*.vshader,*.comp',
   \ 'gmpl': '*.mod',
-  \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt',
+  \ 'gnuplot': '*.gp,*.gnu,*.gnuplot,*.p,*.plot,*.plt,*.gpi',
   \ 'go': '*.go',
   \ 'gohtmltmpl': '*.tmpl',
   \ 'gomod': 'go.mod',
   \ 'graphql': '*.graphql,*.gql,*.graphqls',
-  \ 'groovy': '*.gradle',
+  \ 'groovy': '*.groovy,*.grt,*.gtpl,*.gvy,*.gradle,Jenkinsfile',
   \ 'grub': '',
   \ 'haml': '*.haml,*.haml.deface,*.hamlc,*.hamlbars',
   \ 'haproxy': '*.cfg,haproxy.cfg,haproxy*.c*',
@@ -103,6 +104,7 @@ let s:globs = {
   \ 'i3config': '*.i3.config,*.i3config,i3.config,i3config',
   \ 'icalendar': '*.ics',
   \ 'idris': '*.idr,*.lidr,idris-response',
+  \ 'idris2': '*.idr,*.ipkg,idris-response',
   \ 'ion': '*.ion',
   \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
@@ -116,6 +118,7 @@ let s:globs = {
   \ 'kotlin': '*.kt,*.ktm,*.kts',
   \ 'ledger': '*.ldg,*.ledger,*.journal',
   \ 'less': '*.less',
+  \ 'lidris2': '*.lidr',
   \ 'lilypond': '*.ly,*.ily',
   \ 'litcoffee': '*.litcoffee,*.coffee.md',
   \ 'livescript': '*.ls,*._ls,Slakefile',
@@ -198,6 +201,7 @@ let s:globs = {
   \ 'unison': '*.u,*.uu',
   \ 'v': '*.v',
   \ 'vala': '*.vala,*.vapi,*.valadoc',
+  \ 'vb': '*.bas,*.cls,*.frm,*.frx,*.vba,*.vbs,*.dsm,*.ctl,*.sba',
   \ 'vbnet': '*.vb,*.vbhtml',
   \ 'vcl': '*.vcl',
   \ 'velocity': '*.vm',

doc/graphql.txt

@@ -46,8 +46,7 @@ the list of recognized template tag names.
 REASONML                                                    *graphql-reasonml*
 
 GraphQL syntax support inside of ReasonML template strings using graphql-ppx
-is available when vim-reasonml (https://github.com/jordwalke/vim-reasonml) is
-also installed.
+is available.
 
 ------------------------------------------------------------------------------
 vim:tw=78:ft=help:norl:

doc/vim-go.txt

@@ -802,7 +802,7 @@ CTRL-t
     You can define a constant value instead of the default field based value.
     For example the following command will add ``valid:"1"`` to all fields.
 >
-      :GoAddTags valid=1
+      :GoAddTags valid:1
 <
                                                                *:GoRemoveTags*
 :[range]GoRemoveTags [key],[option] [key1],[option1] ...
@@ -1876,6 +1876,24 @@ is `v:null`.
   let g:go_gopls_local = v:null
 <
 
+                                                       *'g:go_gopls_gofumpt'*
+
+Specifies whether `gopls` should use `gofumpt` for formatting. When it is
+`v:null`, `gopls`' default will be used.  By default it is `v:null`.
+>
+  let g:go_gopls_gofumpt = v:null
+<
+
+                                                      *'g:go_gopls_settings'*
+
+Specifies `gopls` workspace settings for `gopls` that are not yet officially
+supported by vim-go. Any value in the dictionary will be overridden by values
+provided in the specific options supported by vim-go (e.g.
+g:go_gopls_staticcheck) or settings statically configured by vim-go to ensure
+expected behavior. By default it is `v:null`.
+>
+  let g:go_gopls_settings = v:null
+<
                                                  *'g:go_diagnostics_enabled'*
 
 Specifies whether `gopls` diagnostics are enabled. Only the diagnostics for

doc/vim-jsx-pretty-doc.txt

@@ -46,6 +46,7 @@ CONFIG                                                  *vim-jsx-pretty-config*
   |---------------------------------------|---------|----------------------|
   | g:vim_jsx_pretty_enable_jsx_highlight |    1    | jsx highlight flag   |
   | g:vim_jsx_pretty_colorful_config      |    0    | colorful config flag |
+  | g:vim_jsx_pretty_disable_js           |    0    | js toggle flag       |
 <
 
 - *g:vim_jsx_pretty_enable_jsx_highlight*

ftdetect/polyglot.vim

@@ -13,6 +13,8 @@ if exists('g:polyglot_disabled')
   for pkg in g:polyglot_disabled
     let s:disabled_packages[pkg] = 1
   endfor
+else
+  let g:polyglot_disabled_not_set = 1
 endif
 
 function! s:SetDefault(name, value)
@@ -60,6 +62,17 @@ if !exists('g:python_highlight_all')
   call s:SetDefault('g:python_slow_sync', 1)
 endif
 
+
+" Function used for patterns that end in a star: don't set the filetype if the
+" file name matches ft_ignore_pat.
+" When using this, the entry should probably be further down below with the
+" other StarSetf() calls.
+func! s:StarSetf(ft)
+  if expand("<amatch>") !~ g:ft_ignore_pat
+    exe 'setf ' . a:ft
+  endif
+endfunc
+
 " filetypes
 
 if !has_key(s:disabled_packages, '8th')
@@ -123,7 +136,7 @@ if !has_key(s:disabled_packages, 'awk')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au! BufRead,BufNewFile *.c,*.cpp,*.tpp
+  au! BufRead,BufNewFile *.cpp,*.tpp,*.c
 endif
 
 if !has_key(s:disabled_packages, 'cmake')
@@ -158,6 +171,10 @@ if !has_key(s:disabled_packages, 'go')
   au! BufRead,BufNewFile *.go
 endif
 
+if !has_key(s:disabled_packages, 'groovy')
+  au! BufRead,BufNewFile *.groovy
+endif
+
 if !has_key(s:disabled_packages, 'haml')
   au! BufRead,BufNewFile *.haml
 endif
@@ -332,7 +349,9 @@ endif
 
 if !has_key(s:disabled_packages, 'ada')
   au BufNewFile,BufRead *.ada setf ada
+  au BufNewFile,BufRead *.ada_m setf ada
   au BufNewFile,BufRead *.adb setf ada
+  au BufNewFile,BufRead *.adc setf ada
   au BufNewFile,BufRead *.ads setf ada
   au BufNewFile,BufRead *.gpr setf ada
 endif
@@ -364,9 +383,19 @@ if !has_key(s:disabled_packages, 'ant')
 endif
 
 if !has_key(s:disabled_packages, 'apache')
+  au BufNewFile,BufRead */etc/apache2/*.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/conf.*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/mods-*/* call s:StarSetf('apache')
+  au BufNewFile,BufRead */etc/apache2/sites-*/* call s:StarSetf('apache')
   au BufNewFile,BufRead */etc/apache2/sites-*/*.com setf apache
   au BufNewFile,BufRead */etc/httpd/*.conf setf apache
+  au BufNewFile,BufRead */etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
   au BufNewFile,BufRead {.,}htaccess setf apache
+  au BufNewFile,BufRead access.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead apache2.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead httpd.conf* call s:StarSetf('apache')
+  au BufNewFile,BufRead srm.conf* call s:StarSetf('apache')
 endif
 
 if !has_key(s:disabled_packages, 'apiblueprint')
@@ -381,7 +410,7 @@ endif
 if !has_key(s:disabled_packages, 'aptconf')
   au BufNewFile,BufRead */.aptitude/config setf aptconf
   au BufNewFile,BufRead */etc/apt/apt.conf.d/*.conf setf aptconf
-  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* setf aptconf
+  au BufNewFile,BufRead */etc/apt/apt.conf.d/[^.]* call s:StarSetf('aptconf')
   au BufNewFile,BufRead apt.conf setf aptconf
 endif
 
@@ -444,6 +473,7 @@ endif
 
 if !has_key(s:disabled_packages, 'awk')
   au BufNewFile,BufRead *.awk setf awk
+  au BufNewFile,BufRead *.gawk setf awk
 endif
 
 if !has_key(s:disabled_packages, 'reason')
@@ -452,16 +482,11 @@ if !has_key(s:disabled_packages, 'reason')
 endif
 
 if !has_key(s:disabled_packages, 'c/c++')
-  au BufNewFile,BufRead *.c setf c
-  au BufNewFile,BufRead *.cats setf c
-  au BufNewFile,BufRead *.h setf c
-  au BufNewFile,BufRead *.idc setf c
   au BufNewFile,BufRead *.c++ setf cpp
   au BufNewFile,BufRead *.cc setf cpp
   au BufNewFile,BufRead *.cp setf cpp
   au BufNewFile,BufRead *.cpp setf cpp
   au BufNewFile,BufRead *.cxx setf cpp
-  au BufNewFile,BufRead *.h setf cpp
   au BufNewFile,BufRead *.h++ setf cpp
   au BufNewFile,BufRead *.hh setf cpp
   au BufNewFile,BufRead *.hpp setf cpp
@@ -469,8 +494,16 @@ if !has_key(s:disabled_packages, 'c/c++')
   au BufNewFile,BufRead *.inc setf cpp
   au BufNewFile,BufRead *.inl setf cpp
   au BufNewFile,BufRead *.ipp setf cpp
+  au BufNewFile,BufRead *.moc setf cpp
   au BufNewFile,BufRead *.tcc setf cpp
+  au BufNewFile,BufRead *.tlh setf cpp
   au BufNewFile,BufRead *.tpp setf cpp
+  au BufNewFile,BufRead *.c setf c
+  au BufNewFile,BufRead *.cats setf c
+  au BufNewFile,BufRead *.idc setf c
+  au BufNewFile,BufRead *.qc setf c
+  au BufNewFile,BufRead *enlightenment/*.cfg setf c
+  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'caddyfile')
@@ -515,9 +548,6 @@ if !has_key(s:disabled_packages, 'coffee-script')
   au BufNewFile,BufRead *.litcoffee setf litcoffee
 endif
 
-if !has_key(s:disabled_packages, 'cjsx')
-endif
-
 if !has_key(s:disabled_packages, 'cryptol')
   au BufNewFile,BufRead *.cry setf cryptol
   au BufNewFile,BufRead *.cyl setf cryptol
@@ -548,6 +578,7 @@ endif
 
 if !has_key(s:disabled_packages, 'dart')
   au BufNewFile,BufRead *.dart setf dart
+  au BufNewFile,BufRead *.drt setf dart
 endif
 
 if !has_key(s:disabled_packages, 'dhall')
@@ -574,7 +605,7 @@ if !has_key(s:disabled_packages, 'dockerfile')
   au BufNewFile,BufRead *.dock setf Dockerfile
   au BufNewFile,BufRead *.dockerfile setf Dockerfile
   au BufNewFile,BufRead Dockerfile setf Dockerfile
-  au BufNewFile,BufRead Dockerfile* setf Dockerfile
+  au BufNewFile,BufRead Dockerfile* call s:StarSetf('Dockerfile')
   au BufNewFile,BufRead dockerfile setf Dockerfile
   au BufNewFile,BufRead docker-compose*.yaml setf yaml.docker-compose
   au BufNewFile,BufRead docker-compose*.yml setf yaml.docker-compose
@@ -658,13 +689,15 @@ endif
 if !has_key(s:disabled_packages, 'git')
   au BufNewFile,BufRead *.gitconfig setf gitconfig
   au BufNewFile,BufRead *.git/config setf gitconfig
-  au BufNewFile,BufRead *.git/modules/**/config setf gitconfig
+  au BufNewFile,BufRead *.git/modules/*/config setf gitconfig
   au BufNewFile,BufRead */.config/git/config setf gitconfig
+  au BufNewFile,BufRead */git/config setf gitconfig
+  au BufNewFile,BufRead */{.,}gitconfig.d/* call s:StarSetf('gitconfig')
   au BufNewFile,BufRead {.,}gitconfig setf gitconfig
   au BufNewFile,BufRead {.,}gitmodules setf gitconfig
   au BufNewFile,BufRead git-rebase-todo setf gitrebase
-  au BufNewFile,BufRead {.,}gitsendemail.* setf gitsendemail
-  au BufNewFile,BufRead *.git/{,modules/**/,worktrees/*/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG setf gitcommit
+  au BufNewFile,BufRead {.,}gitsendemail.* call s:StarSetf('gitsendemail')
+  au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 endif
 
 if !has_key(s:disabled_packages, 'glsl')
@@ -699,6 +732,7 @@ if !has_key(s:disabled_packages, 'gnuplot')
   au BufNewFile,BufRead *.gnu setf gnuplot
   au BufNewFile,BufRead *.gnuplot setf gnuplot
   au BufNewFile,BufRead *.gp setf gnuplot
+  au BufNewFile,BufRead *.gpi setf gnuplot
   au BufNewFile,BufRead *.p setf gnuplot
   au BufNewFile,BufRead *.plot setf gnuplot
   au BufNewFile,BufRead *.plt setf gnuplot
@@ -716,8 +750,13 @@ if !has_key(s:disabled_packages, 'graphql')
   au BufNewFile,BufRead *.graphqls setf graphql
 endif
 
-if !has_key(s:disabled_packages, 'gradle')
+if !has_key(s:disabled_packages, 'groovy')
   au BufNewFile,BufRead *.gradle setf groovy
+  au BufNewFile,BufRead *.groovy setf groovy
+  au BufNewFile,BufRead *.grt setf groovy
+  au BufNewFile,BufRead *.gtpl setf groovy
+  au BufNewFile,BufRead *.gvy setf groovy
+  au BufNewFile,BufRead Jenkinsfile setf groovy
 endif
 
 if !has_key(s:disabled_packages, 'haml')
@@ -741,7 +780,7 @@ endif
 
 if !has_key(s:disabled_packages, 'haproxy')
   au BufNewFile,BufRead *.cfg setf haproxy
-  au BufNewFile,BufRead haproxy*.c* setf haproxy
+  au BufNewFile,BufRead haproxy*.c* call s:StarSetf('haproxy')
   au BufNewFile,BufRead haproxy.cfg setf haproxy
 endif
 
@@ -795,9 +834,16 @@ if !has_key(s:disabled_packages, 'icalendar')
 endif
 
 if !has_key(s:disabled_packages, 'idris')
-  au BufNewFile,BufRead *.idr setf idris
-  au BufNewFile,BufRead *.lidr setf idris
   au BufNewFile,BufRead idris-response setf idris
+  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
+endif
+
+if !has_key(s:disabled_packages, 'idris2')
+  au BufNewFile,BufRead *.ipkg setf idris2
+  au BufNewFile,BufRead idris-response setf idris2
+  au! BufNewFile,BufRead *.idr call polyglot#DetectIdrFiletype()
+  au! BufNewFile,BufRead *.lidr call polyglot#DetectLidrFiletype()
 endif
 
 if !has_key(s:disabled_packages, 'ion')
@@ -805,7 +851,8 @@ if !has_key(s:disabled_packages, 'ion')
   au BufNewFile,BufRead ~/.config/ion/initrc setf ion
 endif
 
-if !has_key(s:disabled_packages, 'javascript-sql')
+if !has_key(s:disabled_packages, 'jsx')
+  au BufNewFile,BufRead *.jsx setf javascriptreact
 endif
 
 if !has_key(s:disabled_packages, 'javascript')
@@ -838,7 +885,7 @@ if !has_key(s:disabled_packages, 'jenkins')
   au BufNewFile,BufRead *.Jenkinsfile setf Jenkinsfile
   au BufNewFile,BufRead *.jenkinsfile setf Jenkinsfile
   au BufNewFile,BufRead Jenkinsfile setf Jenkinsfile
-  au BufNewFile,BufRead Jenkinsfile* setf Jenkinsfile
+  au BufNewFile,BufRead Jenkinsfile* call s:StarSetf('Jenkinsfile')
 endif
 
 if !has_key(s:disabled_packages, 'jinja')
@@ -850,6 +897,7 @@ endif
 if !has_key(s:disabled_packages, 'jq')
   au BufNewFile,BufRead *.jq setf jq
   au BufNewFile,BufRead {.,}jqrc setf jq
+  au BufNewFile,BufRead {.,}jqrc* call s:StarSetf('jq')
 endif
 
 if !has_key(s:disabled_packages, 'json5')
@@ -895,10 +943,6 @@ if !has_key(s:disabled_packages, 'jst')
   au BufNewFile,BufRead *.jst setf jst
 endif
 
-if !has_key(s:disabled_packages, 'jsx')
-  au BufNewFile,BufRead *.jsx setf javascriptreact
-endif
-
 if !has_key(s:disabled_packages, 'julia')
   au BufNewFile,BufRead *.jl setf julia
 endif
@@ -1021,9 +1065,9 @@ if !has_key(s:disabled_packages, 'nginx')
   au BufNewFile,BufRead *.nginx setf nginx
   au BufNewFile,BufRead *.nginxconf setf nginx
   au BufNewFile,BufRead *.vhost setf nginx
-  au BufNewFile,BufRead */etc/nginx/* setf nginx
+  au BufNewFile,BufRead */etc/nginx/* call s:StarSetf('nginx')
   au BufNewFile,BufRead */nginx/*.conf setf nginx
-  au BufNewFile,BufRead */usr/local/nginx/conf/* setf nginx
+  au BufNewFile,BufRead */usr/local/nginx/conf/* call s:StarSetf('nginx')
   au BufNewFile,BufRead *nginx.conf setf nginx
   au BufNewFile,BufRead nginx*.conf setf nginx
   au BufNewFile,BufRead nginx.conf setf nginx
@@ -1043,7 +1087,7 @@ if !has_key(s:disabled_packages, 'nix')
 endif
 
 if !has_key(s:disabled_packages, 'objc')
-  au BufNewFile,BufRead *.h setf objc
+  au! BufNewFile,BufRead *.h call polyglot#DetectHFiletype()
   au! BufNewFile,BufRead *.m call polyglot#DetectMFiletype()
 endif
 
@@ -1197,12 +1241,6 @@ if !has_key(s:disabled_packages, 'python')
   au BufNewFile,BufRead wscript setf python
 endif
 
-if !has_key(s:disabled_packages, 'python-indent')
-endif
-
-if !has_key(s:disabled_packages, 'python-compiler')
-endif
-
 if !has_key(s:disabled_packages, 'requirements')
   au BufNewFile,BufRead *.pip setf requirements
   au BufNewFile,BufRead *require.{txt,in} setf requirements
@@ -1333,7 +1371,7 @@ if !has_key(s:disabled_packages, 'ruby')
   au BufNewFile,BufRead Snapfile setf ruby
   au BufNewFile,BufRead Thorfile setf ruby
   au BufNewFile,BufRead Vagrantfile setf ruby
-  au BufNewFile,BufRead [Rr]akefile* setf ruby
+  au BufNewFile,BufRead [Rr]akefile* call s:StarSetf('ruby')
   au BufNewFile,BufRead buildfile setf ruby
   au BufNewFile,BufRead vagrantfile setf ruby
   au BufNewFile,BufRead *.erb setf eruby
@@ -1345,9 +1383,6 @@ if !has_key(s:disabled_packages, 'rspec')
   au BufNewFile,BufRead *_spec.rb if !did_filetype() | set ft=ruby syntax=rspec | endif
 endif
 
-if !has_key(s:disabled_packages, 'yard')
-endif
-
 if !has_key(s:disabled_packages, 'brewfile')
   au BufNewFile,BufRead Brewfile setf brewfile
 endif
@@ -1413,9 +1448,6 @@ if !has_key(s:disabled_packages, 'sh')
   au BufNewFile,BufRead {.,}zshrc setf zsh
 endif
 
-if !has_key(s:disabled_packages, 'zinit')
-endif
-
 if !has_key(s:disabled_packages, 'slim')
   au BufNewFile,BufRead *.slim setf slim
 endif
@@ -1446,9 +1478,6 @@ if !has_key(s:disabled_packages, 'svg')
   au BufNewFile,BufRead *.svg setf svg
 endif
 
-if !has_key(s:disabled_packages, 'svg-indent')
-endif
-
 if !has_key(s:disabled_packages, 'swift')
   au BufNewFile,BufRead *.swift setf swift
 endif
@@ -1671,9 +1700,9 @@ if !has_key(s:disabled_packages, 'xsl')
 endif
 
 if !has_key(s:disabled_packages, 'ansible')
-  au BufNewFile,BufRead group_vars/* setf yaml.ansible
+  au BufNewFile,BufRead group_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead handlers.*.y{a,}ml setf yaml.ansible
-  au BufNewFile,BufRead host_vars/* setf yaml.ansible
+  au BufNewFile,BufRead host_vars/* call s:StarSetf('yaml.ansible')
   au BufNewFile,BufRead local.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead main.y{a,}ml setf yaml.ansible
   au BufNewFile,BufRead playbook.y{a,}ml setf yaml.ansible
@@ -1726,13 +1755,223 @@ if !has_key(s:disabled_packages, 'trasys')
   au! BufNewFile,BufRead *.inp call polyglot#DetectInpFiletype()
 endif
 
+if !has_key(s:disabled_packages, 'basic')
+  au BufNewFile,BufRead *.basic setf basic
+endif
+
+if !has_key(s:disabled_packages, 'visual-basic')
+  au BufNewFile,BufRead *.cls setf vb
+  au BufNewFile,BufRead *.ctl setf vb
+  au BufNewFile,BufRead *.dsm setf vb
+  au BufNewFile,BufRead *.frm setf vb
+  au BufNewFile,BufRead *.frx setf vb
+  au BufNewFile,BufRead *.sba setf vb
+  au BufNewFile,BufRead *.vba setf vb
+  au BufNewFile,BufRead *.vbs setf vb
+  au! BufNewFile,BufRead *.bas call polyglot#DetectBasFiletype()
+endif
+
 
 " end filetypes
 
 au BufNewFile,BufRead,StdinReadPost * 
-  \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat 
+  \ if !did_filetype() && expand("<afile>") !~ g:ft_ignore_pat 
   \ | call polyglot#Heuristics() | endif
 
+
+if !has_key(s:disabled_packages, 'autoindent')
+  " Code below re-implements sleuth for vim-polyglot
+  let g:loaded_sleuth = 1
+  let g:loaded_foobar = 1
+
+  " Makes shiftwidth to be synchronized with tabstop by default
+  if &shiftwidth == &tabstop
+    let &shiftwidth = 0
+  endif
+
+  function! s:guess(lines) abort
+    let options = {}
+    let ccomment = 0
+    let podcomment = 0
+    let triplequote = 0
+    let backtick = 0
+    let xmlcomment = 0
+    let heredoc = ''
+    let minindent = 10
+    let spaces_minus_tabs = 0
+    let i = 0
+
+    for line in a:lines
+      let i += 1
+
+      if !len(line) || line =~# '^\W*$'
+        continue
+      endif
+
+      if line =~# '^\s*/\*'
+        let ccomment = 1
+      endif
+      if ccomment
+        if line =~# '\*/'
+          let ccomment = 0
+        endif
+        continue
+      endif
+
+      if line =~# '^=\w'
+        let podcomment = 1
+      endif
+      if podcomment
+        if line =~# '^=\%(end\|cut\)\>'
+          let podcomment = 0
+        endif
+        continue
+      endif
+
+      if triplequote
+        if line =~# '^[^"]*"""[^"]*$'
+          let triplequote = 0
+        endif
+        continue
+      elseif line =~# '^[^"]*"""[^"]*$'
+        let triplequote = 1
+      endif
+
+      if backtick
+        if line =~# '^[^`]*`[^`]*$'
+          let backtick = 0
+        endif
+        continue
+      elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
+        let backtick = 1
+      endif
+
+      if line =~# '^\s*<\!--'
+        let xmlcomment = 1
+      endif
+      if xmlcomment
+        if line =~# '-->'
+          let xmlcomment = 0
+        endif
+        continue
+      endif
+
+      " This is correct order because both "<<EOF" and "EOF" matches end
+      if heredoc != ''
+        if line =~# heredoc
+          let heredoc = ''
+        endif
+        continue
+      endif
+      let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
+      if len(herematch) > 0
+        let heredoc = herematch[1] . '$'
+      endif
+
+      let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
+
+      if line[0] == "\t"
+        setlocal noexpandtab
+        let &shiftwidth=&tabstop
+        let b:sleuth_culprit .= ':' . i
+        return 1
+      elseif line[0] == " "
+        let indent = len(matchstr(line, '^ *'))
+        if (indent % 2 == 0 || indent % 3 == 0) && indent < minindent
+          let minindent = indent
+        endif
+      endif
+    endfor
+
+    if minindent < 10
+      setlocal expandtab
+      let &shiftwidth=minindent
+      let b:sleuth_culprit .= ':' . i
+      return 1
+    endif
+
+    return 0
+  endfunction
+
+  function! s:detect_indent() abort
+    if &buftype ==# 'help'
+      return
+    endif
+
+    let b:sleuth_culprit = expand("<afile>:p")
+    if s:guess(getline(1, 32))
+      return
+    endif
+    let pattern = sleuth#GlobForFiletype(&filetype)
+    if len(pattern) == 0
+      return
+    endif
+    let pattern = '{' . pattern . ',.git,.svn,.hg}'
+    let dir = expand('%:p:h')
+    let level = 3
+    while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
+      " Ignore files from homedir and root 
+      if dir == expand('~') || dir == '/'
+        unlet b:sleuth_culprit
+        return
+      endif
+      for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
+        let b:sleuth_culprit = neighbor
+        " Do not consider directories above .git, .svn or .hg
+        if fnamemodify(neighbor, ":h:t")[0] == "."
+          let level = 0
+          continue
+        endif
+        if neighbor !=# expand('%:p') && filereadable(neighbor)
+          if s:guess(readfile(neighbor, '', 32))
+            return
+          endif
+        endif
+      endfor
+
+      let dir = fnamemodify(dir, ':h')
+      let level -= 1
+    endwhile
+
+    unlet b:sleuth_culprit
+  endfunction
+
+  setglobal smarttab
+
+  function! SleuthIndicator() abort
+    let sw = &shiftwidth ? &shiftwidth : &tabstop
+    if &expandtab
+      return 'sw='.sw
+    elseif &tabstop == sw
+      return 'ts='.&tabstop
+    else
+      return 'sw='.sw.',ts='.&tabstop
+    endif
+  endfunction
+
+  augroup polyglot
+    autocmd!
+    autocmd FileType * call s:detect_indent()
+    autocmd User Flags call Hoist('buffer', 5, 'SleuthIndicator')
+  augroup END
+
+  command! -bar -bang Sleuth call s:detect_indent()
+endif
+
+func! s:verify()
+  if exists("g:polyglot_disabled_not_set")
+    if exists("g:polyglot_disabled")
+      echohl WarningMsg
+      echo "vim-polyglot: g:polyglot_disabled should be at the top of .vimrc"
+      echohl None
+    endif
+
+    unlet g:polyglot_disabled_not_set
+  endif
+endfunc
+
+autocmd VimEnter * call s:verify()
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

ftplugin/groovy.vim

@@ -0,0 +1,23 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
+
+" Vim filetype plugin file
+" Language:	groovy
+" Maintainer:	Justin M. Keyes <justinkz@gmail.com>
+" Last Change:	2016 May 22
+
+if exists('b:did_ftplugin')
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo-=C
+
+let b:undo_ftplugin = 'setlocal commentstring<'
+
+setlocal commentstring=//%s
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif

ftplugin/idris2.vim

@@ -0,0 +1,334 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+if bufname('%') == "idris-response"
+  finish
+endif
+
+if exists("b:did_ftplugin")
+  finish
+endif
+
+setlocal shiftwidth=2
+setlocal tabstop=2
+if !exists("g:idris_allow_tabchar") || g:idris_allow_tabchar == 0
+	setlocal expandtab
+endif
+setlocal comments=s1:{-,mb:-,ex:-},:\|\|\|,:--
+setlocal commentstring=--%s
+setlocal iskeyword+=?
+setlocal wildignore+=*.ibc
+
+let idris_response = 0
+let b:did_ftplugin = 1
+
+" Text near cursor position that needs to be passed to a command.
+" Refinment of `expand(<cword>)` to accomodate differences between
+" a (n)vim word and what Idris requires.
+function! s:currentQueryObject()
+  let word = expand("<cword>")
+  if word =~ '^?'
+    " Cut off '?' that introduces a hole identifier.
+    let word = strpart(word, 1)
+  endif
+  return word
+endfunction
+
+function! s:IdrisCommand(...)
+  let idriscmd = shellescape(join(a:000))
+"  echo("idris2 " . expand ('%:p') . " --client " . idriscmd)
+  return system("idris2 --find-ipkg " . shellescape(expand('%:p')) . " --client " . idriscmd)
+endfunction
+
+function! IdrisDocFold(lineNum)
+  let line = getline(a:lineNum)
+
+  if line =~ "^\s*|||"
+    return "1"
+  endif
+
+  return "0"
+endfunction
+
+function! IdrisFold(lineNum)
+  return IdrisDocFold(a:lineNum)
+endfunction
+
+setlocal foldmethod=expr
+setlocal foldexpr=IdrisFold(v:lnum)
+
+function! IdrisResponseWin()
+  if (!bufexists("idris-response"))
+    botright 10split
+    badd idris-response
+    b idris-response
+    let g:idris_respwin = "active"
+    set buftype=nofile
+    wincmd k
+  elseif (bufexists("idris-response") && g:idris_respwin == "hidden")
+    botright 10split
+    b idris-response
+    let g:idris_respwin = "active"
+    wincmd k
+  endif
+endfunction
+
+function! IdrisHideResponseWin()
+  let g:idris_respwin = "hidden"
+endfunction
+
+function! IdrisShowResponseWin()
+  let g:idris_respwin = "active"
+endfunction
+
+function! IWrite(str)
+  if (bufexists("idris-response"))
+    let save_cursor = getcurpos()
+    b idris-response
+    %delete
+    let resp = split(a:str, '\n')
+    call append(1, resp)
+    b #
+    call setpos('.', save_cursor)
+  else
+    echo a:str
+  endif
+endfunction
+
+function! IdrisReload(q)
+  w
+  let file = expand('%:p')
+  let tc = system("idris2 --find-ipkg " . shellescape(file) . " --client ''")
+  if (! (tc is ""))
+    call IWrite(tc)
+  else
+    if (a:q==0)
+       call IWrite("Successfully reloaded " . file)
+    endif
+  endif
+  return tc
+endfunction
+
+function! IdrisReloadToLine(cline)
+  return IdrisReload(1)
+  "w
+  "let file = expand("%:p")
+  "let tc = s:IdrisCommand(":lto", a:cline, file)
+  "if (! (tc is ""))
+  "  call IWrite(tc)
+  "endif
+  "return tc
+endfunction
+
+function! IdrisShowType()
+  w
+  let word = s:currentQueryObject()
+  let cline = line(".")
+  let ccol = col(".")
+    let ty = s:IdrisCommand(":t", word)
+    call IWrite(ty)
+endfunction
+
+function! IdrisShowDoc()
+  w
+  let word = expand("<cword>")
+  let ty = s:IdrisCommand(":doc", word)
+  call IWrite(ty)
+endfunction
+
+function! IdrisProofSearch(hint)
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  if (a:hint==0)
+     let hints = ""
+  else
+     let hints = input ("Hints: ")
+  endif
+
+  let result = s:IdrisCommand(":ps!", cline, word, hints)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisGenerateDef()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  let result = s:IdrisCommand(":gd!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisMakeLemma()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  let result = s:IdrisCommand(":ml!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search(word, "b")
+  endif
+endfunction
+
+function! IdrisRefine()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = expand("<cword>")
+  let name = input ("Name: ")
+
+  let result = s:IdrisCommand(":ref!", cline, word, name)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisAddMissing()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = expand("<cword>")
+
+  let result = s:IdrisCommand(":am!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+  endif
+endfunction
+
+function! IdrisCaseSplit()
+  w
+  let view = winsaveview()
+  let cline = line(".")
+  let ccol = col(".")
+  let word = expand("<cword>")
+  let result = s:IdrisCommand(":cs!", cline, ccol, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+     e
+     call winrestview(view)
+  endif
+endfunction
+
+function! IdrisMakeWith()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+  let tc = IdrisReload(1)
+
+  let result = s:IdrisCommand(":mw!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search("_")
+  endif
+endfunction
+
+function! IdrisMakeCase()
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = s:currentQueryObject()
+
+  let result = s:IdrisCommand(":mc!", cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search("_")
+  endif
+endfunction
+
+function! IdrisAddClause(proof)
+  let view = winsaveview()
+  w
+  let cline = line(".")
+  let word = expand("<cword>")
+
+  if (a:proof==0)
+    let fn = ":ac!"
+  else
+    let fn = ":apc!"
+  endif
+
+  let result = s:IdrisCommand(fn, cline, word)
+  if (! (result is ""))
+     call IWrite(result)
+  else
+    e
+    call winrestview(view)
+    call search(word)
+
+  endif
+endfunction
+
+function! IdrisEval()
+  w
+  let expr = input ("Expression: ")
+  let result = s:IdrisCommand(expr)
+  call IWrite(" = " . result)
+endfunction
+
+nnoremap <buffer> <silent> <LocalLeader>t :call IdrisShowType()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>r :call IdrisReload(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>c :call IdrisCaseSplit()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>a 0:call search(":")<ENTER>b:call IdrisAddClause(0)<ENTER>w
+nnoremap <buffer> <silent> <LocalLeader>d 0:call search(":")<ENTER>b:call IdrisAddClause(0)<ENTER>w
+nnoremap <buffer> <silent> <LocalLeader>b 0:call IdrisAddClause(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>m :call IdrisAddMissing()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>md 0:call search(":")<ENTER>b:call IdrisAddClause(1)<ENTER>w
+nnoremap <buffer> <silent> <LocalLeader>f :call IdrisRefine()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>o :call IdrisProofSearch(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>s :call IdrisProofSearch(0)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>g :call IdrisGenerateDef()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>p :call IdrisProofSearch(1)<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>l :call IdrisMakeLemma()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>e :call IdrisEval()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>w 0:call IdrisMakeWith()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>mc :call IdrisMakeCase()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>i 0:call IdrisResponseWin()<ENTER>
+nnoremap <buffer> <silent> <LocalLeader>h :call IdrisShowDoc()<ENTER>
+
+menu Idris.Reload <LocalLeader>r
+menu Idris.Show\ Type <LocalLeader>t
+menu Idris.Evaluate <LocalLeader>e
+menu Idris.-SEP0- :
+menu Idris.Add\ Clause <LocalLeader>a
+menu Idris.Generate\ Definition <LocalLeader>g
+menu Idris.Add\ with <LocalLeader>w
+menu Idris.Case\ Split <LocalLeader>c
+menu Idris.Add\ missing\ cases <LocalLeader>m
+menu Idris.Proof\ Search <LocalLeader>s
+menu Idris.Proof\ Search\ with\ hints <LocalLeader>p
+
+au BufHidden idris-response call IdrisHideResponseWin()
+au BufEnter idris-response call IdrisShowResponseWin()
+
+endif

ftplugin/vb.vim

@@ -0,0 +1,49 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
+
+" Vim filetype plugin file
+" Language:	VisualBasic (ft=vb)
+" Maintainer:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Thu, 22 Nov 2001 12:56:14 W. Europe Standard Time
+
+if exists("b:did_ftplugin") | finish | endif
+let b:did_ftplugin = 1
+
+setlocal com=sr:'\ -,mb:'\ \ ,el:'\ \ ,:'
+
+" we need this wrapper, as call doesn't allow a count
+fun! <SID>VbSearch(pattern, flags)
+    let cnt = v:count1
+    while cnt > 0
+	call search(a:pattern, a:flags)
+	let cnt = cnt - 1
+    endwhile
+endfun
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" NOTE the double escaping \\|
+nnoremap <buffer> <silent> [[ :call <SID>VbSearch('^\s*\(\(private\|public\)\s\+\)\=\(function\\|sub\)', 'bW')<cr>
+nnoremap <buffer> <silent> ]] :call <SID>VbSearch('^\s*\(\(private\|public\)\s\+\)\=\(function\\|sub\)', 'W')<cr>
+nnoremap <buffer> <silent> [] :call <SID>VbSearch('^\s*\<end\>\s\+\(function\\|sub\)', 'bW')<cr>
+nnoremap <buffer> <silent> ][ :call <SID>VbSearch('^\s*\<end\>\s\+\(function\\|sub\)', 'W')<cr>
+
+" matchit support
+if exists("loaded_matchit")
+    let b:match_ignorecase=1
+    let b:match_words=
+    \ '\%(^\s*\)\@<=\<if\>.*\<then\>\s*$:\%(^\s*\)\@<=\<else\>:\%(^\s*\)\@<=\<elseif\>:\%(^\s*\)\@<=\<end\>\s\+\<if\>,' .
+    \ '\%(^\s*\)\@<=\<for\>:\%(^\s*\)\@<=\<next\>,' .
+    \ '\%(^\s*\)\@<=\<while\>:\%(^\s*\)\@<=\<wend\>,' .
+    \ '\%(^\s*\)\@<=\<do\>:\%(^\s*\)\@<=\<loop\>\s\+\<while\>,' .
+    \ '\%(^\s*\)\@<=\<select\>\s\+\<case\>:\%(^\s*\)\@<=\<case\>:\%(^\s*\)\@<=\<end\>\s\+\<select\>,' .
+    \ '\%(^\s*\)\@<=\<enum\>:\%(^\s*\)\@<=\<end\>\s\<enum\>,' .
+    \ '\%(^\s*\)\@<=\<with\>:\%(^\s*\)\@<=\<end\>\s\<with\>,' .
+    \ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<function\>\s\+\([^ \t(]\+\):\%(^\s*\)\@<=\<\1\>\s*=:\%(^\s*\)\@<=\<end\>\s\+\<function\>,' .
+    \ '\%(^\s*\)\@<=\%(\<\%(private\|public\)\>\s\+\)\=\<sub\>\s\+:\%(^\s*\)\@<=\<end\>\s\+\<sub\>'
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif

ftplugin/yaml.vim

@@ -0,0 +1,29 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim filetype plugin file
+" Language:             YAML (YAML Ain't Markup Language)
+" Previous Maintainer:  Nikolai Weibull <now@bitwi.se> (inactive)
+" Last Change:      	2020 Mar 02
+
+if exists("b:did_ftplugin")
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+let b:undo_ftplugin = "setl com< cms< et< fo<"
+
+setlocal comments=:# commentstring=#\ %s expandtab
+setlocal formatoptions-=t formatoptions+=croql
+
+if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
+  let b:undo_ftplugin .= " sw< sts<"
+  setlocal shiftwidth=2 softtabstop=2
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif

heuristics.yaml

@@ -23,6 +23,20 @@ rules:
   filetype: aspperl
 - filetype: aspvbs
 ---
+extensions: [h]
+rules:
+- lines: 200
+  pattern: '^\s*(@(interface|class|protocol|property|end|synchronised|selector|implementation)\b|#import\s+.+\.h[">])'
+  rules:
+  - if_exists: "g:c_syntax_for_h"
+    filetype: objc
+  - filetype: objcpp
+- if_exists: "g:c_syntax_for_h"
+  filetype: c
+- if_exists: "g:ch_syntax_for_h"
+  filetype: ch
+- filetype: cpp
+---
 extensions: [m]
 rules:
 - lines: 100
@@ -63,3 +77,41 @@ rules:
   - pattern: '^\s*#(?:(?:if|ifdef|define|pragma)\s+\w|\s*include\s+[<"]|template\s*<)'
     filetype: cpp
   - filetype: reason
+---
+extensions: [idr]
+rules:
+- lines: 5
+  rules:
+  - pattern: '^\s*--.*[Ii]dris ?1'
+    filetype: idris
+  - pattern: '^\s*--.*[Ii]dris ?2'
+    filetype: idris2
+- lines: 30
+  rules:
+  - pattern: '^pkgs =.*'
+    filetype: idris
+  - pattern: '^depends =.*'
+    filetype: idris2
+  - pattern: '^%language (TypeProviders|ElabReflection)'
+    filetype: idris
+  - pattern: '^%language PostfixProjections'
+    filetype: idris2
+  - pattern: '^%access .*'
+    filetype: idris
+  - override: 'g:filetype_idr'
+- filetype: idris2
+---
+extensions: [lidr]
+rules:
+- lines: 200
+  pattern: '^>\s*--.*[Ii]dris ?1'
+  filetype: lidris
+- filetype: lidris2
+---
+extensions: [bas]
+rules:
+- lines: 5
+  pattern: 'VB_Name|Begin VB\.(Form|MDIForm|UserControl)'
+  filetype: vb
+  ignore_case: true
+- filetype: basic

indent/idris2.vim

@@ -0,0 +1,148 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" indentation for idris (idris-lang.org)
+"
+" Based on haskell indentation by motemen <motemen@gmail.com>
+"
+" author: raichoo (raichoo@googlemail.com)
+"
+" Modify g:idris_indent_if and g:idris_indent_case to
+" change indentation for `if'(default 3) and `case'(default 5).
+" Example (in .vimrc):
+" > let g:idris_indent_if = 2
+
+if exists('b:did_indent')
+  finish
+endif
+
+let b:did_indent = 1
+
+if !exists('g:idris_indent_if')
+  " if bool
+  " >>>then ...
+  " >>>else ...
+  let g:idris_indent_if = 3
+endif
+
+if !exists('g:idris_indent_case')
+  " case xs of
+  " >>>>>[]      => ...
+  " >>>>>(y::ys) => ...
+  let g:idris_indent_case = 5
+endif
+
+if !exists('g:idris_indent_let')
+  " let x : Nat = O in
+  " >>>>x
+  let g:idris_indent_let = 4
+endif
+
+if !exists('g:idris_indent_rewrite')
+  " rewrite prf in expr
+  " >>>>>>>>x
+  let g:idris_indent_rewrite = 8
+endif
+
+if !exists('g:idris_indent_where')
+  " where f : Nat -> Nat
+  " >>>>>>f x = x
+  let g:idris_indent_where = 6
+endif
+
+if !exists('g:idris_indent_do')
+  " do x <- a
+  " >>>y <- b
+  let g:idris_indent_do = 3
+endif
+
+setlocal indentexpr=GetIdrisIndent()
+setlocal indentkeys=!^F,o,O,}
+
+function! GetIdrisIndent()
+  let prevline = getline(v:lnum - 1)
+
+  if prevline =~ '\s\+(\s*.\+\s\+:\s\+.\+\s*)\s\+->\s*$'
+    return match(prevline, '(')
+  elseif prevline =~ '\s\+{\s*.\+\s\+:\s\+.\+\s*}\s\+->\s*$'
+    return match(prevline, '{')
+  endif
+
+  if prevline =~ '[!#$%&*+./<>?@\\^|~-]\s*$'
+    let s = match(prevline, '[:=]')
+    if s > 0
+      return s + 2
+    else
+      return match(prevline, '\S')
+    endif
+  endif
+
+  if prevline =~ '[{([][^})\]]\+$'
+    return match(prevline, '[{([]')
+  endif
+
+  if prevline =~ '\<let\>\s\+.\+\<in\>\s*$'
+    return match(prevline, '\<let\>') + g:idris_indent_let
+  endif
+
+  if prevline =~ '\<rewrite\>\s\+.\+\<in\>\s*$'
+    return match(prevline, '\<rewrite\>') + g:idris_indent_rewrite
+  endif
+
+  if prevline !~ '\<else\>'
+    let s = match(prevline, '\<if\>.*\&.*\zs\<then\>')
+    if s > 0
+      return s
+    endif
+
+    let s = match(prevline, '\<if\>')
+    if s > 0
+      return s + g:idris_indent_if
+    endif
+  endif
+
+  if prevline =~ '\(\<where\>\|\<do\>\|=\|[{([]\)\s*$'
+    return match(prevline, '\S') + &shiftwidth
+  endif
+
+  if prevline =~ '\<where\>\s\+\S\+.*$'
+    return match(prevline, '\<where\>') + g:idris_indent_where
+  endif
+
+  if prevline =~ '\<do\>\s\+\S\+.*$'
+    return match(prevline, '\<do\>') + g:idris_indent_do
+  endif
+
+  if prevline =~ '^\s*\<\(co\)\?data\>\s\+[^=]\+\s\+=\s\+\S\+.*$'
+    return match(prevline, '=')
+  endif
+
+  if prevline =~ '\<with\>\s\+([^)]*)\s*$'
+    return match(prevline, '\S') + &shiftwidth
+  endif
+
+  if prevline =~ '\<case\>\s\+.\+\<of\>\s*$'
+    return match(prevline, '\<case\>') + g:idris_indent_case
+  endif
+
+  if prevline =~ '^\s*\(\<namespace\>\|\<\(co\)\?data\>\)\s\+\S\+\s*$'
+    return match(prevline, '\(\<namespace\>\|\<\(co\)\?data\>\)') + &shiftwidth
+  endif
+
+  if prevline =~ '^\s*\(\<using\>\|\<parameters\>\)\s*([^(]*)\s*$'
+    return match(prevline, '\(\<using\>\|\<parameters\>\)') + &shiftwidth
+  endif
+
+  if prevline =~ '^\s*\<mutual\>\s*$'
+    return match(prevline, '\<mutual\>') + &shiftwidth
+  endif
+
+  let line = getline(v:lnum)
+
+  if (line =~ '^\s*}\s*' && prevline !~ '^\s*;')
+    return match(prevline, '\S') - &shiftwidth
+  endif
+
+  return match(prevline, '\S')
+endfunction
+
+endif

indent/vb.vim

@@ -0,0 +1,82 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
+
+" Vim indent file
+" Language:	VisualBasic (ft=vb) / Basic (ft=basic) / SaxBasic (ft=vb)
+" Author:	Johannes Zellner <johannes@zellner.org>
+" Last Change:	Fri, 18 Jun 2004 07:22:42 CEST
+"		Small update 2010 Jul 28 by Maxim Kim
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=VbGetIndent(v:lnum)
+setlocal indentkeys&
+setlocal indentkeys+==~else,=~elseif,=~end,=~wend,=~case,=~next,=~select,=~loop,<:>
+
+let b:undo_indent = "set ai< indentexpr< indentkeys<"
+
+" Only define the function once.
+if exists("*VbGetIndent")
+    finish
+endif
+
+fun! VbGetIndent(lnum)
+    " labels and preprocessor get zero indent immediately
+    let this_line = getline(a:lnum)
+    let LABELS_OR_PREPROC = '^\s*\(\<\k\+\>:\s*$\|#.*\)'
+    if this_line =~? LABELS_OR_PREPROC
+	return 0
+    endif
+
+    " Find a non-blank line above the current line.
+    " Skip over labels and preprocessor directives.
+    let lnum = a:lnum
+    while lnum > 0
+	let lnum = prevnonblank(lnum - 1)
+	let previous_line = getline(lnum)
+	if previous_line !~? LABELS_OR_PREPROC
+	    break
+	endif
+    endwhile
+
+    " Hit the start of the file, use zero indent.
+    if lnum == 0
+	return 0
+    endif
+
+    let ind = indent(lnum)
+
+    " Add
+    if previous_line =~? '^\s*\<\(begin\|\%(\%(private\|public\|friend\)\s\+\)\=\%(function\|sub\|property\)\|select\|case\|default\|if\|else\|elseif\|do\|for\|while\|enum\|with\)\>'
+	let ind = ind + shiftwidth()
+    endif
+
+    " Subtract
+    if this_line =~? '^\s*\<end\>\s\+\<select\>'
+	if previous_line !~? '^\s*\<select\>'
+	    let ind = ind - 2 * shiftwidth()
+	else
+	    " this case is for an empty 'select' -- 'end select'
+	    " (w/o any case statements) like:
+	    "
+	    " select case readwrite
+	    " end select
+	    let ind = ind - shiftwidth()
+	endif
+    elseif this_line =~? '^\s*\<\(end\|else\|elseif\|until\|loop\|next\|wend\)\>'
+	let ind = ind - shiftwidth()
+    elseif this_line =~? '^\s*\<\(case\|default\)\>'
+	if previous_line !~? '^\s*\<select\>'
+	    let ind = ind - shiftwidth()
+	endif
+    endif
+
+    return ind
+endfun
+
+" vim:sw=4
+
+endif

indent/yaml.vim

@@ -0,0 +1,159 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim indent file
+" Language:         YAML
+" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" Last Change:	    2019 Sep 28
+
+" Only load this indent file when no other was loaded.
+if exists('b:did_indent')
+  finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+let b:did_indent = 1
+
+setlocal indentexpr=GetYAMLIndent(v:lnum)
+setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0-
+setlocal nosmartindent
+
+let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
+
+" Only define the function once.
+if exists('*GetYAMLIndent')
+    finish
+endif
+
+function s:FindPrevLessIndentedLine(lnum, ...)
+    let prevlnum = prevnonblank(a:lnum-1)
+    let curindent = a:0 ? a:1 : indent(a:lnum)
+    while           prevlnum
+                \&&  indent(prevlnum) >=  curindent
+                \&& getline(prevlnum) !~# '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+    endwhile
+    return prevlnum
+endfunction
+
+function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex)
+    let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1)
+    while plilnum && getline(plilnum) !~# a:regex
+        let plilnum = s:FindPrevLessIndentedLine(plilnum)
+    endwhile
+    return plilnum
+endfunction
+
+let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''.
+                \                 '|\"%([^"\\]|\\.)*\"'.
+                \                 '|%(%(\:\ )@!.)*)\:%(\ |$)'
+let s:liststartregex='\v^\s*%(\-%(\ |$))'
+
+let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)'
+let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
+let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
+
+let s:ns_word_char = '\v[[:alnum:]_\-]'
+let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
+let s:c_secondary_tag_handle = '\v\!\!'
+let s:c_primary_tag_handle   = '\v\!'
+let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
+            \            '|'.s:c_secondary_tag_handle.
+            \            '|'.s:c_primary_tag_handle.')'
+let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
+let s:c_non_specific_tag = '\v\!'
+let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
+let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
+            \               '\v|'.s:c_ns_shorthand_tag.
+            \               '\v|'.s:c_non_specific_tag
+
+let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?'
+
+function GetYAMLIndent(lnum)
+    if a:lnum == 1 || !prevnonblank(a:lnum-1)
+        return 0
+    endif
+
+    let prevlnum = prevnonblank(a:lnum-1)
+    let previndent = indent(prevlnum)
+
+    let line = getline(a:lnum)
+    if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#'
+        " Comment blocks should have identical indent
+        return previndent
+    elseif line =~# '^\s*[\]}]'
+        " Lines containing only closing braces should have previous indent
+        return indent(s:FindPrevLessIndentedLine(a:lnum))
+    endif
+
+    " Ignore comment lines when calculating indent
+    while getline(prevlnum) =~# '^\s*#'
+        let prevlnum = prevnonblank(prevlnum-1)
+        if !prevlnum
+            return previndent
+        endif
+    endwhile
+
+    let prevline = getline(prevlnum)
+    let previndent = indent(prevlnum)
+
+    " Any examples below assume that shiftwidth=2
+    if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$'
+        " Mapping key:
+        "     nested mapping: ...
+        "
+        " - {
+        "     key: [
+        "         list value
+        "     ]
+        " }
+        "
+        " - |-
+        "     Block scalar without indentation indicator
+        return previndent+shiftwidth()
+    elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$'
+        " - |+2
+        "   block scalar with indentation indicator
+        "#^^ indent+2, not indent+shiftwidth
+        return previndent + str2nr(matchstr(prevline,
+                    \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@='))
+    elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$'
+        "    "Multiline string \
+        "     with escaped end"
+        let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\')
+        return virtcol([prevlnum, qidx+1])
+    elseif line =~# s:liststartregex
+        " List line should have indent equal to previous list line unless it was 
+        " caught by one of the previous rules
+        return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                       s:liststartregex))
+    elseif line =~# s:mapkeyregex
+        " Same for line containing mapping key
+        let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum,
+                    \                                           s:mapkeyregex)
+        if getline(prevmapline) =~# '^\s*- '
+            return indent(prevmapline) + 2
+        else
+            return indent(prevmapline)
+        endif
+    elseif prevline =~# '^\s*- '
+        " - List with
+        "   multiline scalar
+        return previndent+2
+    elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property.
+                \                              '\v|'.s:c_ns_anchor_property.
+                \                              '\v|'.s:block_scalar_header.
+                \                             '\v)%(\s+|\s*%(\#.*)?$))*'
+        " Mapping with: value
+        "     that is multiline scalar
+        return previndent+shiftwidth()
+    endif
+    return previndent
+endfunction
+
+let &cpo = s:save_cpo
+
+endif

packages.yaml

@@ -93,7 +93,9 @@ filetypes:
   - adb
   - ads
   - ada
+  - adc
   - gpr
+  - ada_m
 ---
 name: ahdl
 remote: vim/vim:runtime
@@ -155,6 +157,16 @@ filetypes:
   - .htaccess
   - '*/etc/httpd/*.conf'
   - '*/etc/apache2/sites-*/*.com'
+  - 'access.conf*'
+  - 'apache.conf*'
+  - 'apache2.conf*'
+  - 'httpd.conf*'
+  - 'srm.conf*'
+  - '*/etc/apache2/*.conf*'
+  - '*/etc/apache2/conf.*/*'
+  - '*/etc/apache2/mods-*/*'
+  - '*/etc/apache2/sites-*/*'
+  - '*/etc/httpd/conf.d/*.conf*'
 ---
 name: apiblueprint
 remote: sheerun/apiblueprint.vim
@@ -181,6 +193,11 @@ filetypes:
   - '*/.aptitude/config'
   - '*/etc/apt/apt.conf.d/[^.]*'
   - '*/etc/apt/apt.conf.d/*.conf'
+  ignored_warnings:
+  # some kind of bugs in filetype detection algorithm
+  - '*/etc/apt/apt.conf.d/{[-_[:alnum:]]\+,[-_.[:alnum:]]\+.conf}'
+  - '*/etc/apt/apt.conf.d/]\+'
+  - '*/etc/apt/apt.conf.d/]\+.conf'
 ---
 name: arch
 remote: vim/vim:runtime
@@ -292,19 +309,34 @@ filetypes:
 - name: awk
   extensions:
   - awk
+  - gawk
 ---
 name: c/c++
 remote: vim-jp/vim-cpp
 filetypes:
-- name: c
-  linguist: C
 - name: cpp
   linguist: C++
+  extra_extensions:
+  - moc
+  # TLH files are C++ headers generated by Visual C++'s #import from typelibs
+  - tlh
   ignored_extensions:
   # conflicts with more popular reason, remove after heuristics work
   - re
   # implemented by arduino
   - ino
+  ignored_warnings:
+  # TODO: fix these
+  - C
+  - H
+- name: c
+  linguist: C
+  extra_extensions:
+  # Quake C
+  - qc
+  extra_filenames:
+  # Enlightenment configuration file
+  - '*enlightenment/*.cfg'
 ---
 name: caddyfile
 remote: isobit/vim-caddyfile
@@ -348,14 +380,13 @@ filetypes:
   extra_extensions:
   # 17 results: https://github.com/search?q=extension%3Acoffeekup+html&type=Code
   - coffeekup
-  ignored_extensions:
+  ignored_warnings:
+  # Probably mistake
+  - '*Cakefile'
   # Used by C#
   - csx
   # Used by Chuck
   - ck
-  ignored_filenames:
-  # Probably mistake
-  - '*Cakefile'
 - name: litcoffee
   linguist: Literate CoffeeScript
   extra_extensions:
@@ -395,7 +426,7 @@ filetypes:
   extra_extensions:
   - tsv
   - tab
-  ignored_extensions:
+  ignored_warnings:
   # This is definitely not csv-only, maybe re-enable when heuristics done
   - dat
 ---
@@ -420,6 +451,8 @@ remote: dart-lang/dart-vim-plugin
 filetypes:
 - name: dart
   linguist: Dart
+  extra_extensions:
+  - drt
 ---
 name: dhall
 remote: vmchale/dhall-vim
@@ -460,7 +493,7 @@ filetypes:
   filenames:
   - 'docker-compose*.yaml'
   - 'docker-compose*.yml'
-  ignored_filenames:
+  ignored_warnings:
   # Probably mistakes?
   - 'docker-compose*.yaml*'
   - 'docker-compose*.yml*'
@@ -577,16 +610,27 @@ filetypes:
   extra_filenames:
   - "*.git/config"
   - "*/.config/git/config"
+  - "*.git/modules/*/config"
+  - "*/git/config"
+  - "*/{.,}gitconfig.d/*"
+  ignored_warnings:
+  - '/etc/gitconfig'
+  - '$XDG_CONFIG_HOME/git/config'
   - "*.git/modules/**/config"
-  - '.gitmodules'
+  - "*.git/modules/**/config"
+  - "/etc/gitconfig.d/*"
 - name: gitrebase
   filenames:
   - git-rebase-todo
 - name: gitsendemail
   filenames:
   - ".gitsendemail.*"
+  ignored_warnings:
+  - '.gitsendemail.msg.??????'
 - name: gitcommit
   filenames:
+  - 'COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG'
+  ignored_warnings:
   - '*.git/{,modules/**/,worktrees/*/}{COMMIT_EDIT,TAG_EDIT,MERGE_,}MSG'
 ---
 name: glsl
@@ -612,6 +656,9 @@ remote: vim-scripts/gnuplot-syntax-highlighting
 filetypes:
 - name: gnuplot
   linguist: Gnuplot
+  extra_extensions:
+  # Gnuplot scripts
+  - gpi
 ---
 name: go
 remote: fatih/vim-go
@@ -632,15 +679,29 @@ filetypes:
 ---
 name: graphql
 remote: jparise/vim-graphql
+after: [javascript, jsx]
+ignored_dirs:
+# TODO: remove after bug is fixed:
+# https://github.com/jparise/vim-graphql/issues/62
+- after/indent
 filetypes:
 - name: graphql
   linguist: GraphQL
 ---
 name: gradle
 remote: tfnico/vim-gradle
+after: groovy
+# Just adds compiler
+filetypes: []
+---
+name: groovy
+remote: vim/vim:runtime
+glob: '**/groovy.vim'
 filetypes:
 - name: groovy
-  linguist: Gradle
+  linguist: Groovy
+  extra_extensions:
+  - gradle
 ---
 name: grub
 remote: vim/vim:runtime
@@ -755,6 +816,21 @@ filetypes:
   extra_filenames:
   - idris-response
 ---
+name: idris2
+remote: edwinb/idris2-vim
+ignored_dirs:
+- doc
+filetypes:
+- name: idris2
+  extensions:
+  - idr
+  - ipkg
+  filenames:
+  - idris-response
+- name: lidris2
+  extensions:
+  - lidr
+---
 name: ion
 remote: vmchale/ion-vim
 filetypes:
@@ -800,8 +876,10 @@ filetypes:
   extra_extensions:
   - j2
   ignored_extensions:
-  - mustache
   - njk
+  ignore_warnings:
+  # handled by mustache plugin
+  - mustache
 ---
 name: jq
 remote: vito-c/jq.vim
@@ -810,7 +888,6 @@ filetypes:
   linguist: JSONiq
   extra_filenames:
   - ".jqrc"
-  ignored_filenames:
   - ".jqrc*"
 ---
 name: json5
@@ -842,13 +919,14 @@ filetypes:
   extra_extensions:
   - jst
   - ect
-  ignored_extensions:
-  # I haven't found reference to them
+  ignored_warnings:
+  # I haven't found reference to them on github
   - djs
   - hamljs
 ---
 name: jsx
 remote: MaxMEllon/vim-jsx-pretty
+after: javascript
 filetypes:
 - name: javascriptreact
   linguist: JSX
@@ -959,6 +1037,7 @@ filetypes:
   ignored_extensions:
   # Handled by mdx extension
   - mdx
+  ignored_warnings:
   - '{md,mdx,mdown,mkd,mkdn,markdown,mdwn}.{des3,des,bf,bfa,aes,idea,cast,rc2,rc4,rc5,desx}'
 ---
 name: mdx
@@ -1536,9 +1615,9 @@ remote: lumiliet/vim-twig
 filetypes:
 - name: html.twig
   linguist: Twig
-  ignored_extensions:
+  ignored_warnings:
+  # handled by other extension
   - xml.twig
-  ignored_extensions:
   # already covered by .twig
   - html.twig
 - name: xml.twig
@@ -1635,14 +1714,16 @@ filetypes:
   linguist: XSLT
 ---
 name: yaml
-remote: stephpy/vim-yaml
+# Fixes indentation issue: https://github.com/vim/vim/issues/6417
+remote: vim/vim@df44a27b53586fccfc6a3aedc89061fdd9a515ff:runtime
+glob: '**/yaml.vim'
 filetypes:
 - name: yaml
   linguist: YAML
   extra_filenames:
   - fish_history
   - fish_read_history
-  ignored_filenames:
+  ignored_warnings:
   - '~/.config/fish/fish_{read_,}history'
 # Ansible needs to be after YAML
 ---
@@ -1704,3 +1785,26 @@ filetypes:
 - name: trasys
   extensions:
   - inp
+---
+name: basic
+remote: vim/vim:runtime
+glob: '**/basic.vim'
+filetypes:
+- name: basic
+  extensions:
+  - basic
+---
+name: visual-basic
+remote: vim/vim:runtime
+glob: '**/vb.vim'
+filetypes:
+- name: vb
+  linguist: VBA
+  extra_extensions:
+  - vbs
+  - dsm
+  - ctl
+  # SaxBasic is close to Visual Basic
+  - sba
+  ignored_warnings:
+  - vb

plugin/polyglot.vim

@@ -1,167 +0,0 @@
-" Heuristically set expandtab and shiftwidth options
-"
-" Modified version of vim-sleuth:
-"   - tabstop is not set, it's up to user to set it
-"   - check maximum of 32 lines, instead of 1024
-"   - check maximum 6 files, instead of 20
-"   - check maximum of 2 filer per directory level, instead of 8
-"   - check maximum of 3 directory levels
-"   - check only to the nearest .git, .hg, or .svn directory
-"   - globs are concatenated for performance
-if exists('g:polyglot_disabled') && index(g:polyglot_disabled, 'autoindent') != -1
-  finish
-endif
-
-if exists("g:loaded_polyglot") || v:version < 700 || &cp
-  finish
-endif
-
-let g:loaded_sleuth = 1
-let g:loaded_polyglot = 1
-
-" Makes shiftwidth to be synchronized with tabstop by default
-if &shiftwidth == &tabstop
-  let &shiftwidth = 0
-endif
-
-function! s:guess(lines) abort
-  let options = {}
-  let ccomment = 0
-  let podcomment = 0
-  let triplequote = 0
-  let backtick = 0
-  let xmlcomment = 0
-  let heredoc = ''
-  let minindent = 10
-  let spaces_minus_tabs = 0
-
-  for line in a:lines
-    if !len(line) || line =~# '^\s*$'
-      continue
-    endif
-
-    if line =~# '^\s*/\*'
-      let ccomment = 1
-    endif
-    if ccomment
-      if line =~# '\*/'
-        let ccomment = 0
-      endif
-      continue
-    endif
-
-    if line =~# '^=\w'
-      let podcomment = 1
-    endif
-    if podcomment
-      if line =~# '^=\%(end\|cut\)\>'
-        let podcomment = 0
-      endif
-      continue
-    endif
-
-    if triplequote
-      if line =~# '^[^"]*"""[^"]*$'
-        let triplequote = 0
-      endif
-      continue
-    elseif line =~# '^[^"]*"""[^"]*$'
-      let triplequote = 1
-    endif
-
-    if backtick
-      if line =~# '^[^`]*`[^`]*$'
-        let backtick = 0
-      endif
-      continue
-    elseif &filetype ==# 'go' && line =~# '^[^`]*`[^`]*$'
-      let backtick = 1
-    endif
-
-    if line =~# '^\s*<\!--'
-      let xmlcomment = 1
-    endif
-    if xmlcomment
-      if line =~# '-->'
-        let xmlcomment = 0
-      endif
-      continue
-    endif
-
-    " This is correct order because both "<<EOF" and "EOF" matches end
-    if heredoc != ''
-      if line =~# heredoc
-        let heredoc = ''
-      endif
-      continue
-    endif
-    let herematch = matchlist(line, '\C<<\W*\([A-Z]\+\)\s*$')
-    if len(herematch) > 0
-      let heredoc = herematch[1] . '$'
-    endif
-
-    let spaces_minus_tabs += line[0] == "\t" ? 1 : -1
-
-    if line[0] == "\t"
-      setlocal noexpandtab
-      return 1
-    elseif line[0] == " "
-      let indent = len(matchstr(line, '^ *'))
-      if indent % 2 == 0 && indent < minindent
-        let minindent = indent
-      endif
-    endif
-  endfor
-
-  if minindent < 10
-    setlocal expandtab
-    let &shiftwidth=minindent
-    return 1
-  endif
-
-  return 0
-endfunction
-
-function! s:detect_indent() abort
-  if &buftype ==# 'help'
-    return
-  endif
-
-  if s:guess(getline(1, 32))
-    return
-  endif
-  let pattern = sleuth#GlobForFiletype(&filetype)
-  if len(pattern) == 0
-    return
-  endif
-  let pattern = '{' . pattern . ',.git,.svn,.hg}'
-  let dir = expand('%:p:h')
-  let level = 3
-  while isdirectory(dir) && dir !=# fnamemodify(dir, ':h') && level > 0
-    for neighbor in glob(dir . '/' . pattern, 0, 1)[0:level]
-      " Do not consider directories above .git, .svn or .hg
-      if fnamemodify(neighbor, ":h:t")[0] == "."
-        return
-      endif
-      if neighbor !=# expand('%:p') && filereadable(neighbor)
-        if s:guess(readfile(neighbor, '', 32))
-          return
-        endif
-      endif
-    endfor
-
-    let dir = fnamemodify(dir, ':h')
-    let level -= 1
-  endwhile
-endfunction
-
-setglobal smarttab
-
-if !exists('g:did_indent_on')
-  filetype indent on
-endif
-
-augroup polyglot
-  autocmd!
-  autocmd FileType * call s:detect_indent()
-augroup END

scripts/build

@@ -36,6 +36,7 @@ def load_data()
     end
   end
 
+  puts deps["javascript"]
   each_node = lambda {|&b| packages.keys.each(&b) }
   each_child = lambda {|n, &b| deps[n].each(&b) }
 
@@ -59,10 +60,15 @@ def load_data()
 
         linguist = languages.fetch(filetype["linguist"])
 
-        filetype["extensions"] = ((
-          (linguist["extensions"] || []).map { |e| e[1..-1] } |
+        filetype["extensions"] = (linguist["extensions"] || []).map { |e| e[1..-1] } |
           filetype.fetch("extra_extensions", [])
-        ) - filetype.fetch("ignored_extensions", [])).uniq
+
+        extra_ignored_extensions = filetype.fetch("ignored_extensions", []) - filetype["extensions"]
+        if extra_ignored_extensions.size > 0
+          raise StandardError.new("[#{filetype["name"]}]: Unnecessary ignored extensions: #{extra_ignored_extensions.join(", ")}") 
+        end
+
+        filetype["extensions"] -= filetype.fetch("ignored_extensions", [])
 
         filetype["filenames"] = ((
           (linguist["filenames"] || []) |
@@ -77,6 +83,12 @@ def load_data()
         filetype["extensions"] ||= []
         filetype["filenames"] ||= []
         filetype["interpreters"] ||= []
+
+        filetype.keys.each do |key|
+          if key.start_with?("extra_")
+            raise "[#{filetype["name"]}]: #{key} is not allowed if linguist is not used"
+          end
+        end
       end
     end
   end
@@ -149,21 +161,49 @@ end
 
 def parse_remote(remote)
   match = remote.match(/(?<repo>[^@:]+)(?:@(?<branch>[^:]+))?(?::(?<path>.*))?/)
-  [match[:repo], match[:branch] || "master", match[:path]]
+  dir = "tmp/" + match[:repo] + (match[:branch] ? "-#{match[:branch]}" : "")
+  [match[:repo], match[:branch] || "master", match[:path], dir]
 end
 
 def copy_file(package, src, dest)
   FileUtils.mkdir_p(File.dirname(dest))
   name = package.fetch("name")
 
+  header = '" Polyglot metafile'
+  if File.exist?(dest)
+    meta_dest = dest
+    new_dest = dest
+    i = 0
+    while File.exist?(new_dest)
+      i += 1
+      new_dest = "#{dest.gsub(/\.vim$/, '')}-#{i}.vim"
+    end
+
+    if File.read(dest).include?(header)
+      dest = new_dest
+    else
+      FileUtils.mv(dest, new_dest)
+      File.write(meta_dest, "#{header}\n")
+      open(meta_dest, "a+") do |output|
+        output << "source <sfile>:h/#{File.basename(new_dest)}\n"
+      end
+      dest = "#{dest.gsub(/\.vim$/, '')}-#{i+1}.vim"
+    end
+    open(meta_dest, "a+") do |output|
+      output << "source <sfile>:h/#{File.basename(dest)}\n"
+    end
+  end
+
   open(src, "r") do |input|
-    open(dest, "a+") do |output|
+    open(dest, "w") do |output|
       if name == "jsx"
         output << "if !exists('g:polyglot_disabled') || (index(g:polyglot_disabled, 'javascript') == -1 && index(g:polyglot_disabled, 'jsx') == -1)\n\n"
       else
         output << "if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, '#{name}') == -1\n\n"
       end
-      IO.copy_stream(input, output)
+      contents = File.read(input)
+      contents.gsub!(' ..= ', ' .= ')
+      output << contents
       output << "\nendif\n"
     end
   end
@@ -173,8 +213,7 @@ def download(packages)
   packages.map { |p| p["remote"] or raise "No remote for: " + p["name"] }.uniq.each_slice(20) do |remotes|
     remotes.map do |remote|
       Thread.new do
-        repo, branch, path = parse_remote(remote)
-        dir = "tmp/" + repo
+        repo, branch, path, dir = parse_remote(remote)
         unless File.exist?(dir)
           FileUtils.mkdir_p(dir)
           url = "https://codeload.github.com/#{repo}/tar.gz/#{branch}"
@@ -257,10 +296,6 @@ def rule_to_code(rule)
     end
   end
 
-  if rule.has_key?("rules")
-    return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
-  end
-
   if rule.has_key?("pattern") || rule.has_key?("or") || rule.has_key?("and")
     return <<~EOS
       if #{pattern_to_condition(rule)}
@@ -269,6 +304,10 @@ def rule_to_code(rule)
     EOS
   end
 
+  if rule.has_key?("rules")
+    return rule["rules"].map { |r| indent(rule_to_code(r), 0) }.join("\n")
+  end
+
   if rule.has_key?("if_set")
     return <<~EOS
       if #{rule["negative"] ? "!" : ""}#{rule["if_set"]}
@@ -277,6 +316,14 @@ def rule_to_code(rule)
     EOS
   end
 
+  if rule.has_key?("if_exists")
+    return <<~EOS
+      if #{rule["negative"] ? "!" : ""}exists("#{rule["if_exists"]}")
+      #{indent(rule_to_code(except(rule, "if_exists", "negative")), 2)}
+      endif
+    EOS
+  end
+
   if rule.has_key?("set")
     return <<~EOS
       let #{rule["set"]} = 1
@@ -314,9 +361,9 @@ def extract(packages)
   FileUtils.rm_rf(all_dirs)
 
   output = []
-  packages.map do |package|
-    repo, branch, path = parse_remote(package["remote"])
-    dir = "tmp/" + repo
+  # We need to reverse packages so they are included in proper order
+  packages.reverse.map do |package|
+    repo, branch, path, dir = parse_remote(package["remote"])
     dirs = package.fetch("dirs", default_dirs)
     ignored_dirs = package.fetch("ignored_dirs", [])
     if ignored_dirs.size > 0
@@ -389,7 +436,19 @@ def generate_ftdetect(packages, heuristics)
   expected_filetypes = detect_filetypes('tmp/**/ftdetect/*.vim')
   native_filetypes = detect_filetypes('tmp/vim/vim/runtime/filetype.vim')
   native_extensions = native_filetypes.flat_map { |k, v| v["extensions"] }
+
+  all_filetypes = Hash.new { |h, k| h[k] = { extensions: [], filenames: [] } }
+
+  for k, v in expected_filetypes
+    all_filetypes[k][:extensions].concat(v[:extensions])
+    all_filetypes[k][:filenames].concat(v[:filenames])
+  end
   
+  for k, v in native_filetypes
+    all_filetypes[k][:extensions].concat(v[:extensions])
+    all_filetypes[k][:filenames].concat(v[:filenames])
+  end
+
   for package in packages
     name = package.fetch("name")
 
@@ -411,14 +470,11 @@ def generate_ftdetect(packages, heuristics)
   end
 
   for package in packages
-    name = package.fetch("name")
-
-    output << "if !has_key(s:disabled_packages, '#{name}')\n"
-
     filetypes = package["filetypes"] or raise "Unknown filetype for: #{package["name"]}"
 
     package_heuristics = []
 
+    autocommands = ""
     for filetype in filetypes
       name = filetype.fetch("name")
       syntax = filetype["syntax"] ? " | set syntax=#{filetype["syntax"]}" : ""
@@ -436,12 +492,16 @@ def generate_ftdetect(packages, heuristics)
       extensions = filetype["extensions"]
       filenames = filetype["filenames"]
 
-      if expected_filetypes[name] && !filetype["syntax"]
-        for e in expected_filetypes.fetch(name)[:extensions] - extensions - expand_all(filetype.fetch("ignored_extensions", []))
+      expected_extensions = (all_filetypes.has_key?(name) ? all_filetypes.fetch(name)[:extensions] : [])
+      ignored_extensions = expand_all(filetype.fetch("ignored_extensions", []))
+      ignored_warnings = expand_all(filetype.fetch("ignored_warnings", []))
+
+      if all_filetypes[name] && !filetype["syntax"]
+        for e in expected_extensions - extensions - ignored_extensions - ignored_warnings
           puts "Probable missing extension for #{name}: #{e}"
         end
 
-        for e in expected_filetypes.fetch(name)[:filenames] - expand_all(filenames).flat_map { |e| [e, e.gsub(/^\./, '')] } - expand_all(filetype.fetch("ignored_filenames", [])) - ['*']
+        for e in all_filetypes.fetch(name)[:filenames] - expand_all(filenames).flat_map { |e| [e, e.gsub(/^\./, '')] } - expand_all(filetype.fetch("ignored_warnings", [])) - ['*']
           puts "Probable missing filename for #{name}: #{e}"
         end
       end
@@ -449,8 +509,8 @@ def generate_ftdetect(packages, heuristics)
       for extension in extensions.sort
         outer_filetype = filetype["outer_filetype"]
         if outer_filetype
-          output << "  au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
-          output << "  au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
+          autocommands << "  au BufNewFile *.*.#{extension} execute \"do BufNewFile filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
+          autocommands << "  au BufReadPre *.*.#{extension} execute \"do BufRead filetypedetect \" . expand(\"<afile>:r\") | #{outer_filetype}\n"
         end
 
         heuristic = heuristics.find { |h| h["extensions"].include?(extension) }
@@ -461,7 +521,7 @@ def generate_ftdetect(packages, heuristics)
           #   puts "Ambiguous extension without heuristic: #{extension} => #{filetype["name"]}"
           # end
           #
-          output << "  au BufNewFile,BufRead *.#{extension} #{set_command}\n"
+          autocommands << "  au BufNewFile,BufRead *.#{extension} #{set_command}\n"
         end
       end
 
@@ -469,16 +529,24 @@ def generate_ftdetect(packages, heuristics)
         if filename[0] == "."
           filename = "{.,}" + filename[1..]
         end
-        output << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+        if filename[-1] == "*"
+          autocommands << "  au BufNewFile,BufRead #{filename} call s:StarSetf('#{name}')\n"
+        else
+          autocommands << "  au BufNewFile,BufRead #{filename} #{set_command}\n"
+        end
       end
     end
 
     for heuristic in package_heuristics.uniq
       extensions = heuristic["extensions"].map { |e| "*.#{e}" }
-      output << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
+      autocommands << "  au! BufNewFile,BufRead #{extensions.join(",")} call polyglot#Detect#{camelize(heuristic["extensions"].first)}Filetype()\n"
     end
 
-    output << "endif\n\n"
+    if autocommands != ""
+      output << "if !has_key(s:disabled_packages, '#{package["name"]}')\n"
+      output << autocommands
+      output << "endif\n\n"
+    end
   end
  
   ftdetect = File.read('ftdetect/polyglot.vim')

scripts/test

@@ -9,3 +9,8 @@ vim --clean -N -u <(echo "
   \"source scripts/test_filetypes.vim
   qa!
 ")
+
+if ! expect -c 'set timeout 1' -c 'spawn vim -N --clean -c "set nomore | :helptags ./doc | q"' -c 'expect "ENTER" { exit 1 }' > /dev/null; then
+  echo "Please ensure ':helptags ./doc' works properly"
+  exit 1
+fi

scripts/test_extensions.vim

@@ -6,148 +6,148 @@ function! TestExtension(filetype, filename, content)
     1delete _
     filetype detect
     exec "if &filetype != '" . a:filetype . "' \nthrow &filetype\nendif"
-    exec ":bw!"
+    exec ":q!"
   catch
     echo g:message
-    echo 'Filename "' . a:filename  . '" does not resolve to extension "' . a:filetype . '"'
-    echo '  instead received: "' . v:exception . '"'
-    exec ':cq!'
+    echo "Filename '" . a:filename  . "' does not resolve to extension '" . a:filetype . "'"
+    echo "  instead received: '" . v:exception . "'"
+    exec ":cq!"
   endtry
 endfunction
 
-call TestExtension('sh', 'bash1', "#!/bin/bash")
-call TestExtension('sh', 'bash2', "#! /bin/bash")
-call TestExtension('sh', 'bash3', "#! /bin/bash2.3")
-call TestExtension('sh', 'bash4', "#!/usr/bin/env bash")
-call TestExtension('sh', 'bash6', "#!/usr/bin/env -i -=split-string foo=bar bash -l foo")
-call TestExtension('sh', 'bash1', "#!/bin/bash")
+call TestExtension("sh", "bash1", "#!/bin/bash")
+call TestExtension("sh", "bash2", "#! /bin/bash")
+call TestExtension("sh", "bash3", "#! /bin/bash2.3")
+call TestExtension("sh", "bash4", "#!/usr/bin/env bash")
+call TestExtension("sh", "bash6", "#!/usr/bin/env -i -=split-string foo=bar bash -l foo")
+call TestExtension("sh", "bash1", "#!/bin/bash")
 
 " Vim help file
-call TestExtension('help', $VIMRUNTIME . '/doc/foobar.txt', '')
+call TestExtension("help", $VIMRUNTIME . "/doc/foobar.txt", "")
 
 " Abaqus or Trasys
-call TestExtension('abaqus', 'foobar.inp', "*HEADING\nFoobar")
-call TestExtension('trasys', 'foobar.inp', "MSC PATRAN\n* foobar\nHEADER SURFACE DATA\nBSC ENCLO1")
+call TestExtension("abaqus", "foobar.inp", "*HEADING\nFoobar")
+call TestExtension("trasys", "foobar.inp", "MSC PATRAN\n* foobar\nHEADER SURFACE DATA\nBSC ENCLO1")
 
 " 8th (Firth-derivative)
-call TestExtension('8th', 'foobar.8th', '')
-call TestExtension('8th', 'foobar.8th', '')
+call TestExtension("8th", "foobar.8th", "")
+call TestExtension("8th", "foobar.8th", "")
 
 " A-A-P recipe
-call TestExtension('aap', 'foobar.aap', '')
+call TestExtension("aap", "foobar.aap", "")
 
 
 " A2ps printing utility
-call TestExtension('a2ps', '/etc/a2ps.cfg', '')
-call TestExtension('a2ps', '/usr/local/etc/a2ps.cfg', '')
-call TestExtension('a2ps', '/etc/a2ps/foobar.cfg', '')
-call TestExtension('a2ps', '/usr/local/etc/a2ps/foobar.cfg', '')
-call TestExtension('a2ps', '/tmp/a2psrc', '')
-call TestExtension('a2ps', '/tmp/.a2psrc', '')
+call TestExtension("a2ps", "/etc/a2ps.cfg", "")
+call TestExtension("a2ps", "/usr/local/etc/a2ps.cfg", "")
+call TestExtension("a2ps", "/etc/a2ps/foobar.cfg", "")
+call TestExtension("a2ps", "/usr/local/etc/a2ps/foobar.cfg", "")
+call TestExtension("a2ps", "/tmp/a2psrc", "")
+call TestExtension("a2ps", "/tmp/.a2psrc", "")
 
 " ABAB/4
-call TestExtension('abap', 'foobar.abap', '')
+call TestExtension("abap", "foobar.abap", "")
 
 " ABC music notation
-call TestExtension('abc', 'foobar.abc', '')
+call TestExtension("abc", "foobar.abc", "")
 
 " ABEL
-call TestExtension('abel', 'foobar.abl', '')
+call TestExtension("abel", "foobar.abl", "")
 
 " AceDB
-call TestExtension('acedb', 'foobar.wrm', '')
+call TestExtension("acedb", "foobar.wrm", "")
 
 " Ada (83, 9X, 95)
-call TestExtension('ada', 'foobar.adb', '')
-call TestExtension('ada', 'foobar.ads', '')
-call TestExtension('ada', 'foobar.ada', '')
-call TestExtension('ada', 'foobar.gpr', '')
+call TestExtension("ada", "foobar.adb", "")
+call TestExtension("ada", "foobar.ads", "")
+call TestExtension("ada", "foobar.ada", "")
+call TestExtension("ada", "foobar.gpr", "")
 
 " AHDL
-call TestExtension('ahdl', 'foobar.tdf', '')
+call TestExtension("ahdl", "foobar.tdf", "")
 
 " AIDL
-call TestExtension('aidl', 'foobar.aidl', '')
+call TestExtension("aidl", "foobar.aidl", "")
 
 " AMPL
-call TestExtension('ampl', 'foobar.run', '')
+call TestExtension("ampl", "foobar.run", "")
 
 " Ant
-call TestExtension('ant', 'build.xml', '')
+call TestExtension("ant", "build.xml", "")
 
 " Arduino
-call TestExtension('arduino', 'foobar.ino', '')
-call TestExtension('arduino', 'foobar.pde', '')
+call TestExtension("arduino", "foobar.ino", "")
+call TestExtension("arduino", "foobar.pde", "")
 
 " Apache config file
-call TestExtension('apache', '.htaccess', '')
-call TestExtension('apache', '/etc/httpd/foobar.conf', '')
-call TestExtension('apache', '/etc/apache2/sites-foobar/foobar.com', '')
-call TestExtension('apache', '/usr/local/etc/httpd/foobar.conf', '')
-call TestExtension('apache', '/usr/local/etc/apache2/sites-foobar/foobar.com', '')
+call TestExtension("apache", ".htaccess", "")
+call TestExtension("apache", "/etc/httpd/foobar.conf", "")
+call TestExtension("apache", "/etc/apache2/sites-foobar/foobar.com", "")
+call TestExtension("apache", "/usr/local/etc/httpd/foobar.conf", "")
+call TestExtension("apache", "/usr/local/etc/apache2/sites-foobar/foobar.com", "")
 
 " XA65 MOS6510 cross assembler
-call TestExtension('a65', 'foobar.a65', '')
+call TestExtension("a65", "foobar.a65", "")
 
 " Applescript
-call TestExtension('applescript', 'foobar.scpt', '')
+call TestExtension("applescript", "foobar.scpt", "")
 
 " Applix ELF
-call TestExtension('elf', 'foobar.am', '')
-call TestExtension('automake', 'Makefile.am', '')
-call TestExtension('automake', 'makefile.am', '')
+call TestExtension("elf", "foobar.am", "")
+call TestExtension("automake", "Makefile.am", "")
+call TestExtension("automake", "makefile.am", "")
 
 " ALSA configuration
-call TestExtension('alsaconf', '.asoundrc', '')
-call TestExtension('alsaconf', '/usr/share/alsa/alsa.conf', '')
-call TestExtension('alsaconf', '/media/foo/usr/share/alsa/alsa.conf', '')
-call TestExtension('alsaconf', '/etc/asound.conf', '')
-call TestExtension('alsaconf', '/media/foo/etc/asound.conf', '')
+call TestExtension("alsaconf", ".asoundrc", "")
+call TestExtension("alsaconf", "/usr/share/alsa/alsa.conf", "")
+call TestExtension("alsaconf", "/media/foo/usr/share/alsa/alsa.conf", "")
+call TestExtension("alsaconf", "/etc/asound.conf", "")
+call TestExtension("alsaconf", "/media/foo/etc/asound.conf", "")
 
 " Arc Macro Language
-call TestExtension('aml', 'foobar.aml', '')
+call TestExtension("aml", "foobar.aml", "")
 
 " APT config file
-call TestExtension('aptconf', 'apt.conf', '')
-call TestExtension('aptconf', '/root/.aptitude/config', '')
-call TestExtension('aptconf', '/etc/apt/apt.conf.d/foo_bar-12', '')
-call TestExtension('aptconf', '/etc/apt/apt.conf.d/foo_bar-12.conf', '')
-call TestExtension('', '/etc/apt/apt.conf.d/.gsdf', '')
+call TestExtension("aptconf", "apt.conf", "")
+call TestExtension("aptconf", "/root/.aptitude/config", "")
+call TestExtension("aptconf", "/etc/apt/apt.conf.d/foo_bar-12", "")
+call TestExtension("aptconf", "/etc/apt/apt.conf.d/foo_bar-12.conf", "")
+call TestExtension("", "/etc/apt/apt.conf.d/.gsdf", "")
 
 " Arch Inventory file
-call TestExtension('arch', '.arch-inventory', '')
-call TestExtension('arch', '=tagging-method', '')
+call TestExtension("arch", ".arch-inventory", "")
+call TestExtension("arch", "=tagging-method", "")
 
 " ART*Enterprise (formerly ART-IM)
-call TestExtension('art', 'foobar.art', '')
+call TestExtension("art", "foobar.art", "")
 
 " AsciiDoc
-call TestExtension('asciidoc', 'foobar.asciidoc', '')
-call TestExtension('asciidoc', 'foobar.adoc', '')
+call TestExtension("asciidoc", "foobar.asciidoc", "")
+call TestExtension("asciidoc", "foobar.adoc", "")
 
 " ASN.1
-call TestExtension('asn', 'foobar.asn', '')
-call TestExtension('asn', 'foobar.asn1', '')
+call TestExtension("asn", "foobar.asn", "")
+call TestExtension("asn", "foobar.asn1", "")
 
 " Active Server Pages (with Visual Basic Script)
-call TestExtension('aspvbs', 'foobar.asa', '')
-let g:filetype_asa = 'fizfuz'
-call TestExtension('fizfuz', 'foobar.asa', '')
+call TestExtension("aspvbs", "foobar.asa", "")
+let g:filetype_asa = "fizfuz"
+call TestExtension("fizfuz", "foobar.asa", "")
 
 " Active Server Pages (with Perl or Visual Basic Script)
-call TestExtension('aspvbs', 'vbs.asp', "")
-call TestExtension('aspperl', 'perl.asp', "<Job ID=\"DropFiles\">\n<script language=\"PerlScript\">\n</script>\n</Job>")
-let g:filetype_asp = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.asp', '')
+call TestExtension("aspvbs", "vbs.asp", "")
+call TestExtension("aspperl", "perl.asp", "<Job ID=\"DropFiles\">\n<script language=\"PerlScript\">\n</script>\n</Job>")
+let g:filetype_asp = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.asp", "")
 
 
 " Grub (must be before catch *.lst)
-call TestExtension('grub', '/boot/grub/menu.lst', '')
-call TestExtension('grub', '/media/foobar/boot/grub/menu.lst', '')
-call TestExtension('grub', '/boot/grub/grub.conf', '')
-call TestExtension('grub', '/media/foobar/boot/grub/grub.conf', '')
-call TestExtension('grub', '/etc/grub.conf', '')
-call TestExtension('grub', '/media/foobar/etc/grub.conf', '')
+call TestExtension("grub", "/boot/grub/menu.lst", "")
+call TestExtension("grub", "/media/foobar/boot/grub/menu.lst", "")
+call TestExtension("grub", "/boot/grub/grub.conf", "")
+call TestExtension("grub", "/media/foobar/boot/grub/grub.conf", "")
+call TestExtension("grub", "/etc/grub.conf", "")
+call TestExtension("grub", "/media/foobar/etc/grub.conf", "")
 
 " Assembly (all kinds)
 " *.lst is not pure assembly, it has two extra columns (address, byte codes)
@@ -155,63 +155,127 @@ call TestExtension('grub', '/media/foobar/etc/grub.conf', '')
 au BufNewFile,BufRead *.asm,*.[sS],*.[aA],*.mac,*.lst	call dist#ft#FTasm()
 
 " Macro (VAX)
-call TestExtension('vmasm', 'foobar.mar', '')
+call TestExtension("vmasm", "foobar.mar", "")
 
 " Atlas
-call TestExtension('atlas', 'foobar.atl', '')
-call TestExtension('atlas', 'foobar.as', '')
+call TestExtension("atlas", "foobar.atl", "")
+call TestExtension("atlas", "foobar.as", "")
 
 " Autoit v3
-call TestExtension('autoit', 'foobar.au3', '')
+call TestExtension("autoit", "foobar.au3", "")
 
 " Autohotkey
-call TestExtension('autohotkey', 'foobar.ahk', '')
+call TestExtension("autohotkey", "foobar.ahk", "")
 
 " Automake
-call TestExtension('automake', 'Makefile.am', '')
-call TestExtension('automake', 'makefile.am', '')
-call TestExtension('automake', 'GNUmakefile.am', '')
+call TestExtension("automake", "Makefile.am", "")
+call TestExtension("automake", "makefile.am", "")
+call TestExtension("automake", "GNUmakefile.am", "")
 
 " Autotest .at files are actually m4
-call TestExtension('m4', 'foobar.at', '')
+call TestExtension("m4", "foobar.at", "")
 
 " Avenue
-call TestExtension('ave', 'foobar.ave', '')
+call TestExtension("ave", "foobar.ave", "")
 
 " Awk
-call TestExtension('awk', 'foobar.awk', '')
+call TestExtension("awk", "foobar.awk", "")
+
+" C++
+call TestExtension("c", "foobar.c", "")
+call TestExtension("cpp", "foobar.cxx", "")
+call TestExtension("cpp", "foobar.c++", "")
+call TestExtension("cpp", "foobar.hh", "")
+call TestExtension("cpp", "foobar.hxx", "")
+call TestExtension("cpp", "foobar.hpp", "")
+call TestExtension("cpp", "foobar.ipp", "")
+call TestExtension("cpp", "foobar.moc", "")
+call TestExtension("cpp", "foobar.tcc", "")
+call TestExtension("cpp", "foobar.inl", "")
 
 " vim-polyglot only
-call TestExtension('blade', 'test.blade.php', '')
-call TestExtension('yaml.ansible', 'playbook.yml', '')
-call TestExtension('yaml.ansible', 'host_vars/foobar', '')
-call TestExtension('yaml.ansible', 'handlers.foobar.yaml', '')
-call TestExtension('yaml.ansible', 'requirements.yaml', '')
-call TestExtension('ps1xml', 'foobar.ps1xml', '')
-call TestExtension('terraform', 'terraform.tf', '')
+call TestExtension("blade", "test.blade.php", "")
+call TestExtension("yaml.ansible", "playbook.yml", "")
+call TestExtension("yaml.ansible", "host_vars/foobar", "")
+call TestExtension("yaml.ansible", "handlers.foobar.yaml", "")
+call TestExtension("yaml.ansible", "requirements.yaml", "")
+call TestExtension("ps1xml", "foobar.ps1xml", "")
+call TestExtension("terraform", "terraform.tf", "")
+
+call TestExtension("idris2", "foobar.idr", "")
+call TestExtension("idris", "foobar.idr", "pkgs : List String\npkgs = [\"NCurses\", \"Readline\"]")
+let g:filetype_idr = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.idr", "")
 
 " .m extension
-call TestExtension('octave', 'matlab.m', '')
-call TestExtension('objc', 'objc.m', "\n\n  #import <Foundation/Foundation.h>")
-call TestExtension('octave', 'objc.m', "results_ub_times=zeros(2,2,M);\n%results pour la lower bound")
-call TestExtension('mma', 'mathematica.m', "newcase[ \"00003\" ];\n  (* Hello world *)")
-call TestExtension('murphi', 'murphi.m', "type\n  square: 1 .. 9")
-call TestExtension('murphi', 'murphi.m', "something\n--foobar")
-call TestExtension('octave', 'percentcomment.m', "hello world\n%foobar")
-call TestExtension('objc', 'comment.m', "\n/* Hello world */")
-let g:filetype_m = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.m', '')
+call TestExtension("octave", "matlab.m", "")
+call TestExtension("objc", "objc.m", "\n\n  #import <Foundation/Foundation.h>")
+call TestExtension("octave", "objc.m", "results_ub_times=zeros(2,2,M);\n%results pour la lower bound")
+call TestExtension("mma", "mathematica.m", "newcase[ \"00003\" ];\n  (* Hello world *)")
+call TestExtension("murphi", "murphi.m", "type\n  square: 1 .. 9")
+call TestExtension("murphi", "murphi.m", "something\n--foobar")
+call TestExtension("octave", "percentcomment.m", "hello world\n%foobar")
+call TestExtension("objc", "comment.m", "\n/* Hello world */")
+let g:filetype_m = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.m", "")
 
 " .fs extension
-call TestExtension('forth', 'empty.fs', '')
-call TestExtension('fsharp', 'fsharp.fs', "let myInt = 5")
-call TestExtension('glsl', 'glsl.fs', "//#version 120\nvoid main() {}")
-let g:filetype_fs = 'fizfuz'
-call TestExtension('fizfuz', 'fizfuz.fs', '')
+call TestExtension("forth", "empty.fs", "")
+call TestExtension("fsharp", "fsharp.fs", "let myInt = 5")
+call TestExtension("glsl", "glsl.fs", "//#version 120\nvoid main() {}")
+let g:filetype_fs = "fizfuz"
+call TestExtension("fizfuz", "fizfuz.fs", "")
 
 " .re extension
-call TestExtension('reason', 'empty.re', '')
-call TestExtension('cpp', 'cpp.re', '#include "config.h"')
-call TestExtension('cpp', 'cpp2.re', '#ifdef HAVE_CONFIG_H')
-call TestExtension('cpp', 'cpp3.re', '#define YYCTYPE unsigned char')
-call TestExtension('reason', 'react.re', 'ReasonReact.Router.push("");')
+call TestExtension("reason", "empty.re", "")
+call TestExtension("cpp", "cpp.re", "#include \"config.h\"")
+call TestExtension("cpp", "cpp2.re", "#ifdef HAVE_CONFIG_H")
+call TestExtension("cpp", "cpp3.re", "#define YYCTYPE unsigned char")
+call TestExtension("reason", "react.re", "ReasonReact.Router.push('');")
+
+" .bas extension
+call TestExtension("vbnet", "vb.vb", "")
+call TestExtension("basic", "empty.bas", "")
+call TestExtension("vb", "vb1.bas", "Attribute VB_Name = \"Class1\"")
+call TestExtension("vb", "vb2.bas", "VERSION 5.00\nBegin VB.Form Form1")
+call TestExtension("vb", "vb2.bas", "VERSION 5.00\nBegin VB.Form Form1")
+call TestExtension("vb", "vb.sba", "")
+call TestExtension("vb", "vb.vbs", "")
+call TestExtension("vb", "vb.dsm", "")
+call TestExtension("vb", "vb.dsm", "")
+call TestExtension("vb", "vb.ctl", "")
+
+" .idr extension
+call TestExtension("idris", "lowercase.idr", "--idris1")
+call TestExtension("idris", "uppercase.idr", "--Idris1")
+call TestExtension("idris", "start-space-l.idr", "-- idris1")
+call TestExtension("idris", "start-space-u.idr", "-- Idris1")
+call TestExtension("idris", "two-spaces-l.idr", "-- idris 1")
+call TestExtension("idris", "two-spaces-u.idr", "-- Idris 1")
+"call TestExtension("idris", "mypkg.ipkg", "package mypkg\n\npkgs = pruviloj, lightyear")
+call TestExtension("idris", "use-type-prov.idr", "%language TypeProviders")
+call TestExtension("idris", "use-elab-refl.idr", "%language ElabReflection")
+call TestExtension("idris", "access-modifier.idr", "%access export\n\npublic export\nMyTest : Type-> Type\n\nfact : Nat -> Nat")
+call TestExtension("idris2", "lowercase.idr", "--idris2")
+call TestExtension("idris2", "uppercase.idr", "--Idris2")
+call TestExtension("idris2", "start-space-l.idr", "-- idris2")
+call TestExtension("idris2", "start-space-u.idr", "-- Idris2")
+call TestExtension("idris2", "two-spaces-l.idr", "-- idris 2")
+call TestExtension("idris2", "two-spaces-u.idr", "-- Idris 2")
+call TestExtension("idris2", "mypkg.ipkg", "package mypkg\n\ndepends = effects")
+call TestExtension("idris2", "use-post-proj.idr", "%language PostfixProjections")
+
+" .lidr extension
+call TestExtension("lidris", "lidris-1.lidr", "Some test plaintext\n\n> --idris1\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
+call TestExtension("lidris2", "lidris-2.lidr", "Some test plaintext\n\n> --idris2\n> myfact : Nat -> Nat\n> myfact Z = 1\n> myfact (S k) = (S k) * myfact k\n\nMore plaintext")
+
+
+" .h extension
+call TestExtension("objcpp", "foo.h", "@interface MTNavigationController : UINavigationController")
+call TestExtension("cpp", "foo.h", "")
+let g:c_syntax_for_h = 1
+call TestExtension("objc", "foo.h", "@interface MTNavigationController : UINavigationController")
+call TestExtension("c", "foo.h", "")
+unlet g:c_syntax_for_h
+let g:ch_syntax_for_h = 1
+call TestExtension("ch", "foo.h", "")

scripts/test_filetypes.vim

@@ -45,8 +45,8 @@ call TestFiletype('autoit')
 call TestFiletype('ave')
 call TestFiletype('awk')
 call TestFiletype('reason')
-call TestFiletype('c')
 call TestFiletype('cpp')
+call TestFiletype('c')
 call TestFiletype('caddyfile')
 call TestFiletype('carp')
 call TestFiletype('clojure')
@@ -106,7 +106,10 @@ call TestFiletype('html')
 call TestFiletype('i3config')
 call TestFiletype('icalendar')
 call TestFiletype('idris')
+call TestFiletype('idris2')
+call TestFiletype('lidris2')
 call TestFiletype('ion')
+call TestFiletype('javascriptreact')
 call TestFiletype('javascript')
 call TestFiletype('flow')
 call TestFiletype('Jenkinsfile')
@@ -116,7 +119,6 @@ call TestFiletype('json5')
 call TestFiletype('json')
 call TestFiletype('jsonnet')
 call TestFiletype('jst')
-call TestFiletype('javascriptreact')
 call TestFiletype('julia')
 call TestFiletype('kotlin')
 call TestFiletype('ledger')
@@ -226,3 +228,5 @@ call TestFiletype('zephir')
 call TestFiletype('zir')
 call TestFiletype('zig')
 call TestFiletype('trasys')
+call TestFiletype('basic')
+call TestFiletype('vb')

syntax/basic.vim

@@ -0,0 +1,170 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'basic') == -1
+
+" Vim syntax file
+" Language:	BASIC
+" Maintainer:	Allan Kelly <allan@fruitloaf.co.uk>
+" Last Change:  2011 Dec 25 by Thilo Six
+
+" First version based on Micro$soft QBASIC circa 1989, as documented in
+" 'Learn BASIC Now' by Halvorson&Rygmyr. Microsoft Press 1989.
+" This syntax file not a complete implementation yet.  Send suggestions to the
+" maintainer.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" A bunch of useful BASIC keywords
+syn keyword basicStatement	BEEP beep Beep BLOAD bload Bload BSAVE bsave Bsave
+syn keyword basicStatement	CALL call Call ABSOLUTE absolute Absolute
+syn keyword basicStatement	CHAIN chain Chain CHDIR chdir Chdir
+syn keyword basicStatement	CIRCLE circle Circle CLEAR clear Clear
+syn keyword basicStatement	CLOSE close Close CLS cls Cls COLOR color Color
+syn keyword basicStatement	COM com Com COMMON common Common
+syn keyword basicStatement	CONST const Const DATA data Data
+syn keyword basicStatement	DECLARE declare Declare DEF def Def
+syn keyword basicStatement	DEFDBL defdbl Defdbl DEFINT defint Defint
+syn keyword basicStatement	DEFLNG deflng Deflng DEFSNG defsng Defsng
+syn keyword basicStatement	DEFSTR defstr Defstr DIM dim Dim
+syn keyword basicStatement	DO do Do LOOP loop Loop
+syn keyword basicStatement	DRAW draw Draw END end End
+syn keyword basicStatement	ENVIRON environ Environ ERASE erase Erase
+syn keyword basicStatement	ERROR error Error EXIT exit Exit
+syn keyword basicStatement	FIELD field Field FILES files Files
+syn keyword basicStatement	FOR for For NEXT next Next
+syn keyword basicStatement	FUNCTION function Function GET get Get
+syn keyword basicStatement	GOSUB gosub Gosub GOTO goto Goto
+syn keyword basicStatement	IF if If THEN then Then ELSE else Else
+syn keyword basicStatement	INPUT input Input INPUT# input# Input#
+syn keyword basicStatement	IOCTL ioctl Ioctl KEY key Key
+syn keyword basicStatement	KILL kill Kill LET let Let
+syn keyword basicStatement	LINE line Line LOCATE locate Locate
+syn keyword basicStatement	LOCK lock Lock UNLOCK unlock Unlock
+syn keyword basicStatement	LPRINT lprint Lprint USING using Using
+syn keyword basicStatement	LSET lset Lset MKDIR mkdir Mkdir
+syn keyword basicStatement	NAME name Name ON on On
+syn keyword basicStatement	ERROR error Error OPEN open Open
+syn keyword basicStatement	OPTION option Option BASE base Base
+syn keyword basicStatement	OUT out Out PAINT paint Paint
+syn keyword basicStatement	PALETTE palette Palette PCOPY pcopy Pcopy
+syn keyword basicStatement	PEN pen Pen PLAY play Play
+syn keyword basicStatement	PMAP pmap Pmap POKE poke Poke
+syn keyword basicStatement	PRESET preset Preset PRINT print Print
+syn keyword basicStatement	PRINT# print# Print# USING using Using
+syn keyword basicStatement	PSET pset Pset PUT put Put
+syn keyword basicStatement	RANDOMIZE randomize Randomize READ read Read
+syn keyword basicStatement	REDIM redim Redim RESET reset Reset
+syn keyword basicStatement	RESTORE restore Restore RESUME resume Resume
+syn keyword basicStatement	RETURN return Return RMDIR rmdir Rmdir
+syn keyword basicStatement	RSET rset Rset RUN run Run
+syn keyword basicStatement	SEEK seek Seek SELECT select Select
+syn keyword basicStatement	CASE case Case SHARED shared Shared
+syn keyword basicStatement	SHELL shell Shell SLEEP sleep Sleep
+syn keyword basicStatement	SOUND sound Sound STATIC static Static
+syn keyword basicStatement	STOP stop Stop STRIG strig Strig
+syn keyword basicStatement	SUB sub Sub SWAP swap Swap
+syn keyword basicStatement	SYSTEM system System TIMER timer Timer
+syn keyword basicStatement	TROFF troff Troff TRON tron Tron
+syn keyword basicStatement	TYPE type Type UNLOCK unlock Unlock
+syn keyword basicStatement	VIEW view View WAIT wait Wait
+syn keyword basicStatement	WHILE while While WEND wend Wend
+syn keyword basicStatement	WIDTH width Width WINDOW window Window
+syn keyword basicStatement	WRITE write Write DATE$ date$ Date$
+syn keyword basicStatement	MID$ mid$ Mid$ TIME$ time$ Time$
+
+syn keyword basicFunction	ABS abs Abs ASC asc Asc
+syn keyword basicFunction	ATN atn Atn CDBL cdbl Cdbl
+syn keyword basicFunction	CINT cint Cint CLNG clng Clng
+syn keyword basicFunction	COS cos Cos CSNG csng Csng
+syn keyword basicFunction	CSRLIN csrlin Csrlin CVD cvd Cvd
+syn keyword basicFunction	CVDMBF cvdmbf Cvdmbf CVI cvi Cvi
+syn keyword basicFunction	CVL cvl Cvl CVS cvs Cvs
+syn keyword basicFunction	CVSMBF cvsmbf Cvsmbf EOF eof Eof
+syn keyword basicFunction	ERDEV erdev Erdev ERL erl Erl
+syn keyword basicFunction	ERR err Err EXP exp Exp
+syn keyword basicFunction	FILEATTR fileattr Fileattr FIX fix Fix
+syn keyword basicFunction	FRE fre Fre FREEFILE freefile Freefile
+syn keyword basicFunction	INP inp Inp INSTR instr Instr
+syn keyword basicFunction	INT int Int LBOUND lbound Lbound
+syn keyword basicFunction	LEN len Len LOC loc Loc
+syn keyword basicFunction	LOF lof Lof LOG log Log
+syn keyword basicFunction	LPOS lpos Lpos PEEK peek Peek
+syn keyword basicFunction	PEN pen Pen POINT point Point
+syn keyword basicFunction	POS pos Pos RND rnd Rnd
+syn keyword basicFunction	SADD sadd Sadd SCREEN screen Screen
+syn keyword basicFunction	SEEK seek Seek SETMEM setmem Setmem
+syn keyword basicFunction	SGN sgn Sgn SIN sin Sin
+syn keyword basicFunction	SPC spc Spc SQR sqr Sqr
+syn keyword basicFunction	STICK stick Stick STRIG strig Strig
+syn keyword basicFunction	TAB tab Tab TAN tan Tan
+syn keyword basicFunction	UBOUND ubound Ubound VAL val Val
+syn keyword basicFunction	VALPTR valptr Valptr VALSEG valseg Valseg
+syn keyword basicFunction	VARPTR varptr Varptr VARSEG varseg Varseg
+syn keyword basicFunction	CHR$ Chr$ chr$ COMMAND$ command$ Command$
+syn keyword basicFunction	DATE$ date$ Date$ ENVIRON$ environ$ Environ$
+syn keyword basicFunction	ERDEV$ erdev$ Erdev$ HEX$ hex$ Hex$
+syn keyword basicFunction	INKEY$ inkey$ Inkey$ INPUT$ input$ Input$
+syn keyword basicFunction	IOCTL$ ioctl$ Ioctl$ LCASES$ lcases$ Lcases$
+syn keyword basicFunction	LAFT$ laft$ Laft$ LTRIM$ ltrim$ Ltrim$
+syn keyword basicFunction	MID$ mid$ Mid$ MKDMBF$ mkdmbf$ Mkdmbf$
+syn keyword basicFunction	MKD$ mkd$ Mkd$ MKI$ mki$ Mki$
+syn keyword basicFunction	MKL$ mkl$ Mkl$ MKSMBF$ mksmbf$ Mksmbf$
+syn keyword basicFunction	MKS$ mks$ Mks$ OCT$ oct$ Oct$
+syn keyword basicFunction	RIGHT$ right$ Right$ RTRIM$ rtrim$ Rtrim$
+syn keyword basicFunction	SPACE$ space$ Space$ STR$ str$ Str$
+syn keyword basicFunction	STRING$ string$ String$ TIME$ time$ Time$
+syn keyword basicFunction	UCASE$ ucase$ Ucase$ VARPTR$ varptr$ Varptr$
+syn keyword basicTodo contained	TODO
+
+"integer number, or floating point number without a dot.
+syn match  basicNumber		"\<\d\+\>"
+"floating point number, with dot
+syn match  basicNumber		"\<\d\+\.\d*\>"
+"floating point number, starting with a dot
+syn match  basicNumber		"\.\d\+\>"
+
+" String and Character contstants
+syn match   basicSpecial contained "\\\d\d\d\|\\."
+syn region  basicString		  start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=basicSpecial
+
+syn region  basicComment	start="REM" end="$" contains=basicTodo
+syn region  basicComment	start="^[ \t]*'" end="$" contains=basicTodo
+syn region  basicLineNumber	start="^\d" end="\s"
+syn match   basicTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+" Used with OPEN statement
+syn match   basicFilenumber  "#\d\+"
+"syn sync ccomment basicComment
+" syn match   basicMathsOperator "[<>+\*^/\\=-]"
+syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link basicLabel		Label
+hi def link basicConditional	Conditional
+hi def link basicRepeat		Repeat
+hi def link basicLineNumber	Comment
+hi def link basicNumber		Number
+hi def link basicError		Error
+hi def link basicStatement	Statement
+hi def link basicString		String
+hi def link basicComment		Comment
+hi def link basicSpecial		Special
+hi def link basicTodo		Todo
+hi def link basicFunction		Identifier
+hi def link basicTypeSpecifier Type
+hi def link basicFilenumber basicTypeSpecifier
+"hi basicMathsOperator term=bold cterm=bold gui=bold
+
+
+let b:current_syntax = "basic"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+" vim: ts=8
+
+endif

syntax/go.vim

@@ -424,8 +424,8 @@ function! s:hi()
 
   " :GoDebug commands
   if go#config#HighlightDebug()
-    hi GoDebugBreakpoint term=standout ctermbg=117 ctermfg=0 guibg=#BAD4F5  guifg=Black
-    hi GoDebugCurrent term=reverse  ctermbg=12  ctermfg=7 guibg=DarkBlue guifg=White
+    hi def GoDebugBreakpoint term=standout ctermbg=117 ctermfg=0 guibg=#BAD4F5  guifg=Black
+    hi def GoDebugCurrent term=reverse  ctermbg=12  ctermfg=7 guibg=DarkBlue guifg=White
   endif
 endfunction
 

syntax/groovy.vim

@@ -0,0 +1,454 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'groovy') == -1
+
+" Vim syntax file
+" Language:	Groovy
+" Original Author:	Alessio Pace <billy.corgan AT tiscali.it>
+" Maintainer:	Tobias Rapp <yahuxo+vim AT mailbox.org>
+" Version: 	0.1.17
+" URL:	  http://www.vim.org/scripts/script.php?script_id=945
+" Last Change:	2020 May 26
+
+" THE ORIGINAL AUTHOR'S NOTES:
+"
+" This is my very first vim script, I hope to have
+" done it the right way.
+"
+" I must directly or indirectly thank the author of java.vim and ruby.vim:
+" I copied from them most of the stuff :-)
+"
+" Relies on html.vim
+
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
+"
+" HOWTO USE IT (INSTALL) when not part of the distribution:
+"
+" 1) copy the file in the (global or user's $HOME/.vim/syntax/) syntax folder
+"
+" 2) add this line to recognize groovy files by filename extension:
+"
+" au BufNewFile,BufRead *.groovy  setf groovy
+" in the global vim filetype.vim file or inside $HOME/.vim/filetype.vim
+"
+" 3) add this part to recognize by content groovy script (no extension needed :-)
+"
+"  if did_filetype()
+"    finish
+"  endif
+"  if getline(1) =~ '^#!.*[/\\]groovy\>'
+"    setf groovy
+"  endif
+"
+"  in the global scripts.vim file or in $HOME/.vim/scripts.vim
+"
+" 4) open/write a .groovy file or a groovy script :-)
+"
+" Let me know if you like it or send me patches, so that I can improve it
+" when I have time
+
+" quit when a syntax file was already loaded
+if !exists("main_syntax")
+  if exists("b:current_syntax")
+    finish
+  endif
+  " we define it here so that included files can test for it
+  let main_syntax='groovy'
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" ##########################
+" Java stuff taken from java.vim
+" some characters that cannot be in a groovy program (outside a string)
+" syn match groovyError "[\\@`]"
+"syn match groovyError "<<<\|\.\.\|=>\|<>\|||=\|&&=\|[^-]->\|\*\/"
+"syn match groovyOK "\.\.\."
+
+" keyword definitions
+syn keyword groovyExternal        native package
+syn match groovyExternal          "\<import\>\(\s\+static\>\)\?"
+syn keyword groovyError           goto const
+syn keyword groovyConditional     if else switch
+syn keyword groovyRepeat          while for do
+syn keyword groovyBoolean         true false
+syn keyword groovyConstant        null
+syn keyword groovyTypedef         this super
+syn keyword groovyOperator        new instanceof
+syn keyword groovyType            boolean char byte short int long float double
+syn keyword groovyType            void
+syn keyword groovyType		  Integer Double Date Boolean Float String Array Vector List
+syn keyword groovyStatement       return
+syn keyword groovyStorageClass    static synchronized transient volatile final strictfp serializable
+syn keyword groovyExceptions      throw try catch finally
+syn keyword groovyAssert          assert
+syn keyword groovyMethodDecl      synchronized throws
+syn keyword groovyClassDecl       extends implements interface
+" to differentiate the keyword class from MyClass.class we use a match here
+syn match   groovyTypedef         "\.\s*\<class\>"ms=s+1
+syn keyword groovyClassDecl         enum
+syn match   groovyClassDecl       "^class\>"
+syn match   groovyClassDecl       "[^.]\s*\<class\>"ms=s+1
+syn keyword groovyBranch          break continue nextgroup=groovyUserLabelRef skipwhite
+syn match   groovyUserLabelRef    "\k\+" contained
+syn keyword groovyScopeDecl       public protected private abstract
+
+
+if exists("groovy_highlight_groovy_lang_ids") || exists("groovy_highlight_groovy_lang") || exists("groovy_highlight_all")
+  " groovy.lang.*
+  syn keyword groovyLangClass  Closure MetaMethod GroovyObject
+
+  syn match groovyJavaLangClass "\<System\>"
+  syn keyword groovyJavaLangClass  Cloneable Comparable Runnable Serializable Boolean Byte Class Object
+  syn keyword groovyJavaLangClass  Character CharSequence ClassLoader Compiler
+  " syn keyword groovyJavaLangClass  Integer Double Float Long
+  syn keyword groovyJavaLangClass  InheritableThreadLocal Math Number Object Package Process
+  syn keyword groovyJavaLangClass  Runtime RuntimePermission InheritableThreadLocal
+  syn keyword groovyJavaLangClass  SecurityManager Short StrictMath StackTraceElement
+  syn keyword groovyJavaLangClass  StringBuffer Thread ThreadGroup
+  syn keyword groovyJavaLangClass  ThreadLocal Throwable Void ArithmeticException
+  syn keyword groovyJavaLangClass  ArrayIndexOutOfBoundsException AssertionError
+  syn keyword groovyJavaLangClass  ArrayStoreException ClassCastException
+  syn keyword groovyJavaLangClass  ClassNotFoundException
+  syn keyword groovyJavaLangClass  CloneNotSupportedException Exception
+  syn keyword groovyJavaLangClass  IllegalAccessException
+  syn keyword groovyJavaLangClass  IllegalArgumentException
+  syn keyword groovyJavaLangClass  IllegalMonitorStateException
+  syn keyword groovyJavaLangClass  IllegalStateException
+  syn keyword groovyJavaLangClass  IllegalThreadStateException
+  syn keyword groovyJavaLangClass  IndexOutOfBoundsException
+  syn keyword groovyJavaLangClass  InstantiationException InterruptedException
+  syn keyword groovyJavaLangClass  NegativeArraySizeException NoSuchFieldException
+  syn keyword groovyJavaLangClass  NoSuchMethodException NullPointerException
+  syn keyword groovyJavaLangClass  NumberFormatException RuntimeException
+  syn keyword groovyJavaLangClass  SecurityException StringIndexOutOfBoundsException
+  syn keyword groovyJavaLangClass  UnsupportedOperationException
+  syn keyword groovyJavaLangClass  AbstractMethodError ClassCircularityError
+  syn keyword groovyJavaLangClass  ClassFormatError Error ExceptionInInitializerError
+  syn keyword groovyJavaLangClass  IllegalAccessError InstantiationError
+  syn keyword groovyJavaLangClass  IncompatibleClassChangeError InternalError
+  syn keyword groovyJavaLangClass  LinkageError NoClassDefFoundError
+  syn keyword groovyJavaLangClass  NoSuchFieldError NoSuchMethodError
+  syn keyword groovyJavaLangClass  OutOfMemoryError StackOverflowError
+  syn keyword groovyJavaLangClass  ThreadDeath UnknownError UnsatisfiedLinkError
+  syn keyword groovyJavaLangClass  UnsupportedClassVersionError VerifyError
+  syn keyword groovyJavaLangClass  VirtualMachineError
+
+  syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
+  syn keyword groovyJavaLangObject notify notifyAll toString wait
+
+  hi def link groovyLangClass                   groovyConstant
+  hi def link groovyJavaLangClass               groovyExternal
+  hi def link groovyJavaLangObject              groovyConstant
+  syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
+  syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
+endif
+
+
+" Groovy stuff
+syn match groovyOperator "\.\."
+syn match groovyOperator "<\{2,3}"
+syn match groovyOperator ">\{2,3}"
+syn match groovyOperator "->"
+syn match groovyLineComment       '^\%1l#!.*'  " Shebang line
+syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
+
+" Groovy JDK stuff
+syn keyword groovyJDKBuiltin    as def in
+syn keyword groovyJDKOperOverl  div minus plus abs round power multiply
+syn keyword groovyJDKMethods 	each call inject sort print println
+syn keyword groovyJDKMethods    getAt putAt size push pop toList getText writeLine eachLine readLines
+syn keyword groovyJDKMethods    withReader withStream withWriter withPrintWriter write read leftShift
+syn keyword groovyJDKMethods    withWriterAppend readBytes splitEachLine
+syn keyword groovyJDKMethods    newInputStream newOutputStream newPrintWriter newReader newWriter
+syn keyword groovyJDKMethods    compareTo next previous isCase
+syn keyword groovyJDKMethods    times step toInteger upto any collect dump every find findAll grep
+syn keyword groovyJDKMethods    inspect invokeMethods join
+syn keyword groovyJDKMethods    getErr getIn getOut waitForOrKill
+syn keyword groovyJDKMethods    count tokenize asList flatten immutable intersect reverse reverseEach
+syn keyword groovyJDKMethods    subMap append asWritable eachByte eachLine eachFile
+syn cluster groovyTop add=groovyJDKBuiltin,groovyJDKOperOverl,groovyJDKMethods
+
+" no useful I think, so I comment it..
+"if filereadable(expand("<sfile>:p:h")."/groovyid.vim")
+ " source <sfile>:p:h/groovyid.vim
+"endif
+
+if exists("groovy_space_errors")
+  if !exists("groovy_no_trail_space_error")
+    syn match   groovySpaceError  "\s\+$"
+  endif
+  if !exists("groovy_no_tab_space_error")
+    syn match   groovySpaceError  " \+\t"me=e-1
+  endif
+endif
+
+" it is a better case construct than java.vim to match groovy syntax
+syn region  groovyLabelRegion     transparent matchgroup=groovyLabel start="\<case\>" matchgroup=NONE end=":\|$" contains=groovyNumber,groovyString,groovyLangClass,groovyJavaLangClass
+syn match   groovyUserLabel       "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=groovyLabel
+syn keyword groovyLabel           default
+
+if !exists("groovy_allow_cpp_keywords")
+  syn keyword groovyError auto delete extern friend inline redeclared
+  syn keyword groovyError register signed sizeof struct template typedef union
+  syn keyword groovyError unsigned operator
+endif
+
+" The following cluster contains all groovy groups except the contained ones
+syn cluster groovyTop add=groovyExternal,groovyError,groovyError,groovyBranch,groovyLabelRegion,groovyLabel,groovyConditional,groovyRepeat,groovyBoolean,groovyConstant,groovyTypedef,groovyOperator,groovyType,groovyType,groovyStatement,groovyStorageClass,groovyAssert,groovyExceptions,groovyMethodDecl,groovyClassDecl,groovyClassDecl,groovyClassDecl,groovyScopeDecl,groovyError,groovyError2,groovyUserLabel,groovyLangObject
+
+
+" Comments
+syn keyword groovyTodo             contained TODO FIXME XXX
+if exists("groovy_comment_strings")
+  syn region  groovyCommentString    contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=groovySpecial,groovyCommentStar,groovySpecialChar,@Spell
+  syn region  groovyComment2String   contained start=+"+  end=+$\|"+  contains=groovySpecial,groovySpecialChar,@Spell
+  syn match   groovyCommentCharacter contained "'\\[^']\{1,6\}'" contains=groovySpecialChar
+  syn match   groovyCommentCharacter contained "'\\''" contains=groovySpecialChar
+  syn match   groovyCommentCharacter contained "'[^\\]'"
+  syn cluster groovyCommentSpecial add=groovyCommentString,groovyCommentCharacter,groovyNumber
+  syn cluster groovyCommentSpecial2 add=groovyComment2String,groovyCommentCharacter,groovyNumber
+endif
+syn region  groovyComment          start="/\*"  end="\*/" contains=@groovyCommentSpecial,groovyTodo,@Spell
+syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
+syn match   groovyCommentStar      contained "^\s*\*$"
+syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
+hi def link groovyCommentString groovyString
+hi def link groovyComment2String groovyString
+hi def link groovyCommentCharacter groovyCharacter
+
+syn cluster groovyTop add=groovyComment,groovyLineComment
+
+if !exists("groovy_ignore_groovydoc") && main_syntax != 'jsp'
+  syntax case ignore
+  " syntax coloring for groovydoc comments (HTML)
+  " syntax include @groovyHtml <sfile>:p:h/html.vim
+   syntax include @groovyHtml runtime! syntax/html.vim
+  unlet b:current_syntax
+  syntax spell default  " added by Bram
+  syn region  groovyDocComment    start="/\*\*"  end="\*/" keepend contains=groovyCommentTitle,@groovyHtml,groovyDocTags,groovyTodo,@Spell
+  syn region  groovyCommentTitle  contained matchgroup=groovyDocComment start="/\*\*"   matchgroup=groovyCommentTitle keepend end="\.$" end="\.[ \t\r<&]"me=e-1 end="[^{]@"me=s-2,he=s-1 end="\*/"me=s-1,he=s-1 contains=@groovyHtml,groovyCommentStar,groovyTodo,@Spell,groovyDocTags
+
+  syn region groovyDocTags  contained start="{@\(link\|linkplain\|inherit[Dd]oc\|doc[rR]oot\|value\)" end="}"
+  syn match  groovyDocTags  contained "@\(see\|param\|exception\|throws\|since\)\s\+\S\+" contains=groovyDocParam
+  syn match  groovyDocParam contained "\s\S\+"
+  syn match  groovyDocTags  contained "@\(version\|author\|return\|deprecated\|serial\|serialField\|serialData\)\>"
+  syntax case match
+endif
+
+" match the special comment /**/
+syn match   groovyComment          "/\*\*/"
+
+" Strings and constants
+syn match   groovySpecialError     contained "\\."
+syn match   groovySpecialCharError contained "[^']"
+syn match   groovySpecialChar      contained "\\\([4-9]\d\|[0-3]\d\d\|[\"\\'ntbrf]\|u\x\{4\}\|\$\)"
+syn match   groovyRegexChar        contained "\\."
+syn region  groovyString          start=+"+ end=+"+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'+ end=+'+ end=+$+ contains=groovySpecialChar,groovySpecialError,@Spell
+syn region  groovyString          start=+"""+ end=+"""+ contains=groovySpecialChar,groovySpecialError,@Spell,groovyELExpr
+syn region  groovyString          start=+'''+ end=+'''+ contains=groovySpecialChar,groovySpecialError,@Spell
+if exists("groovy_regex_strings")
+  " regex strings interfere with the division operator and thus are disabled
+  " by default
+  syn region groovyString         start='/[^/*]' end='/' contains=groovySpecialChar,groovyRegexChar,groovyELExpr
+endif
+" syn region groovyELExpr start=+${+ end=+}+ keepend contained
+syn match groovyELExpr /\${.\{-}}/ contained
+syn match groovyELExpr /\$[a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE_][a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE0-9_.]*/ contained
+hi def link groovyELExpr Identifier
+
+" TODO: better matching. I am waiting to understand how it really works in groovy
+" syn region  groovyClosureParamsBraces          start=+|+ end=+|+ contains=groovyClosureParams
+" syn match groovyClosureParams	"[ a-zA-Z0-9_*]\+" contained
+" hi def link groovyClosureParams Identifier
+
+" next line disabled, it can cause a crash for a long line
+"syn match   groovyStringError      +"\([^"\\]\|\\.\)*$+
+
+" disabled: in groovy strings or characters are written the same
+" syn match   groovyCharacter        "'[^']*'" contains=groovySpecialChar,groovySpecialCharError
+" syn match   groovyCharacter        "'\\''" contains=groovySpecialChar
+" syn match   groovyCharacter        "'[^\\]'"
+syn match   groovyNumber           "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+syn match   groovyNumber           "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+syn match   groovyNumber           "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+syn match   groovyNumber           "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+
+" unicode characters
+syn match   groovySpecial "\\u\d\{4\}"
+
+syn cluster groovyTop add=groovyString,groovyCharacter,groovyNumber,groovySpecial,groovyStringError
+
+if exists("groovy_highlight_functions")
+  if groovy_highlight_functions == "indent"
+    syn match  groovyFuncDef "^\(\t\| \{8\}\)[_$a-zA-Z][_$a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^\(\t\| \{8\}\)[$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn match  groovyFuncDef "^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*)" contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+    syn region groovyFuncDef start=+^  [$_a-zA-Z][$_a-zA-Z0-9_. \[\]]*([^-+*/()]*,\s*+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,@groovyClasses
+  else
+    " This line catches method declarations at any indentation>0, but it assumes
+    " two things:
+    "   1. class names are always capitalized (ie: Button)
+    "   2. method names are never capitalized (except constructors, of course)
+    syn region groovyFuncDef start=+^\s\+\(\(public\|protected\|private\|static\|abstract\|final\|native\|synchronized\)\s\+\)*\(\(void\|boolean\|char\|byte\|short\|int\|long\|float\|double\|\([A-Za-z_][A-Za-z0-9_$]*\.\)*[A-Z][A-Za-z0-9_$]*\)\(<[^>]*>\)\=\(\[\]\)*\s\+[a-z][A-Za-z0-9_$]*\|[A-Z][A-Za-z0-9_$]*\)\s*([^0-9]+ end=+)+ contains=groovyScopeDecl,groovyType,groovyStorageClass,groovyComment,groovyLineComment,@groovyClasses
+  endif
+  syn match  groovyBraces  "[{}]"
+  syn cluster groovyTop add=groovyFuncDef,groovyBraces
+endif
+
+if exists("groovy_highlight_debug")
+
+  " Strings and constants
+  syn match   groovyDebugSpecial          contained "\\\d\d\d\|\\."
+  syn region  groovyDebugString           contained start=+"+  end=+"+  contains=groovyDebugSpecial
+  syn match   groovyDebugStringError      +"\([^"\\]\|\\.\)*$+
+  syn match   groovyDebugCharacter        contained "'[^\\]'"
+  syn match   groovyDebugSpecialCharacter contained "'\\.'"
+  syn match   groovyDebugSpecialCharacter contained "'\\''"
+  syn match   groovyDebugNumber           contained "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"
+  syn match   groovyDebugNumber           contained "\(\<\d\+\.\d*\|\.\d\+\)\([eE][-+]\=\d\+\)\=[fFdD]\="
+  syn match   groovyDebugNumber           contained "\<\d\+[eE][-+]\=\d\+[fFdD]\=\>"
+  syn match   groovyDebugNumber           contained "\<\d\+\([eE][-+]\=\d\+\)\=[fFdD]\>"
+  syn keyword groovyDebugBoolean          contained true false
+  syn keyword groovyDebugType             contained null this super
+  syn region groovyDebugParen  start=+(+ end=+)+ contained contains=groovyDebug.*,groovyDebugParen
+
+  " to make this work you must define the highlighting for these groups
+  syn match groovyDebug "\<System\.\(out\|err\)\.print\(ln\)*\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "\<p\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+  syn match groovyDebug "\<trace[SL]\=\s*("me=e-1 contains=groovyDebug.* nextgroup=groovyDebugParen
+
+  syn cluster groovyTop add=groovyDebug
+
+  hi def link groovyDebug                 Debug
+  hi def link groovyDebugString           DebugString
+  hi def link groovyDebugStringError      groovyError
+  hi def link groovyDebugType             DebugType
+  hi def link groovyDebugBoolean          DebugBoolean
+  hi def link groovyDebugNumber           Debug
+  hi def link groovyDebugSpecial          DebugSpecial
+  hi def link groovyDebugSpecialCharacter DebugSpecial
+  hi def link groovyDebugCharacter        DebugString
+  hi def link groovyDebugParen            Debug
+
+  hi def link DebugString               String
+  hi def link DebugSpecial              Special
+  hi def link DebugBoolean              Boolean
+  hi def link DebugType                 Type
+endif
+
+" Match all Exception classes
+syn match groovyExceptions        "\<Exception\>\|\<[A-Z]\{1,}[a-zA-Z0-9]*Exception\>"
+
+
+if !exists("groovy_minlines")
+  let groovy_minlines = 10
+endif
+exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
+
+
+" ###################
+" Groovy stuff
+" syn match groovyOperator		"|[ ,a-zA-Z0-9_*]\+|"
+
+" All groovy valid tokens
+" syn match groovyTokens ";\|,\|<=>\|<>\|:\|:=\|>\|>=\|=\|==\|<\|<=\|!=\|/\|/=\|\.\.|\.\.\.\|\~=\|\~=="
+" syn match groovyTokens "\*=\|&\|&=\|\*\|->\|\~\|+\|-\|/\|?\|<<<\|>>>\|<<\|>>"
+
+" Must put explicit these ones because groovy.vim mark them as errors otherwise
+" syn match groovyTokens "<=>\|<>\|==\~"
+"syn cluster groovyTop add=groovyTokens
+
+" Mark these as operators
+
+" Hightlight brackets
+" syn match  groovyBraces		"[{}]"
+" syn match  groovyBraces		"[\[\]]"
+" syn match  groovyBraces		"[\|]"
+
+if exists("groovy_mark_braces_in_parens_as_errors")
+  syn match groovyInParen          contained "[{}]"
+  hi def link groovyInParen        groovyError
+  syn cluster groovyTop add=groovyInParen
+endif
+
+" catch errors caused by wrong parenthesis
+syn region  groovyParenT  transparent matchgroup=groovyParen  start="("  end=")" contains=@groovyTop,groovyParenT1
+syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
+syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT  contained
+syn match   groovyParenError       ")"
+hi def link groovyParenError       groovyError
+
+" catch errors caused by wrong square parenthesis
+syn region  groovyParenT  transparent matchgroup=groovyParen  start="\["  end="\]" contains=@groovyTop,groovyParenT1
+syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="\[" end="\]" contains=@groovyTop,groovyParenT2 contained
+syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="\[" end="\]" contains=@groovyTop,groovyParenT  contained
+syn match   groovyParenError       "\]"
+
+" ###############################
+" java.vim default highlighting
+hi def link groovyFuncDef		Function
+hi def link groovyBraces		Function
+hi def link groovyBranch		Conditional
+hi def link groovyUserLabelRef	groovyUserLabel
+hi def link groovyLabel		Label
+hi def link groovyUserLabel		Label
+hi def link groovyConditional	Conditional
+hi def link groovyRepeat		Repeat
+hi def link groovyExceptions		Exception
+hi def link groovyAssert 		Statement
+hi def link groovyStorageClass	StorageClass
+hi def link groovyMethodDecl		groovyStorageClass
+hi def link groovyClassDecl		groovyStorageClass
+hi def link groovyScopeDecl		groovyStorageClass
+hi def link groovyBoolean		Boolean
+hi def link groovySpecial		Special
+hi def link groovySpecialError	Error
+hi def link groovySpecialCharError	Error
+hi def link groovyString		String
+hi def link groovyRegexChar		String
+hi def link groovyCharacter		Character
+hi def link groovySpecialChar	SpecialChar
+hi def link groovyNumber		Number
+hi def link groovyError		Error
+hi def link groovyStringError	Error
+hi def link groovyStatement		Statement
+hi def link groovyOperator		Operator
+hi def link groovyComment		Comment
+hi def link groovyDocComment		Comment
+hi def link groovyLineComment	Comment
+hi def link groovyConstant		Constant
+hi def link groovyTypedef		Typedef
+hi def link groovyTodo		Todo
+
+hi def link groovyCommentTitle	SpecialComment
+hi def link groovyDocTags		Special
+hi def link groovyDocParam		Function
+hi def link groovyCommentStar	groovyComment
+
+hi def link groovyType		Type
+hi def link groovyExternal		Include
+
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link groovySpaceError		Error
+hi def link groovyJDKBuiltin         Special
+hi def link groovyJDKOperOverl       Operator
+hi def link groovyJDKMethods         Function
+
+
+let b:current_syntax = "groovy"
+if main_syntax == 'groovy'
+  unlet main_syntax
+endif
+
+let b:spell_options="contained"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: ts=8
+
+endif

syntax/html-1.vim

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

syntax/html-2.vim

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

syntax/html.vim

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

syntax/idris2.vim

@@ -0,0 +1,85 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" syntax highlighting for Idris 2 (idris-lang.org)
+"
+" Heavily modified version of the haskell syntax
+" highlighter to support Idris 2.
+"
+" author: raichoo (raichoo@googlemail.com)
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn match idrisTypeDecl "[a-zA-Z][a-zA-z0-9_']*\s\+:\s\+"
+  \ contains=idrisIdentifier,idrisOperators
+syn region idrisParens matchgroup=idrisDelimiter start="(" end=")" contains=TOP,idrisTypeDecl
+syn region idrisBrackets matchgroup=idrisDelimiter start="\[" end="]" contains=TOP,idrisTypeDecl
+syn region idrisBlock matchgroup=idrisDelimiter start="{" end="}" contains=TOP,idrisTypeDecl
+syn keyword idrisModule module namespace
+syn keyword idrisImport import
+syn keyword idrisStructure data record interface implementation
+syn keyword idrisWhere where
+syn keyword idrisVisibility public abstract private export
+syn keyword idrisBlock parameters mutual using
+syn keyword idrisTotality total partial covering
+syn keyword idrisAnnotation auto impossible default constructor
+syn keyword idrisStatement do case of rewrite with
+syn keyword idrisLet let in
+syn keyword idrisForall forall
+syn keyword idrisDataOpt noHints uniqueSearch search external noNewtype containedin=idrisBrackets
+syn match idrisSyntax "\(pattern \+\|term \+\)\?syntax"
+syn keyword idrisConditional if then else
+syn match idrisNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>"
+syn match idrisFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>"
+syn match idrisDelimiter  "[,;]"
+syn keyword idrisInfix prefix infix infixl infixr
+syn match idrisOperators "\([-!#$%&\*\+./<=>\?@\\^|~:]\|\<_\>\)"
+syn match idrisType "\<[A-Z][a-zA-Z0-9_']*\>"
+syn keyword idrisTodo TODO FIXME XXX HACK contained
+syn match idrisLineComment "---*\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
+syn match idrisDocComment "|||\([^-!#$%&\*\+./<=>\?@\\^|~].*\)\?$" contains=idrisTodo,@Spell
+syn match idrisMetaVar "?[a-z][A-Za-z0-9_']*"
+syn match idrisPragma "%\(hide\|logging\|auto_lazy\|unbound_implicits\|undotted_record_projections\|amibguity_depth\|pair\|rewrite\|integerLit\|stringLit\|charLit\|name\|start\|allow_overloads\|language\|default\|transform\|hint\|global_hint\|defaulthint\|inline\|extern\|macro\|spec\|foreign\|runElab\|tcinline\)"
+syn match idrisChar "'[^'\\]'\|'\\.'\|'\\u[0-9a-fA-F]\{4}'"
+syn match idrisBacktick "`[A-Za-z][A-Za-z0-9_']*`"
+syn region idrisString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@Spell
+syn region idrisBlockComment start="{-" end="-}" contains=idrisBlockComment,idrisTodo,@Spell
+syn match idrisIdentifier "[a-zA-Z][a-zA-z0-9_']*" contained
+
+highlight def link idrisDeprecated Error
+highlight def link idrisIdentifier Identifier
+highlight def link idrisImport Structure
+highlight def link idrisModule Structure
+highlight def link idrisStructure Structure
+highlight def link idrisStatement Statement
+highlight def link idrisForall Structure
+highlight def link idrisDataOpt Statement
+highlight def link idrisDSL Statement
+highlight def link idrisBlock Statement
+highlight def link idrisAnnotation Statement
+highlight def link idrisWhere Structure
+highlight def link idrisLet Structure
+highlight def link idrisTotality Statement
+highlight def link idrisSyntax Statement
+highlight def link idrisVisibility Statement
+highlight def link idrisConditional Conditional
+highlight def link idrisPragma Statement
+highlight def link idrisNumber Number
+highlight def link idrisFloat Float
+highlight def link idrisDelimiter Delimiter
+highlight def link idrisInfix PreProc
+highlight def link idrisOperators Operator
+highlight def link idrisType Include
+highlight def link idrisDocComment Comment
+highlight def link idrisLineComment Comment
+highlight def link idrisBlockComment Comment
+highlight def link idrisTodo Todo
+highlight def link idrisMetaVar Macro
+highlight def link idrisString String
+highlight def link idrisChar String
+highlight def link idrisBacktick Operator
+
+let b:current_syntax = "idris2"
+
+endif

syntax/lidris2.vim

@@ -0,0 +1,26 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'idris2') == -1
+
+" Vim syntax file
+" Language:    Literate Idris 2
+" Maintainer:  Idris Hackers (https://github.com/edwinb/idris2-vim)
+" Last Change: 2020 May 19
+" Version:     0.1
+"
+" This is just a minimal adaption of the Literate Haskell syntax file.
+
+
+" Read Idris highlighting.
+if version < 600
+    syntax include @idrisTop <sfile>:p:h/idris2.vim
+else
+    syntax include @idrisTop syntax/idris2.vim
+endif
+
+" Recognize blocks of Bird tracks, highlight as Idris.
+syntax region lidrisBirdTrackBlock start="^>" end="\%(^[^>]\)\@=" contains=@idrisTop,lidrisBirdTrack
+syntax match  lidrisBirdTrack "^>" contained
+hi def link   lidrisBirdTrack Comment
+
+let b:current_syntax = "lidris2"
+
+endif

syntax/rust.vim

@@ -67,10 +67,11 @@ syn match   rustExternCrateString /".*"\_s*as/ contained nextgroup=rustIdentifie
 syn keyword   rustObsoleteExternMod mod contained nextgroup=rustIdentifier skipwhite skipempty
 
 syn match     rustIdentifier  contains=rustIdentifierPrime "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
-syn match     rustFuncName    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
+syn match     rustFuncName    "\%(r#\)\=\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
 
 syn region rustMacroRepeat matchgroup=rustMacroRepeatDelimiters start="$(" end="),\=[*+]" contains=TOP
 syn match rustMacroVariable "$\w\+"
+syn match rustRawIdent "\<r#\h\w*" contains=NONE
 
 " Reserved (but not yet used) keywords {{{2
 syn keyword   rustReservedKeyword become do priv typeof unsized abstract virtual final override

syntax/vb.vim

@@ -0,0 +1,369 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'visual-basic') == -1
+
+" Vim syntax file
+" Language:	Visual Basic
+" Maintainer:	Tim Chase <vb.vim@tim.thechases.com>
+" Former Maintainer:	Robert M. Cortopassi <cortopar@mindspring.com>
+"	(tried multiple times to contact, but email bounced)
+" Last Change:
+"   2005 May 25  Synched with work by Thomas Barthel
+"   2004 May 30  Added a few keywords
+
+" This was thrown together after seeing numerous requests on the
+" VIM and VIM-DEV mailing lists.  It is by no means complete.
+" Send comments, suggestions and requests to the maintainer.
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
+endif
+
+" VB is case insensitive
+syn case ignore
+
+syn keyword vbConditional If Then ElseIf Else Select Case
+
+syn keyword vbOperator AddressOf And ByRef ByVal Eqv Imp In
+syn keyword vbOperator Is Like Mod Not Or To Xor
+
+syn match vbOperator "[()+.,\-/*=&]"
+syn match vbOperator "[<>]=\="
+syn match vbOperator "<>"
+syn match vbOperator "\s\+_$"
+
+syn keyword vbBoolean  True False
+syn keyword vbConst Null Nothing
+
+syn keyword vbRepeat Do For ForEach Loop Next
+syn keyword vbRepeat Step To Until Wend While
+
+syn keyword vbEvents AccessKeyPress Activate ActiveRowChanged
+syn keyword vbEvents AfterAddFile AfterChangeFileName AfterCloseFile
+syn keyword vbEvents AfterColEdit AfterColUpdate AfterDelete
+syn keyword vbEvents AfterInsert AfterLabelEdit AfterRemoveFile
+syn keyword vbEvents AfterUpdate AfterWriteFile AmbientChanged
+syn keyword vbEvents ApplyChanges Associate AsyncProgress
+syn keyword vbEvents AsyncReadComplete AsyncReadProgress AxisActivated
+syn keyword vbEvents AxisLabelActivated AxisLabelSelected
+syn keyword vbEvents AxisLabelUpdated AxisSelected AxisTitleActivated
+syn keyword vbEvents AxisTitleSelected AxisTitleUpdated AxisUpdated
+syn keyword vbEvents BeforeClick BeforeColEdit BeforeColUpdate
+syn keyword vbEvents BeforeConnect BeforeDelete BeforeInsert
+syn keyword vbEvents BeforeLabelEdit BeforeLoadFile BeforeUpdate
+syn keyword vbEvents BeginRequest BeginTrans ButtonClick
+syn keyword vbEvents ButtonCompleted ButtonDropDown ButtonGotFocus
+syn keyword vbEvents ButtonLostFocus CallbackKeyDown Change Changed
+syn keyword vbEvents ChartActivated ChartSelected ChartUpdated Click
+syn keyword vbEvents Close CloseQuery CloseUp ColEdit ColResize
+syn keyword vbEvents Collapse ColumnClick CommitTrans Compare
+syn keyword vbEvents ConfigChageCancelled ConfigChanged
+syn keyword vbEvents ConfigChangedCancelled Connect ConnectionRequest
+syn keyword vbEvents CurrentRecordChanged DECommandAdded
+syn keyword vbEvents DECommandPropertyChanged DECommandRemoved
+syn keyword vbEvents DEConnectionAdded DEConnectionPropertyChanged
+syn keyword vbEvents DEConnectionRemoved DataArrival DataChanged
+syn keyword vbEvents DataUpdated DateClicked DblClick Deactivate
+syn keyword vbEvents DevModeChange DeviceArrival DeviceOtherEvent
+syn keyword vbEvents DeviceQueryRemove DeviceQueryRemoveFailed
+syn keyword vbEvents DeviceRemoveComplete DeviceRemovePending
+syn keyword vbEvents Disconnect DisplayChanged Dissociate
+syn keyword vbEvents DoGetNewFileName Done DonePainting DownClick
+syn keyword vbEvents DragDrop DragOver DropDown EditProperty EditQuery
+syn keyword vbEvents EndRequest EnterCell EnterFocus ExitFocus Expand
+syn keyword vbEvents FontChanged FootnoteActivated FootnoteSelected
+syn keyword vbEvents FootnoteUpdated Format FormatSize GotFocus
+syn keyword vbEvents HeadClick HeightChanged Hide InfoMessage
+syn keyword vbEvents IniProperties InitProperties Initialize
+syn keyword vbEvents ItemActivated ItemAdded ItemCheck ItemClick
+syn keyword vbEvents ItemReloaded ItemRemoved ItemRenamed
+syn keyword vbEvents ItemSeletected KeyDown KeyPress KeyUp LeaveCell
+syn keyword vbEvents LegendActivated LegendSelected LegendUpdated
+syn keyword vbEvents LinkClose LinkError LinkExecute LinkNotify
+syn keyword vbEvents LinkOpen Load LostFocus MouseDown MouseMove
+syn keyword vbEvents MouseUp NodeCheck NodeClick OLECompleteDrag
+syn keyword vbEvents OLEDragDrop OLEDragOver OLEGiveFeedback OLESetData
+syn keyword vbEvents OLEStartDrag ObjectEvent ObjectMove OnAddNew
+syn keyword vbEvents OnComm Paint PanelClick PanelDblClick PathChange
+syn keyword vbEvents PatternChange PlotActivated PlotSelected
+syn keyword vbEvents PlotUpdated PointActivated PointLabelActivated
+syn keyword vbEvents PointLabelSelected PointLabelUpdated PointSelected
+syn keyword vbEvents PointUpdated PowerQuerySuspend PowerResume
+syn keyword vbEvents PowerStatusChanged PowerSuspend ProcessTag
+syn keyword vbEvents ProcessingTimeout QueryChangeConfig QueryClose
+syn keyword vbEvents QueryComplete QueryCompleted QueryTimeout
+syn keyword vbEvents QueryUnload ReadProperties RepeatedControlLoaded
+syn keyword vbEvents RepeatedControlUnloaded Reposition
+syn keyword vbEvents RequestChangeFileName RequestWriteFile Resize
+syn keyword vbEvents ResultsChanged RetainedProject RollbackTrans
+syn keyword vbEvents RowColChange RowCurrencyChange RowResize
+syn keyword vbEvents RowStatusChanged Scroll SelChange SelectionChanged
+syn keyword vbEvents SendComplete SendProgress SeriesActivated
+syn keyword vbEvents SeriesSelected SeriesUpdated SettingChanged Show
+syn keyword vbEvents SplitChange Start StateChanged StatusUpdate
+syn keyword vbEvents SysColorsChanged Terminate TimeChanged Timer
+syn keyword vbEvents TitleActivated TitleSelected TitleUpdated
+syn keyword vbEvents UnboundAddData UnboundDeleteRow
+syn keyword vbEvents UnboundGetRelativeBookmark UnboundReadData
+syn keyword vbEvents UnboundWriteData Unformat Unload UpClick Updated
+syn keyword vbEvents UserEvent Validate ValidationError
+syn keyword vbEvents VisibleRecordChanged WillAssociate WillChangeData
+syn keyword vbEvents WillDissociate WillExecute WillUpdateRows
+syn keyword vbEvents WriteProperties
+
+
+syn keyword vbFunction Abs Array Asc AscB AscW Atn Avg BOF CBool CByte
+syn keyword vbFunction CCur CDate CDbl CInt CLng CSng CStr CVDate CVErr
+syn keyword vbFunction CVar CallByName Cdec Choose Chr ChrB ChrW Command
+syn keyword vbFunction Cos Count CreateObject CurDir DDB Date DateAdd
+syn keyword vbFunction DateDiff DatePart DateSerial DateValue Day Dir
+syn keyword vbFunction DoEvents EOF Environ Error Exp FV FileAttr
+syn keyword vbFunction FileDateTime FileLen FilterFix Fix Format
+syn keyword vbFunction FormatCurrency FormatDateTime FormatNumber
+syn keyword vbFunction FormatPercent FreeFile GetAllStrings GetAttr
+syn keyword vbFunction GetAutoServerSettings GetObject GetSetting Hex
+syn keyword vbFunction Hour IIf IMEStatus IPmt InStr Input InputB
+syn keyword vbFunction InputBox InstrB Int IsArray IsDate IsEmpty IsError
+syn keyword vbFunction IsMissing IsNull IsNumeric IsObject Join LBound
+syn keyword vbFunction LCase LOF LTrim Left LeftB Len LenB LoadPicture
+syn keyword vbFunction LoadResData LoadResPicture LoadResString Loc Log
+syn keyword vbFunction MIRR Max Mid MidB Min Minute Month MonthName
+syn keyword vbFunction MsgBox NPV NPer Now Oct PPmt PV Partition Pmt
+syn keyword vbFunction QBColor RGB RTrim Rate Replace Right RightB Rnd
+syn keyword vbFunction Round SLN SYD Second Seek Sgn Shell Sin Space Spc
+syn keyword vbFunction Split Sqr StDev StDevP Str StrComp StrConv
+syn keyword vbFunction StrReverse String Sum Switch Tab Tan Time
+syn keyword vbFunction TimeSerial TimeValue Timer Trim TypeName UBound
+syn keyword vbFunction UCase Val Var VarP VarType Weekday WeekdayName
+syn keyword vbFunction Year
+
+syn keyword vbMethods AboutBox Accept Activate Add AddCustom AddFile
+syn keyword vbMethods AddFromFile AddFromGuid AddFromString
+syn keyword vbMethods AddFromTemplate AddItem AddNew AddToAddInToolbar
+syn keyword vbMethods AddToolboxProgID Append AppendAppendChunk
+syn keyword vbMethods AppendChunk Arrange Assert AsyncRead BatchUpdate
+syn keyword vbMethods BeginQueryEdit BeginTrans Bind BuildPath
+syn keyword vbMethods CanPropertyChange Cancel CancelAsyncRead
+syn keyword vbMethods CancelBatch CancelUpdate CaptureImage CellText
+syn keyword vbMethods CellValue Circle Clear ClearFields ClearSel
+syn keyword vbMethods ClearSelCols ClearStructure Clone Close Cls
+syn keyword vbMethods ColContaining CollapseAll ColumnSize CommitTrans
+syn keyword vbMethods CompactDatabase Compose Connect Copy CopyFile
+syn keyword vbMethods CopyFolder CopyQueryDef Count CreateDatabase
+syn keyword vbMethods CreateDragImage CreateEmbed CreateField
+syn keyword vbMethods CreateFolder CreateGroup CreateIndex CreateLink
+syn keyword vbMethods CreatePreparedStatement CreatePropery CreateQuery
+syn keyword vbMethods CreateQueryDef CreateRelation CreateTableDef
+syn keyword vbMethods CreateTextFile CreateToolWindow CreateUser
+syn keyword vbMethods CreateWorkspace Customize Cut Delete
+syn keyword vbMethods DeleteColumnLabels DeleteColumns DeleteFile
+syn keyword vbMethods DeleteFolder DeleteLines DeleteRowLabels
+syn keyword vbMethods DeleteRows DeselectAll DesignerWindow DoVerb Drag
+syn keyword vbMethods Draw DriveExists Edit EditCopy EditPaste EndDoc
+syn keyword vbMethods EnsureVisible EstablishConnection Execute Exists
+syn keyword vbMethods Expand Export ExportReport ExtractIcon Fetch
+syn keyword vbMethods FetchVerbs FileExists Files FillCache Find
+syn keyword vbMethods FindFirst FindItem FindLast FindNext FindPrevious
+syn keyword vbMethods FolderExists Forward GetAbsolutePathName
+syn keyword vbMethods GetBaseName GetBookmark GetChunk GetClipString
+syn keyword vbMethods GetData GetDrive GetDriveName GetFile GetFileName
+syn keyword vbMethods GetFirstVisible GetFolder GetFormat GetHeader
+syn keyword vbMethods GetLineFromChar GetNumTicks GetParentFolderName
+syn keyword vbMethods GetRows GetSelectedPart GetSelection
+syn keyword vbMethods GetSpecialFolder GetTempName GetText
+syn keyword vbMethods GetVisibleCount GoBack GoForward Hide HitTest
+syn keyword vbMethods HoldFields Idle Import InitializeLabels Insert
+syn keyword vbMethods InsertColumnLabels InsertColumns InsertFile
+syn keyword vbMethods InsertLines InsertObjDlg InsertRowLabels
+syn keyword vbMethods InsertRows Item Keys KillDoc Layout Line Lines
+syn keyword vbMethods LinkExecute LinkPoke LinkRequest LinkSend Listen
+syn keyword vbMethods LoadFile LoadResData LoadResPicture LoadResString
+syn keyword vbMethods LogEvent MakeCompileFile MakeCompiledFile
+syn keyword vbMethods MakeReplica MoreResults Move MoveData MoveFile
+syn keyword vbMethods MoveFirst MoveFolder MoveLast MoveNext
+syn keyword vbMethods MovePrevious NavigateTo NewPage NewPassword
+syn keyword vbMethods NextRecordset OLEDrag OnAddinsUpdate OnConnection
+syn keyword vbMethods OnDisconnection OnStartupComplete Open
+syn keyword vbMethods OpenAsTextStream OpenConnection OpenDatabase
+syn keyword vbMethods OpenQueryDef OpenRecordset OpenResultset OpenURL
+syn keyword vbMethods Overlay PSet PaintPicture PastSpecialDlg Paste
+syn keyword vbMethods PeekData Play Point PopulatePartial PopupMenu
+syn keyword vbMethods Print PrintForm PrintReport PropertyChanged Quit
+syn keyword vbMethods Raise RandomDataFill RandomFillColumns
+syn keyword vbMethods RandomFillRows ReFill Read ReadAll ReadFromFile
+syn keyword vbMethods ReadLine ReadProperty Rebind Refresh RefreshLink
+syn keyword vbMethods RegisterDatabase ReleaseInstance Reload Remove
+syn keyword vbMethods RemoveAddInFromToolbar RemoveAll RemoveItem Render
+syn keyword vbMethods RepairDatabase ReplaceLine Reply ReplyAll Requery
+syn keyword vbMethods ResetCustom ResetCustomLabel ResolveName
+syn keyword vbMethods RestoreToolbar Resync Rollback RollbackTrans
+syn keyword vbMethods RowBookmark RowContaining RowTop Save SaveAs
+syn keyword vbMethods SaveFile SaveToFile SaveToOle1File SaveToolbar
+syn keyword vbMethods Scale ScaleX ScaleY Scroll SelPrint SelectAll
+syn keyword vbMethods SelectPart Send SendData Set SetAutoServerSettings
+syn keyword vbMethods SetData SetFocus SetOption SetSelection SetSize
+syn keyword vbMethods SetText SetViewport Show ShowColor ShowFont
+syn keyword vbMethods ShowHelp ShowOpen ShowPrinter ShowSave
+syn keyword vbMethods ShowWhatsThis SignOff SignOn Size Skip SkipLine
+syn keyword vbMethods Span Split SplitContaining StartLabelEdit
+syn keyword vbMethods StartLogging Stop Synchronize Tag TextHeight
+syn keyword vbMethods TextWidth ToDefaults Trace TwipsToChartPart
+syn keyword vbMethods TypeByChartType URLFor Update UpdateControls
+syn keyword vbMethods UpdateRecord UpdateRow Upto ValidateControls Value
+syn keyword vbMethods WhatsThisMode Write WriteBlankLines WriteLine
+syn keyword vbMethods WriteProperty WriteTemplate ZOrder
+syn keyword vbMethods rdoCreateEnvironment rdoRegisterDataSource
+
+syn keyword vbStatement Alias AppActivate As Base Beep Begin Call ChDir
+syn keyword vbStatement ChDrive Close Const Date Declare DefBool DefByte
+syn keyword vbStatement DefCur DefDate DefDbl DefDec DefInt DefLng DefObj
+syn keyword vbStatement DefSng DefStr DefVar Deftype DeleteSetting Dim Do
+syn keyword vbStatement Each ElseIf End Enum Erase Error Event Exit
+syn keyword vbStatement Explicit FileCopy For ForEach Function Get GoSub
+syn keyword vbStatement GoTo Gosub Implements Kill LSet Let Lib LineInput
+syn keyword vbStatement Load Lock Loop Mid MkDir Name Next On OnError Open
+syn keyword vbStatement Option Preserve Private Property Public Put RSet
+syn keyword vbStatement RaiseEvent Randomize ReDim Redim Reset Resume
+syn keyword vbStatement Return RmDir SavePicture SaveSetting Seek SendKeys
+syn keyword vbStatement Sendkeys Set SetAttr Static Step Stop Sub Time
+syn keyword vbStatement Type Unload Unlock Until Wend While Width With
+syn keyword vbStatement Write
+
+syn keyword vbKeyword As Binary ByRef ByVal Date Empty Error Friend Get
+syn keyword vbKeyword Input Is Len Lock Me Mid New Nothing Null On
+syn keyword vbKeyword Option Optional ParamArray Print Private Property
+syn keyword vbKeyword Public PublicNotCreateable OnNewProcessSingleUse
+syn keyword vbKeyword InSameProcessMultiUse GlobalMultiUse Resume Seek
+syn keyword vbKeyword Set Static Step String Time WithEvents
+
+syn keyword vbTodo contained	TODO
+
+"Datatypes
+syn keyword vbTypes Boolean Byte Currency Date Decimal Double Empty
+syn keyword vbTypes Integer Long Object Single String Variant
+
+"VB defined values
+syn keyword vbDefine dbBigInt dbBinary dbBoolean dbByte dbChar
+syn keyword vbDefine dbCurrency dbDate dbDecimal dbDouble dbFloat
+syn keyword vbDefine dbGUID dbInteger dbLong dbLongBinary dbMemo
+syn keyword vbDefine dbNumeric dbSingle dbText dbTime dbTimeStamp
+syn keyword vbDefine dbVarBinary
+
+"VB defined values
+syn keyword vbDefine vb3DDKShadow vb3DFace vb3DHighlight vb3DLight
+syn keyword vbDefine vb3DShadow vbAbort vbAbortRetryIgnore
+syn keyword vbDefine vbActiveBorder vbActiveTitleBar vbAlias
+syn keyword vbDefine vbApplicationModal vbApplicationWorkspace
+syn keyword vbDefine vbAppTaskManager vbAppWindows vbArchive vbArray
+syn keyword vbDefine vbBack vbBinaryCompare vbBlack vbBlue vbBoolean
+syn keyword vbDefine vbButtonFace vbButtonShadow vbButtonText vbByte
+syn keyword vbDefine vbCalGreg vbCalHijri vbCancel vbCr vbCritical
+syn keyword vbDefine vbCrLf vbCurrency vbCyan vbDatabaseCompare
+syn keyword vbDefine vbDataObject vbDate vbDecimal vbDefaultButton1
+syn keyword vbDefine vbDefaultButton2 vbDefaultButton3 vbDefaultButton4
+syn keyword vbDefine vbDesktop vbDirectory vbDouble vbEmpty vbError
+syn keyword vbDefine vbExclamation vbFirstFourDays vbFirstFullWeek
+syn keyword vbDefine vbFirstJan1 vbFormCode vbFormControlMenu
+syn keyword vbDefine vbFormFeed vbFormMDIForm vbFriday vbFromUnicode
+syn keyword vbDefine vbGrayText vbGreen vbHidden vbHide vbHighlight
+syn keyword vbDefine vbHighlightText vbHiragana vbIgnore vbIMEAlphaDbl
+syn keyword vbDefine vbIMEAlphaSng vbIMEDisable vbIMEHiragana
+syn keyword vbDefine vbIMEKatakanaDbl vbIMEKatakanaSng vbIMEModeAlpha
+syn keyword vbDefine vbIMEModeAlphaFull vbIMEModeDisable
+syn keyword vbDefine vbIMEModeHangul vbIMEModeHangulFull
+syn keyword vbDefine vbIMEModeHiragana vbIMEModeKatakana
+syn keyword vbDefine vbIMEModeKatakanaHalf vbIMEModeNoControl
+syn keyword vbDefine vbIMEModeOff vbIMEModeOn vbIMENoOp vbIMEOff
+syn keyword vbDefine vbIMEOn vbInactiveBorder vbInactiveCaptionText
+syn keyword vbDefine vbInactiveTitleBar vbInfoBackground vbInformation
+syn keyword vbDefine vbInfoText vbInteger vbKatakana vbKey0 vbKey1
+syn keyword vbDefine vbKey2 vbKey3 vbKey4 vbKey5 vbKey6 vbKey7 vbKey8
+syn keyword vbDefine vbKey9 vbKeyA vbKeyAdd vbKeyB vbKeyBack vbKeyC
+syn keyword vbDefine vbKeyCancel vbKeyCapital vbKeyClear vbKeyControl
+syn keyword vbDefine vbKeyD vbKeyDecimal vbKeyDelete vbKeyDivide
+syn keyword vbDefine vbKeyDown vbKeyE vbKeyEnd vbKeyEscape vbKeyExecute
+syn keyword vbDefine vbKeyF vbKeyF1 vbKeyF10 vbKeyF11 vbKeyF12 vbKeyF13
+syn keyword vbDefine vbKeyF14 vbKeyF15 vbKeyF16 vbKeyF2 vbKeyF3 vbKeyF4
+syn keyword vbDefine vbKeyF5 vbKeyF6 vbKeyF7 vbKeyF8 vbKeyF9 vbKeyG
+syn keyword vbDefine vbKeyH vbKeyHelp vbKeyHome vbKeyI vbKeyInsert
+syn keyword vbDefine vbKeyJ vbKeyK vbKeyL vbKeyLButton vbKeyLeft vbKeyM
+syn keyword vbDefine vbKeyMButton vbKeyMenu vbKeyMultiply vbKeyN
+syn keyword vbDefine vbKeyNumlock vbKeyNumpad0 vbKeyNumpad1
+syn keyword vbDefine vbKeyNumpad2 vbKeyNumpad3 vbKeyNumpad4
+syn keyword vbDefine vbKeyNumpad5 vbKeyNumpad6 vbKeyNumpad7
+syn keyword vbDefine vbKeyNumpad8 vbKeyNumpad9 vbKeyO vbKeyP
+syn keyword vbDefine vbKeyPageDown vbKeyPageUp vbKeyPause vbKeyPrint
+syn keyword vbDefine vbKeyQ vbKeyR vbKeyRButton vbKeyReturn vbKeyRight
+syn keyword vbDefine vbKeyS vbKeySelect vbKeySeparator vbKeyShift
+syn keyword vbDefine vbKeySnapshot vbKeySpace vbKeySubtract vbKeyT
+syn keyword vbDefine vbKeyTab vbKeyU vbKeyUp vbKeyV vbKeyW vbKeyX
+syn keyword vbDefine vbKeyY vbKeyZ vbLf vbLong vbLowerCase vbMagenta
+syn keyword vbDefine vbMaximizedFocus vbMenuBar vbMenuText
+syn keyword vbDefine vbMinimizedFocus vbMinimizedNoFocus vbMonday
+syn keyword vbDefine vbMsgBox vbMsgBoxHelpButton vbMsgBoxRight
+syn keyword vbDefine vbMsgBoxRtlReading vbMsgBoxSetForeground
+syn keyword vbDefine vbMsgBoxText vbNarrow vbNewLine vbNo vbNormal
+syn keyword vbDefine vbNormalFocus vbNormalNoFocus vbNull vbNullChar
+syn keyword vbDefine vbNullString vbObject vbObjectError vbOK
+syn keyword vbDefine vbOKCancel vbOKOnly vbProperCase vbQuestion
+syn keyword vbDefine vbReadOnly vbRed vbRetry vbRetryCancel vbSaturday
+syn keyword vbDefine vbScrollBars vbSingle vbString vbSunday vbSystem
+syn keyword vbDefine vbSystemModal vbTab vbTextCompare vbThursday
+syn keyword vbDefine vbTitleBarText vbTuesday vbUnicode vbUpperCase
+syn keyword vbDefine vbUseSystem vbUseSystemDayOfWeek vbVariant
+syn keyword vbDefine vbVerticalTab vbVolume vbWednesday vbWhite vbWide
+syn keyword vbDefine vbWindowBackground vbWindowFrame vbWindowText
+syn keyword vbDefine vbYellow vbYes vbYesNo vbYesNoCancel
+
+"Numbers
+"integer number, or floating point number without a dot.
+syn match vbNumber "\<\d\+\>"
+"floating point number, with dot
+syn match vbNumber "\<\d\+\.\d*\>"
+"floating point number, starting with a dot
+syn match vbNumber "\.\d\+\>"
+"syn match  vbNumber		"{[[:xdigit:]-]\+}\|&[hH][[:xdigit:]]\+&"
+"syn match  vbNumber		":[[:xdigit:]]\+"
+"syn match  vbNumber		"[-+]\=\<\d\+\>"
+syn match  vbFloat		"[-+]\=\<\d\+[eE][\-+]\=\d\+"
+syn match  vbFloat		"[-+]\=\<\d\+\.\d*\([eE][\-+]\=\d\+\)\="
+syn match  vbFloat		"[-+]\=\<\.\d\+\([eE][\-+]\=\d\+\)\="
+
+" String and Character contstants
+syn region  vbString		start=+"+  end=+"\|$+
+syn region  vbComment		start="\(^\|\s\)REM\s" end="$" contains=vbTodo
+syn region  vbComment		start="\(^\|\s\)\'"   end="$" contains=vbTodo
+syn match   vbLineNumber	"^\d\+\(\s\|$\)"
+syn match   vbTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
+syn match   vbTypeSpecifier  "#[a-zA-Z0-9]"me=e-1
+
+" Define the default highlighting.
+" Only when an item doesn't have highlighting yet
+
+hi def link vbBoolean		Boolean
+hi def link vbLineNumber		Comment
+hi def link vbComment		Comment
+hi def link vbConditional	Conditional
+hi def link vbConst			Constant
+hi def link vbDefine			Constant
+hi def link vbError			Error
+hi def link vbFunction		Identifier
+hi def link vbIdentifier		Identifier
+hi def link vbNumber			Number
+hi def link vbFloat			Float
+hi def link vbMethods		PreProc
+hi def link vbOperator		Operator
+hi def link vbRepeat			Repeat
+hi def link vbString			String
+hi def link vbStatement		Statement
+hi def link vbKeyword		Statement
+hi def link vbEvents			Special
+hi def link vbTodo			Todo
+hi def link vbTypes			Type
+hi def link vbTypeSpecifier	Type
+
+
+let b:current_syntax = "vb"
+
+" vim: ts=8
+
+endif

syntax/yaml.vim

@@ -0,0 +1,247 @@
+if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'yaml') == -1
+
+" Vim syntax file
+" Language:         YAML (YAML Ain't Markup Language) 1.2
+" Maintainer:       Nikolai Pavlov <zyx.vim@gmail.com>
+" First author:     Nikolai Weibull <now@bitwi.se>
+" Latest Revision:  2015-03-28
+" 		    removed duplicate yamlKeyValueDelimiter (pull #4799)
+
+if exists('b:current_syntax')
+    finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+" Choose the schema to use
+" TODO: Validate schema
+if !exists('b:yaml_schema')
+  if exists('g:yaml_schema')
+    let b:yaml_schema = g:yaml_schema
+  else
+    let b:yaml_schema = 'core'
+  endif
+endif
+
+let s:ns_char = '\%([\n\r\uFEFF \t]\@!\p\)'
+let s:ns_word_char = '[[:alnum:]_\-]'
+let s:ns_uri_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$,.!~*''()[\]]\)'
+let s:ns_tag_char  = '\%(%\x\x\|'.s:ns_word_char.'\|[#/;?:@&=+$.~*''()]\)'
+let s:c_ns_anchor_char = '\%([\n\r\uFEFF \t,[\]{}]\@!\p\)'
+let s:c_indicator      = '[\-?:,[\]{}#&*!|>''"%@`]'
+let s:c_flow_indicator = '[,[\]{}]'
+
+let s:ns_char_without_c_indicator = substitute(s:ns_char, '\v\C[\zs', '\=s:c_indicator[1:-2]', '')
+
+let s:_collection = '[^\@!\(\%(\\\.\|\[^\\\]]\)\+\)]'
+let s:_neg_collection = '[^\(\%(\\\.\|\[^\\\]]\)\+\)]'
+function s:SimplifyToAssumeAllPrintable(p)
+    return substitute(a:p, '\V\C\\%('.s:_collection.'\\@!\\p\\)', '[^\1]', '')
+endfunction
+let s:ns_char = s:SimplifyToAssumeAllPrintable(s:ns_char)
+let s:ns_char_without_c_indicator = s:SimplifyToAssumeAllPrintable(s:ns_char_without_c_indicator)
+let s:c_ns_anchor_char = s:SimplifyToAssumeAllPrintable(s:c_ns_anchor_char)
+
+function s:SimplifyAdjacentCollections(p)
+    return substitute(a:p, '\V\C'.s:_collection.'\\|'.s:_collection, '[\1\2]', 'g')
+endfunction
+let s:ns_uri_char = s:SimplifyAdjacentCollections(s:ns_uri_char)
+let s:ns_tag_char = s:SimplifyAdjacentCollections(s:ns_tag_char)
+
+let s:c_verbatim_tag = '!<'.s:ns_uri_char.'\+>'
+let s:c_named_tag_handle     = '!'.s:ns_word_char.'\+!'
+let s:c_secondary_tag_handle = '!!'
+let s:c_primary_tag_handle   = '!'
+let s:c_tag_handle = '\%('.s:c_named_tag_handle.
+            \         '\|'.s:c_secondary_tag_handle.
+            \         '\|'.s:c_primary_tag_handle.'\)'
+let s:c_ns_shorthand_tag = s:c_tag_handle . s:ns_tag_char.'\+'
+let s:c_non_specific_tag = '!'
+let s:c_ns_tag_property = s:c_verbatim_tag.
+            \        '\|'.s:c_ns_shorthand_tag.
+            \        '\|'.s:c_non_specific_tag
+
+let s:c_ns_anchor_name = s:c_ns_anchor_char.'\+'
+let s:c_ns_anchor_property =  '&'.s:c_ns_anchor_name
+let s:c_ns_alias_node      = '\*'.s:c_ns_anchor_name
+
+let s:ns_directive_name = s:ns_char.'\+'
+
+let s:ns_local_tag_prefix  = '!'.s:ns_uri_char.'*'
+let s:ns_global_tag_prefix = s:ns_tag_char.s:ns_uri_char.'*'
+let s:ns_tag_prefix = s:ns_local_tag_prefix.
+            \    '\|'.s:ns_global_tag_prefix
+
+let s:ns_plain_safe_out = s:ns_char
+let s:ns_plain_safe_in  = '\%('.s:c_flow_indicator.'\@!'.s:ns_char.'\)'
+
+let s:ns_plain_safe_in = substitute(s:ns_plain_safe_in, '\V\C\\%('.s:_collection.'\\@!'.s:_neg_collection.'\\)', '[^\1\2]', '')
+let s:ns_plain_safe_in_without_colhash = substitute(s:ns_plain_safe_in, '\V\C'.s:_neg_collection, '[^\1:#]', '')
+let s:ns_plain_safe_out_without_colhash = substitute(s:ns_plain_safe_out, '\V\C'.s:_neg_collection, '[^\1:#]', '')
+
+let s:ns_plain_first_in  = '\%('.s:ns_char_without_c_indicator.'\|[?:\-]\%('.s:ns_plain_safe_in.'\)\@=\)'
+let s:ns_plain_first_out = '\%('.s:ns_char_without_c_indicator.'\|[?:\-]\%('.s:ns_plain_safe_out.'\)\@=\)'
+
+let s:ns_plain_char_in  = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_in.'\|'.s:ns_plain_safe_in_without_colhash.'\)'
+let s:ns_plain_char_out = '\%('.s:ns_char.'#\|:'.s:ns_plain_safe_out.'\|'.s:ns_plain_safe_out_without_colhash.'\)'
+
+let s:ns_plain_out = s:ns_plain_first_out . s:ns_plain_char_out.'*'
+let s:ns_plain_in  = s:ns_plain_first_in  . s:ns_plain_char_in.'*'
+
+
+syn keyword yamlTodo            contained TODO FIXME XXX NOTE
+
+syn region  yamlComment         display oneline start='\%\(^\|\s\)#' end='$'
+            \                   contains=yamlTodo
+
+execute 'syn region yamlDirective oneline start='.string('^\ze%'.s:ns_directive_name.'\s\+').' '.
+            \                            'end="$" '.
+            \                            'contains=yamlTAGDirective,'.
+            \                                     'yamlYAMLDirective,'.
+            \                                     'yamlReservedDirective '.
+            \                            'keepend'
+
+syn match yamlTAGDirective '%TAG\s\+' contained nextgroup=yamlTagHandle
+execute 'syn match yamlTagHandle contained nextgroup=yamlTagPrefix '.string(s:c_tag_handle.'\s\+')
+execute 'syn match yamlTagPrefix contained nextgroup=yamlComment ' . string(s:ns_tag_prefix)
+
+syn match yamlYAMLDirective '%YAML\s\+'  contained nextgroup=yamlYAMLVersion
+syn match yamlYAMLVersion   '\d\+\.\d\+' contained nextgroup=yamlComment
+
+execute 'syn match yamlReservedDirective contained nextgroup=yamlComment '.
+            \string('%\%(\%(TAG\|YAML\)\s\)\@!'.s:ns_directive_name)
+
+syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start='"' skip='\\"' end='"'
+            \ contains=yamlEscape
+            \ nextgroup=yamlKeyValueDelimiter
+syn region yamlFlowString matchgroup=yamlFlowStringDelimiter start="'" skip="''"  end="'"
+            \ contains=yamlSingleEscape
+            \ nextgroup=yamlKeyValueDelimiter
+syn match  yamlEscape contained '\\\%([\\"abefnrtv\^0_ NLP\n]\|x\x\x\|u\x\{4}\|U\x\{8}\)'
+syn match  yamlSingleEscape contained "''"
+
+syn match yamlBlockScalarHeader contained '\s\+\zs[|>]\%([+-]\=[1-9]\|[1-9]\=[+-]\)\='
+
+syn cluster yamlConstant contains=yamlBool,yamlNull
+
+syn cluster yamlFlow contains=yamlFlowString,yamlFlowMapping,yamlFlowCollection
+syn cluster yamlFlow      add=yamlFlowMappingKey,yamlFlowMappingMerge
+syn cluster yamlFlow      add=@yamlConstant,yamlPlainScalar,yamlFloat
+syn cluster yamlFlow      add=yamlTimestamp,yamlInteger,yamlMappingKeyStart
+syn cluster yamlFlow      add=yamlComment
+syn region yamlFlowMapping    matchgroup=yamlFlowIndicator start='{' end='}' contains=@yamlFlow
+syn region yamlFlowCollection matchgroup=yamlFlowIndicator start='\[' end='\]' contains=@yamlFlow
+
+execute 'syn match yamlPlainScalar /'.s:ns_plain_out.'/'
+execute 'syn match yamlPlainScalar contained /'.s:ns_plain_in.'/'
+
+syn match yamlMappingKeyStart '?\ze\s'
+syn match yamlMappingKeyStart '?' contained
+
+execute 'syn match yamlFlowMappingKey /\%#=1'.s:ns_plain_in.'\%(\s\+'.s:ns_plain_in.'\)*\ze\s*:/ contained '.
+            \'nextgroup=yamlKeyValueDelimiter'
+syn match yamlFlowMappingMerge /<<\ze\s*:/ contained nextgroup=yamlKeyValueDelimiter
+
+syn match yamlBlockCollectionItemStart '^\s*\zs-\%(\s\+-\)*\s' nextgroup=yamlBlockMappingKey,yamlBlockMappingMerge
+" Use the old regexp engine, the NFA engine doesn't like all the \@ items.
+execute 'syn match yamlBlockMappingKey /\%#=1^\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ '.
+            \'nextgroup=yamlKeyValueDelimiter'
+execute 'syn match yamlBlockMappingKey /\%#=1\s*\zs'.s:ns_plain_out.'\%(\s\+'.s:ns_plain_out.'\)*\ze\s*:\%(\s\|$\)/ contained '.
+            \'nextgroup=yamlKeyValueDelimiter'
+syn match yamlBlockMappingMerge /^\s*\zs<<\ze:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter
+syn match yamlBlockMappingMerge /<<\ze\s*:\%(\s\|$\)/ nextgroup=yamlKeyValueDelimiter contained
+
+syn match   yamlKeyValueDelimiter /\s*:/ contained
+
+syn cluster yamlScalarWithSpecials contains=yamlPlainScalar,yamlBlockMappingKey,yamlFlowMappingKey
+
+let s:_bounder = s:SimplifyToAssumeAllPrintable('\%([[\]{}, \t]\@!\p\)')
+if b:yaml_schema is# 'json'
+    syn keyword yamlNull null contained containedin=@yamlScalarWithSpecials
+    syn keyword yamlBool true false
+    exe 'syn match   yamlInteger /'.s:_bounder.'\@1<!\%(0\|-\=[1-9][0-9]*\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match   yamlFloat   /'.s:_bounder.'\@1<!\%(-\=[1-9][0-9]*\%(\.[0-9]*\)\=\(e[-+]\=[0-9]\+\)\=\|0\|-\=\.inf\|\.nan\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+elseif b:yaml_schema is# 'core'
+    syn keyword yamlNull null Null NULL contained containedin=@yamlScalarWithSpecials
+    syn keyword yamlBool true True TRUE false False FALSE contained containedin=@yamlScalarWithSpecials
+    exe 'syn match   yamlNull /'.s:_bounder.'\@1<!\~'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match   yamlInteger /'.s:_bounder.'\@1<!\%([+-]\=\%(0\%(b[0-1_]\+\|[0-7_]\+\|x[0-9a-fA-F_]\+\)\=\|\%([1-9][0-9_]*\%(:[0-5]\=\d\)\+\)\)\|[1-9][0-9_]*\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match   yamlFloat /'.s:_bounder.'\@1<!\%([+-]\=\%(\%(\d[0-9_]*\)\.[0-9_]*\%([eE][+-]\=\d\+\)\=\|\.[0-9_]\+\%([eE][-+]\=[0-9]\+\)\=\|\d[0-9_]*\%(:[0-5]\=\d\)\+\.[0-9_]*\|\.\%(inf\|Inf\|INF\)\)\|\%(\.\%(nan\|NaN\|NAN\)\)\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+elseif b:yaml_schema is# 'pyyaml'
+    syn keyword yamlNull null Null NULL contained containedin=@yamlScalarWithSpecials
+    syn keyword yamlBool true True TRUE false False FALSE yes Yes YES no No NO on On ON off Off OFF contained containedin=@yamlScalarWithSpecials
+    exe 'syn match   yamlNull /'.s:_bounder.'\@1<!\~'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match  yamlFloat /'.s:_bounder.'\@1<!\%(\v[-+]?%(\d[0-9_]*)\.[0-9_]*%([eE][-+]\d+)?|\.[0-9_]+%([eE][-+]\d+)?|[-+]?\d[0-9_]*%(\:[0-5]?\d)+\.[0-9_]*|[-+]?\.%(inf|Inf|INF)|\.%(nan|NaN|NAN)\m\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match  yamlInteger /'.s:_bounder.'\@1<!\%(\v[-+]?0b[0-1_]+|[-+]?0[0-7_]+|[-+]?%(0|[1-9][0-9_]*)|[-+]?0x[0-9a-fA-F_]+|[-+]?[1-9][0-9_]*%(:[0-5]?\d)+\m\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+    exe 'syn match  yamlTimestamp /'.s:_bounder.'\@1<!\%(\v\d\d\d\d\-\d\d\-\d\d|\d\d\d\d \-\d\d? \-\d\d?%([Tt]|[ \t]+)\d\d?\:\d\d \:\d\d %(\.\d*)?%([ \t]*%(Z|[-+]\d\d?%(\:\d\d)?))?\m\)'.s:_bounder.'\@!/ contained containedin=@yamlScalarWithSpecials'
+elseif b:yaml_schema is# 'failsafe'
+    " Nothing
+endif
+unlet s:_bounder
+
+
+execute 'syn match yamlNodeTag '.string(s:c_ns_tag_property)
+execute 'syn match yamlAnchor  '.string(s:c_ns_anchor_property)
+execute 'syn match yamlAlias   '.string(s:c_ns_alias_node)
+
+syn match yamlDocumentStart '^---\ze\%(\s\|$\)'
+syn match yamlDocumentEnd   '^\.\.\.\ze\%(\s\|$\)'
+
+hi def link yamlTodo                     Todo
+hi def link yamlComment                  Comment
+
+hi def link yamlDocumentStart            PreProc
+hi def link yamlDocumentEnd              PreProc
+
+hi def link yamlDirectiveName            Keyword
+
+hi def link yamlTAGDirective             yamlDirectiveName
+hi def link yamlTagHandle                String
+hi def link yamlTagPrefix                String
+
+hi def link yamlYAMLDirective            yamlDirectiveName
+hi def link yamlReservedDirective        Error
+hi def link yamlYAMLVersion              Number
+
+hi def link yamlString                   String
+hi def link yamlFlowString               yamlString
+hi def link yamlFlowStringDelimiter      yamlString
+hi def link yamlEscape                   SpecialChar
+hi def link yamlSingleEscape             SpecialChar
+
+hi def link yamlBlockCollectionItemStart Label
+hi def link yamlBlockMappingKey          Identifier
+hi def link yamlBlockMappingMerge        Special
+
+hi def link yamlFlowMappingKey           Identifier
+hi def link yamlFlowMappingMerge         Special
+
+hi def link yamlMappingKeyStart          Special
+hi def link yamlFlowIndicator            Special
+hi def link yamlKeyValueDelimiter        Special
+
+hi def link yamlConstant                 Constant
+
+hi def link yamlNull                     yamlConstant
+hi def link yamlBool                     yamlConstant
+
+hi def link yamlAnchor                   Type
+hi def link yamlAlias                    Type
+hi def link yamlNodeTag                  Type
+
+hi def link yamlInteger                  Number
+hi def link yamlFloat                    Float
+hi def link yamlTimestamp                Number
+
+let b:current_syntax = "yaml"
+
+unlet s:ns_word_char s:ns_uri_char s:c_verbatim_tag s:c_named_tag_handle s:c_secondary_tag_handle s:c_primary_tag_handle s:c_tag_handle s:ns_tag_char s:c_ns_shorthand_tag s:c_non_specific_tag s:c_ns_tag_property s:c_ns_anchor_char s:c_ns_anchor_name s:c_ns_anchor_property s:c_ns_alias_node s:ns_char s:ns_directive_name s:ns_local_tag_prefix s:ns_global_tag_prefix s:ns_tag_prefix s:c_indicator s:ns_plain_safe_out s:c_flow_indicator s:ns_plain_safe_in s:ns_plain_first_in s:ns_plain_first_out s:ns_plain_char_in s:ns_plain_char_out s:ns_plain_out s:ns_plain_in s:ns_char_without_c_indicator s:ns_plain_safe_in_without_colhash s:ns_plain_safe_out_without_colhash
+unlet s:_collection s:_neg_collection
+delfunction s:SimplifyAdjacentCollections
+delfunction s:SimplifyToAssumeAllPrintable
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+endif