Update

Author: sheerun

README.md

@@ -111,7 +111,7 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
 - [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
 - [ion](https://github.com/vmchale/ion-vim) (Syntax highlighting for ion files)
 - [javascript-sql](https://github.com/statico/vim-javascript-sql)
-- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 18 more files)
+- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 20 more files)
 - [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Syntax highlighting for jenkinsfile and Jenkinsfile files)
 - [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
 - [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)

autoload/clojurecomplete.vim

@@ -71,8 +71,6 @@ function! fish#Indent()
     let l:prevline = getline(l:prevlnum)
     let l:previndent = indent(l:prevlnum)
     if s:IsContinuedLine(v:lnum)
-        " It is customary to increment indentation of continued lines by three
-        " or a custom value defined by the user if available.
         let l:previndent = indent(v:lnum - 1)
         if s:IsContinuedLine(v:lnum - 1)
             return l:previndent
@@ -81,7 +79,7 @@ function! fish#Indent()
         elseif exists('g:indent_cont')
             return l:previndent + g:indent_cont
         else
-            return l:previndent + 3
+            return l:previndent + l:shiftwidth
         endif
     endif
     if l:prevline =~# '\v^\s*%(begin|if|else|while|for|function|case|switch)>'

autoload/fish.vim

@@ -169,6 +169,10 @@ let did_load_filetypes = 1
 
 " DO NOT EDIT CODE BELOW, IT IS GENERATED WITH MAKEFILE
 
+if !has_key(g:polyglot_is_disabled, 'bicep')
+  au BufNewFile,BufRead *.bicep setf bicep
+endif
+
 if !has_key(g:polyglot_is_disabled, 'org')
   au BufNewFile,BufRead *.org setf org
 endif
@@ -1328,10 +1332,6 @@ if !has_key(g:polyglot_is_disabled, 'hex')
   au BufNewFile,BufRead *.h32,*.hex setf hex
 endif
 
-if !has_key(g:polyglot_is_disabled, 'hercules')
-  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
-endif
-
 if !has_key(g:polyglot_is_disabled, 'hastepreproc')
   au BufNewFile,BufRead *.htpp setf hastepreproc
 endif
@@ -1783,7 +1783,7 @@ if !has_key(g:polyglot_is_disabled, 'odin')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'dosini')
-  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}flake8,{.,}npmrc,buildozer.spec setf dosini
+  au BufNewFile,BufRead *.dof,*.ini,*.lektorproject,*.prefs,*.pro,*.properties,*.url,*/etc/pacman.conf,*/etc/yum.conf,{.,}editorconfig,{.,}flake8,{.,}npmrc,buildozer.spec setf dosini
   au BufNewFile,BufRead php.ini-* call s:StarSetf('dosini')
   au BufNewFile,BufRead */etc/yum.repos.d/* call s:StarSetf('dosini')
 endif
@@ -2157,7 +2157,7 @@ if !has_key(g:polyglot_is_disabled, 'mako')
 endif
 
 if !has_key(g:polyglot_is_disabled, 'm4')
-  au BufNewFile,BufRead *.at,*.m4 setf m4
+  au BufNewFile,BufRead *.at,*.m4,*.mc setf m4
 endif
 
 if !has_key(g:polyglot_is_disabled, 'lua')
@@ -2320,16 +2320,22 @@ endif
 
 if !has_key(g:polyglot_is_disabled, 'javascript')
   au! BufNewFile,BufRead,BufWritePost *.frag call polyglot#detect#Frag()
-  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
+  au BufNewFile,BufRead *._js,*.bones,*.cjs,*.es,*.es6,*.gs,*.jake,*.javascript,*.js,*.jsb,*.jscad,*.jsfl,*.jslib,*.jsm,*.jspre,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile setf javascript
   au BufNewFile,BufRead *.flow setf flow
 endif
 
 if !has_key(g:polyglot_is_disabled, 'go')
   au BufNewFile,BufRead *.go setf go
   au BufNewFile,BufRead go.mod setf gomod
+  au BufNewFile,BufRead go.sum setf gosum
+  au BufNewFile,BufRead go.work setf gowork
   au BufNewFile,BufRead *.tmpl setf gohtmltmpl
 endif
 
+if !has_key(g:polyglot_is_disabled, 'hercules')
+  au BufNewFile,BufRead *.errsum,*.ev,*.sum,*.vc setf hercules
+endif
+
 if !has_key(g:polyglot_is_disabled, 'gnuplot')
   au BufNewFile,BufRead *.gnu,*.gnuplot,*.gp,*.gpi,*.p,*.plot,*.plt setf gnuplot
 endif

autoload/polyglot/init.vim

@@ -48,6 +48,7 @@ let s:globs = {
   \ 'bc': '*.bc',
   \ 'bdf': '*.bdf',
   \ 'bib': '*.bib',
+  \ 'bicep': '*.bicep',
   \ 'bindzone': 'named.root',
   \ 'blade': '*.blade,*.blade.php',
   \ 'blank': '*.bl',
@@ -129,7 +130,7 @@ let s:globs = {
   \ 'dnsmasq': '',
   \ 'dockerfile': '*.Dockerfile,*.dock,Containerfile,Dockerfile,dockerfile,Dockerfile*',
   \ 'dosbatch': '*.bat,*.sys',
-  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,.flake8,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
+  \ 'dosini': '*.wrap,*.ini,*.dof,*.lektorproject,*.prefs,*.pro,*.properties,*.url,.flake8,buildozer.spec,.editorconfig,.npmrc,php.ini-*',
   \ 'dot': '*.dot,*.gv',
   \ 'dracula': '*.drac,*.drc,*lvs,*lpe,drac.*',
   \ 'dsdl': '*.sdl',
@@ -197,6 +198,8 @@ let s:globs = {
   \ 'go': '*.go',
   \ 'gohtmltmpl': '*.tmpl',
   \ 'gomod': 'go.mod',
+  \ 'gosum': 'go.sum',
+  \ 'gowork': 'go.work',
   \ 'gp': '*.gp,.gprc',
   \ 'gpg': '',
   \ 'grads': '*.gs',
@@ -253,7 +256,7 @@ let s:globs = {
   \ 'jam': '*.jpl,*.jpr,Prl*.*,JAM*.*',
   \ 'java': '*.java,*.jav',
   \ 'javacc': '*.jj,*.jjt',
-  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.jsb,*.jscad,*.jsfl,*.jsm,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
+  \ 'javascript': '*.js,*._js,*.bones,*.cjs,*.es,*.es6,*.frag,*.gs,*.jake,*.javascript,*.jsb,*.jscad,*.jsfl,*.jslib,*.jsm,*.jspre,*.jss,*.jsx,*.mjs,*.njs,*.pac,*.sjs,*.ssjs,*.xsjs,*.xsjslib,Jakefile',
   \ 'javascriptreact': '*.jsx',
   \ 'jess': '*.clp',
   \ 'jgraph': '*.jgr',
@@ -309,7 +312,7 @@ let s:globs = {
   \ 'lss': '*.lss',
   \ 'lua': '*.lua,*.fcgi,*.nse,*.p8,*.pd_lua,*.rbxs,*.rockspec,*.wlua,.luacheckrc',
   \ 'lynx': 'lynx.cfg',
-  \ 'm4': '*.m4,*.at',
+  \ 'm4': '*.m4,*.mc,*.at',
   \ 'mail': '*.eml,snd.\d\+,.letter,.letter.\d\+,.followup,.article,.article.\d\+,pico.\d\+,mutt{ng,}-*-\w\+,mutt[[:alnum:]_-]\\\{6\},neomutt-*-\w\+,neomutt[[:alnum:]_-]\\\{6\},ae\d\+.txt,{neo,}mutt[[:alnum:]._-]\\\{6\},reportbug-*',
   \ 'mailaliases': '',
   \ 'mailcap': '.mailcap,mailcap',

autoload/polyglot/sleuth.vim

@@ -2506,20 +2506,17 @@ endif
 " Function called for testing all functions defined here.  These are
 " script-local, thus need to be executed here.
 " Returns a string with error messages (hopefully empty).
-" Check if function exists first. See https://github.com/vim/vim/issues/9890
-if !exists("*TestFiletypeFuncs")
-  func! TestFiletypeFuncs(testlist)
-    let output = ''
-    for f in a:testlist
-      try
-        exe f
-      catch
-        let output = output . "\n" . f . ": " . v:exception
-      endtry
-    endfor
-    return output
-  endfunc
-endif
+func! TestFiletypeFuncs(testlist)
+  let output = ''
+  for f in a:testlist
+    try
+      exe f
+    catch
+      let output = output . "\n" . f . ": " . v:exception
+    endtry
+  endfor
+  return output
+endfunc
 
 " Restore 'cpoptions'
 let &cpo = s:cpo_save

extras/filetype.vim

@@ -0,0 +1,21 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bicep', 'ftplugin/bicep.vim')
+  finish
+endif
+
+" bicep.vim - basic bicep integration
+" Maintainer: Carl Smedstad <carl.smedstad at protonmail dot com>
+
+if exists('b:did_ftplugin') || v:version < 700 || &compatible
+  finish
+endif
+let b:did_ftplugin = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+" Set the commentstring
+setlocal commentstring=//%s
+let b:undo_ftplugin = ' commentstring<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save

ftplugin/bicep.vim

@@ -22,7 +22,7 @@ if !exists('g:rst_fold_enabled')
   let g:rst_fold_enabled = 0
 endif
 
-let b:undo_ftplugin = "setl com< cms< et< fo<"
+let b:undo_ftplugin = "setlocal comments< commentstring< expandtab< formatoptions<"
 
 setlocal comments=fb:.. commentstring=..\ %s expandtab
 setlocal formatoptions+=tcroql
@@ -36,6 +36,7 @@ setlocal formatoptions+=tcroql
 
 if exists("g:rst_style") && g:rst_style != 0
     setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8
+    let b:undo_ftplugin .= " | setlocal softtabstop< shiftwidth< tabstop<"
 endif
 
 if g:rst_fold_enabled != 0 && has('patch-7.3.867')  " Introduced the TextChanged event.
@@ -45,6 +46,7 @@ if g:rst_fold_enabled != 0 && has('patch-7.3.867')  " Introduced the TextChanged
   augroup RstFold
     autocmd TextChanged,InsertLeave <buffer> unlet! b:RstFoldCache
   augroup END
+  let b:undo_ftplugin .= " | setlocal foldexpr< foldmethod< foldtext<"
 endif
 
 let &cpo = s:cpo_save

ftplugin/rst.vim

@@ -56,7 +56,7 @@ endif
 " TODO:
 "setlocal define=^\\s*def
 
-setlocal comments=:#
+setlocal comments=b:#
 setlocal commentstring=#\ %s
 
 if !exists('g:ruby_version_paths')

ftplugin/ruby.vim

@@ -0,0 +1,68 @@
+if polyglot#init#is_disabled(expand('<sfile>:p'), 'bicep', 'indent/bicep.vim')
+  finish
+endif
+
+" Only load this file if no other indent file was loaded
+if exists('b:did_indent')
+  finish
+endif
+let b:did_indent = 1
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+setlocal nolisp
+setlocal autoindent shiftwidth=2 tabstop=2 softtabstop=2 expandtab
+setlocal indentexpr=BicepIndent(v:lnum)
+setlocal indentkeys+=<:>,0=},0=),0=*/
+let b:undo_indent = 'setlocal lisp< autoindent< shiftwidth< tabstop< softtabstop<'
+  \ . ' expandtab< indentexpr< indentkeys<'
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save
+
+if exists('*BicepIndent')
+  finish
+endif
+
+let s:cpo_save = &cpoptions
+set cpoptions&vim
+
+function! BicepIndent(lnum)
+  " Beginning of the file should have no indent
+  if a:lnum == 0
+    return 0
+  endif
+
+  " Usual case is to continue at the same indent as the previous non-blank line.
+  let prevlnum = prevnonblank(a:lnum-1)
+  let thisindent = indent(prevlnum)
+
+  " If that previous line is a non-comment ending in [ { (, increase the
+  " indent level.
+  let prevline = getline(prevlnum)
+  if prevline !~# '^\s*//' && prevline =~# '[\[{\(]\s*$'
+    let thisindent += &shiftwidth
+  endif
+
+  " If the current line ends a block, decrease the indent level.
+  let thisline = getline(a:lnum)
+  if thisline =~# '^\s*[\)}\]]'
+    let thisindent -= &shiftwidth
+  endif
+
+  " If the previous line starts a block comment /*, increase by one
+  if prevline =~# '/\*'
+    let thisindent += 2
+  endif
+
+  " If the this line ends a block comment */, decrease by one
+  if thisline =~# '\*/'
+    let thisindent -= 2
+  endif
+
+  return thisindent
+endfunction
+
+let &cpoptions = s:cpo_save
+unlet s:cpo_save