Merge pull request #37278 from zeertzjq/vim-9.1.2059

vim-patch:9.1.{2059,2060,2061,2062}: filetype detection updates

runtime/lua/vim/filetype.lua

@@ -404,6 +404,8 @@ local extension = {
   dhall = 'dhall',
   diff = 'diff',
   rej = 'diff',
+  dj = 'djot',
+  djot = 'djot',
   Dockerfile = 'dockerfile',
   dockerfile = 'dockerfile',
   bat = 'dosbatch',
@@ -691,6 +693,7 @@ local extension = {
   kerml = 'kerml',
   kv = 'kivy',
   kix = 'kix',
+  kk = 'koka',
   kos = 'kos',
   kts = 'kotlin',
   kt = 'kotlin',
@@ -846,6 +849,7 @@ local extension = {
   NSS = 'natural',
   ncf = 'ncf',
   nginx = 'nginx',
+  ncl = 'nickle',
   nim = 'nim',
   nims = 'nim',
   nimble = 'nim',
@@ -1060,6 +1064,7 @@ local extension = {
   MODX = 'rapid',
   MODx = 'rapid',
   rasi = 'rasi',
+  rasinc = 'rasi',
   rbs = 'rbs',
   rego = 'rego',
   rem = 'remind',

test/old/testdir/test_filetype.vim

@@ -242,6 +242,7 @@ func s:GetFilenameChecks() abort
     \ 'dictdconf': ['dictd.conf', 'dictdfile.conf', 'dictd-file.conf'],
     \ 'diff': ['file.diff', 'file.rej'],
     \ 'dircolors': ['.dir_colors', '.dircolors', '/etc/DIR_COLORS', 'any/etc/DIR_COLORS'],
+    \ 'djot': ['file.dj', 'file.djot'],
     \ 'dnsmasq': ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
     \ 'dockerfile': ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
     \ 'dosbatch': ['file.bat'],
@@ -429,6 +430,7 @@ func s:GetFilenameChecks() abort
     \ 'kitty': ['kitty.conf', '~/.config/kitty/colorscheme.conf'],
     \ 'kivy': ['file.kv'],
     \ 'kix': ['file.kix'],
+    \ 'koka': ['file.kk'],
     \ 'kos': ['file.kos'],
     \ 'kotlin': ['file.kt', 'file.ktm', 'file.kts'],
     \ 'krl': ['file.sub', 'file.Sub', 'file.SUB'],
@@ -575,6 +577,7 @@ func s:GetFilenameChecks() abort
     \ 'neomuttrc': ['Neomuttrc', '.neomuttrc', '.neomuttrc-file', '/.neomutt/neomuttrc', '/.neomutt/neomuttrc-file', 'Neomuttrc', 'Neomuttrc-file', 'any/.neomutt/neomuttrc', 'any/.neomutt/neomuttrc-file', 'neomuttrc', 'neomuttrc-file'],
     \ 'netrc': ['.netrc'],
     \ 'nginx': ['file.nginx', 'nginxfile.conf', 'filenginx.conf', 'any/etc/nginx/file', 'any/usr/local/nginx/conf/file', 'any/nginx/file.conf'],
+    \ 'nickle': ['file.ncl'],
     \ 'nim': ['file.nim', 'file.nims', 'file.nimble'],
     \ 'ninja': ['file.ninja'],
     \ 'nix': ['file.nix'],
@@ -670,7 +673,7 @@ func s:GetFilenameChecks() abort
     \ 'raku': ['file.pm6', 'file.p6', 'file.t6', 'file.pod6', 'file.raku', 'file.rakumod', 'file.rakudoc', 'file.rakutest'],
     \ 'raml': ['file.raml'],
     \ 'rapid': ['file.sysx', 'file.Sysx', 'file.SysX', 'file.SYSx', 'file.SYSX', 'file.modx', 'file.Modx', 'file.ModX', 'file.MODx', 'file.MODX'],
-    \ 'rasi': ['file.rasi'],
+    \ 'rasi': ['file.rasi', 'file.rasinc'],
     \ 'ratpoison': ['.ratpoisonrc', 'ratpoisonrc'],
     \ 'rbs': ['file.rbs'],
     \ 'rc': ['file.rc', 'file.rch'],