Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm

1 files changed, 58 insertions, 10 deletions

diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index e1e73d63fe..cc7358ee49 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -275,6 +275,9 @@ local extension = {
   mdh = 'c',
   epro = 'c',
   qc = 'c',
+  c3 = 'c3',
+  c3i = 'c3',
+  c3t = 'c3',
   cabal = 'cabal',
   cairo = 'cairo',
   capnp = 'capnp',
@@ -300,6 +303,7 @@ local extension = {
   cho = 'chordpro',
   chordpro = 'chordpro',
   ck = 'chuck',
+  cl = detect.cl,
   eni = 'cl',
   icl = 'clean',
   cljx = 'clojure',
@@ -349,6 +353,7 @@ local extension = {
   cql = 'cqlang',
   crm = 'crm',
   cr = 'crystal',
+  cake = 'cs',
   csx = 'cs',
   cs = 'cs',
   csc = 'csc',
@@ -500,6 +505,7 @@ local extension = {
   gdshader = 'gdshader',
   shader = 'gdshader',
   ged = 'gedcom',
+  gel = 'gel',
   gmi = 'gemtext',
   gemini = 'gemtext',
   gift = 'gift',
@@ -588,6 +594,7 @@ local extension = {
   hw = detect.hw,
   module = detect.hw,
   pkg = detect.hw,
+  hy = 'hy',
   iba = 'ibasic',
   ibi = 'ibasic',
   icn = 'icon',
@@ -612,6 +619,7 @@ local extension = {
   janet = 'janet',
   jav = 'java',
   java = 'java',
+  jsh = 'java',
   jj = 'javacc',
   jjt = 'javacc',
   es = 'javascript',
@@ -624,7 +632,7 @@ local extension = {
   clp = 'jess',
   jgr = 'jgraph',
   jinja = 'jinja',
-  jjdescription = 'jj',
+  jjdescription = 'jjdescription',
   j73 = 'jovial',
   jov = 'jovial',
   jovial = 'jovial',
@@ -653,6 +661,10 @@ local extension = {
   jsp = 'jsp',
   jl = 'julia',
   just = 'just',
+  Just = 'just',
+  JUST = 'just',
+  kl = 'karel',
+  KL = 'karel',
   kdl = 'kdl',
   kv = 'kivy',
   kix = 'kix',
@@ -666,6 +678,7 @@ local extension = {
   k = 'kwt',
   ACE = 'lace',
   ace = 'lace',
+  lalrpop = 'lalrpop',
   latte = 'latte',
   lte = 'latte',
   ld = 'ld',
@@ -686,13 +699,11 @@ local extension = {
   ily = 'lilypond',
   liquid = 'liquid',
   liq = 'liquidsoap',
-  cl = 'lisp',
   L = 'lisp',
   lisp = 'lisp',
   el = 'lisp',
   lsp = 'lisp',
   asd = 'lisp',
-  stsg = 'lisp',
   lt = 'lite',
   lite = 'lite',
   livemd = 'livebook',
@@ -721,14 +732,14 @@ local extension = {
   mc = detect.mc,
   quake = 'm3quake',
   m4 = function(path, bufnr)
-    path = path:lower()
-    return not (path:find('html%.m4$') or path:find('fvwm2rc')) and 'm4' or nil
+    local pathl = path:lower()
+    return not (pathl:find('html%.m4$') or pathl:find('fvwm2rc')) and 'm4' or nil
   end,
   eml = 'mail',
   mk = detect.make,
   mak = detect.make,
   page = 'mallard',
-  map = 'map',
+  map = detect_line1('^%*+$', 'lnkmap', 'map'),
   mws = 'maple',
   mpl = 'maple',
   mv = 'maple',
@@ -738,6 +749,7 @@ local extension = {
   mkd = detect.markdown,
   markdown = detect.markdown,
   mdown = detect.markdown,
+  masm = 'masm',
   mhtml = 'mason',
   mason = 'mason',
   master = 'master',
@@ -800,6 +812,7 @@ local extension = {
   n1ql = 'n1ql',
   nql = 'n1ql',
   nanorc = 'nanorc',
+  nasm = 'nasm',
   NSA = 'natural',
   NSC = 'natural',
   NSG = 'natural',
@@ -834,6 +847,7 @@ local extension = {
   tr = 'nroff',
   nsi = 'nsis',
   nsh = 'nsis',
+  nt = 'ntriples',
   nu = 'nu',
   obj = 'obj',
   objdump = 'objdump',
@@ -953,11 +967,14 @@ local extension = {
   ps1xml = 'ps1xml',
   psf = 'psf',
   psl = 'psl',
+  ptx = 'ptx',
   pug = 'pug',
   purs = 'purescript',
   arr = 'pyret',
   pxd = 'pyrex',
+  pxi = 'pyrex',
   pyx = 'pyrex',
+  ['pyx+'] = 'pyrex',
   pyw = 'python',
   py = 'python',
   pyi = 'python',
@@ -1050,16 +1067,17 @@ local extension = {
   builder = 'ruby',
   rake = 'ruby',
   rs = 'rust',
+  sa = detect.sa,
   sage = 'sage',
   sls = 'salt',
   sas = 'sas',
   sass = 'sass',
-  sa = 'sather',
   sbt = 'sbt',
   scala = 'scala',
   ss = 'scheme',
   scm = 'scheme',
   sld = 'scheme',
+  stsg = 'scheme',
   sce = 'scilab',
   sci = 'scilab',
   scss = 'scss',
@@ -1082,6 +1100,7 @@ local extension = {
   la = 'sh',
   lai = 'sh',
   mdd = 'sh',
+  slang = 'shaderslang',
   sieve = 'sieve',
   siv = 'sieve',
   sig = detect.sig,
@@ -1224,6 +1243,7 @@ local extension = {
   toml = 'toml',
   tpp = 'tpp',
   treetop = 'treetop',
+  trig = 'trig',
   slt = 'tsalt',
   tsscl = 'tsscl',
   tssgm = 'tssgm',
@@ -1323,6 +1343,7 @@ local extension = {
   xlb = 'xml',
   xlc = 'xml',
   xba = 'xml',
+  slnx = 'xml',
   xpm = detect_line1('XPM2', 'xpm2', 'xpm'),
   xpm2 = 'xpm2',
   xqy = 'xquery',
@@ -1378,7 +1399,7 @@ local extension = {
   txt = detect.txt,
   xml = detect.xml,
   y = detect.y,
-  cmd = detect_line1('^/%*', 'rexx', 'dosbatch'),
+  cmd = detect.cmd,
   rul = detect.rul,
   cpy = detect_line1('^##', 'python', 'cobol'),
   dsl = detect_line1('^%s*<!', 'dsl', 'structurizr'),
@@ -1427,6 +1448,7 @@ local filename = {
   ['/etc/asound.conf'] = 'alsaconf',
   ['build.xml'] = 'ant',
   ['.htaccess'] = 'apache',
+  APKBUILD = 'apkbuild',
   ['apt.conf'] = 'aptconf',
   ['/.aptitude/config'] = 'aptconf',
   ['=tagging-method'] = 'arch',
@@ -1485,6 +1507,7 @@ local filename = {
   ['NEWS.dch'] = 'debchangelog',
   ['NEWS.Debian'] = 'debchangelog',
   ['/debian/control'] = 'debcontrol',
+  ['/DEBIAN/control'] = 'debcontrol',
   ['/debian/copyright'] = 'debcopyright',
   ['/etc/apt/sources.list'] = 'debsources',
   ['denyhosts.conf'] = 'denyhosts',
@@ -1532,6 +1555,8 @@ local filename = {
   ['filter-rules'] = 'elmfilt',
   ['exim.conf'] = 'exim',
   exports = 'exports',
+  fennelrc = 'fennel',
+  ['.fennelrc'] = 'fennel',
   ['.fetchmailrc'] = 'fetchmail',
   fvSchemes = detect.foam,
   fvSolution = detect.foam,
@@ -1553,6 +1578,12 @@ local filename = {
   ['.gitmodules'] = 'gitconfig',
   ['.gitattributes'] = 'gitattributes',
   ['.gitignore'] = 'gitignore',
+  ['.ignore'] = 'gitignore',
+  ['.dockerignore'] = 'gitignore',
+  ['.fdignore'] = 'gitignore',
+  ['.npmignore'] = 'gitignore',
+  ['.rgignore'] = 'gitignore',
+  ['.vscodeignore'] = 'gitignore',
   ['gitolite.conf'] = 'gitolite',
   ['git-rebase-todo'] = 'gitrebase',
   gkrellmrc = 'gkrellmrc',
@@ -1587,6 +1618,7 @@ local filename = {
   ['/etc/host.conf'] = 'hostconf',
   ['/etc/hosts.allow'] = 'hostsaccess',
   ['/etc/hosts.deny'] = 'hostsaccess',
+  ['.hy-history'] = 'hy',
   ['hyprland.conf'] = 'hyprlang',
   ['hyprpaper.conf'] = 'hyprlang',
   ['hypridle.conf'] = 'hyprlang',
@@ -1608,6 +1640,7 @@ local filename = {
   ['.lintstagedrc'] = 'json',
   ['deno.lock'] = 'json',
   ['flake.lock'] = 'json',
+  ['.swcrc'] = 'json',
   ['.babelrc'] = 'jsonc',
   ['.eslintrc'] = 'jsonc',
   ['.hintrc'] = 'jsonc',
@@ -1617,9 +1650,13 @@ local filename = {
   ['.luaurc'] = 'jsonc',
   ['.swrc'] = 'jsonc',
   ['.vsconfig'] = 'jsonc',
+  ['bun.lock'] = 'jsonc',
   ['.justfile'] = 'just',
+  ['.Justfile'] = 'just',
+  ['.JUSTFILE'] = 'just',
   ['justfile'] = 'just',
   ['Justfile'] = 'just',
+  ['JUSTFILE'] = 'just',
   Kconfig = 'kconfig',
   ['Kconfig.debug'] = 'kconfig',
   ['Config.in'] = 'kconfig',
@@ -1762,6 +1799,7 @@ local filename = {
   ['Rantfile'] = 'ruby',
   Vagrantfile = 'ruby',
   ['smb.conf'] = 'samba',
+  ['.lips_repl_history'] = 'scheme',
   screenrc = 'screen',
   ['.screenrc'] = 'screen',
   ['/etc/sensors3.conf'] = 'sensors',
@@ -1783,7 +1821,6 @@ local filename = {
   ['.kshrc'] = detect.ksh,
   ['.profile'] = detect.sh,
   ['/etc/profile'] = detect.sh,
-  APKBUILD = detect.bash,
   PKGBUILD = detect.bash,
   ['.tcshrc'] = detect.tcsh,
   ['tcsh.login'] = detect.tcsh,
@@ -1860,11 +1897,17 @@ local filename = {
   ['/etc/blkid.tab'] = 'xml',
   ['/etc/blkid.tab.old'] = 'xml',
   ['fonts.conf'] = 'xml',
+  ['Directory.Packages.props'] = 'xml',
+  ['Directory.Build.props'] = 'xml',
+  ['Directory.Build.targets'] = 'xml',
   ['.clangd'] = 'yaml',
   ['.clang-format'] = 'yaml',
   ['.clang-tidy'] = 'yaml',
+  ['pixi.lock'] = 'yaml',
   ['yarn.lock'] = 'yaml',
   matplotlibrc = 'yaml',
+  ['.condarc'] = 'yaml',
+  condarc = 'yaml',
   zathurarc = 'zathurarc',
   ['/etc/zprofile'] = 'zsh',
   ['.zlogin'] = 'zsh',
@@ -2141,8 +2184,8 @@ local pattern = {
     ['/gitolite%-admin/conf/'] = starsetf('gitolite'),
     ['/%.i3/config$'] = 'i3config',
     ['/i3/config$'] = 'i3config',
-    ['/supertux2/config$'] = 'lisp',
     ['/%.mplayer/config$'] = 'mplayerconf',
+    ['/supertux2/config$'] = 'scheme',
     ['/neofetch/config%.conf$'] = 'sh',
     ['/%.ssh/config$'] = 'sshconfig',
     ['/%.sway/config$'] = 'swayconfig',
@@ -2210,8 +2253,10 @@ local pattern = {
     ['^dictd.*%.conf$'] = 'dictdconf',
     ['/lxqt/.*%.conf$'] = 'dosini',
     ['/screengrab/.*%.conf$'] = 'dosini',
+    ['/%.config/fd/ignore$'] = 'gitignore',
     ['^${GNUPGHOME}/gpg%.conf$'] = 'gpg',
     ['/boot/grub/grub%.conf$'] = 'grub',
+    ['/hypr/.*%.conf$'] = 'hyprlang',
     ['^lilo%.conf'] = starsetf('lilo'),
     ['^named.*%.conf$'] = 'named',
     ['^rndc.*%.conf$'] = 'named',
@@ -2313,6 +2358,7 @@ local pattern = {
     ['%.cmake%.in$'] = 'cmake',
     ['^crontab%.'] = starsetf('crontab'),
     ['^cvs%d+$'] = 'cvs',
+    ['/DEBIAN/control$'] = 'debcontrol',
     ['^php%.ini%-'] = 'dosini',
     ['^php%-fpm%.conf'] = 'dosini',
     ['^www%.conf'] = 'dosini',
@@ -2338,6 +2384,8 @@ local pattern = {
     ['%.html%.m4$'] = 'htmlm4',
     ['^JAM.*%.'] = starsetf('jam'),
     ['^Prl.*%.'] = starsetf('jam'),
+    ['^${HOME}/.*/Code/User/.*%.json$'] = 'jsonc',
+    ['^${HOME}/.*/VSCodium/User/.*%.json$'] = 'jsonc',
     ['%.properties_..$'] = 'jproperties',
     ['%.properties_.._..$'] = 'jproperties',
     ['%.properties_.._.._'] = starsetf('jproperties'),