mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-24 12:08:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:6701480: runtime(filetype): Use s:StarSetf for all patterns ending in * (#35825)

Browse Source 
Problem:  Some filetype autocmds with patterns ending in * do not skip
          filenames matching g:ignored_patterns.
Solution: Move these autocmds to the appropriate section and call
          s:StarSetf() to set the filetype.

- Affected filetypes: dosini, execline, foam, messages, nginx, tmux.
- Convert foam filetype patterns to use wildcard matching.

closes: vim/vim#17422

6701480c43

Co-authored-by: Doug Kearns <dougkearns@gmail.com>
This commit is contained in:
zeertzjq
2025-09-19 06:55:00 +08:00
committed by GitHub
parent fb2d736481
commit ec3dded6dd
1 changed files with 166 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
runtime/lua/vim/filetype.lua
View File

@@ -2047,7 +2047,7 @@ local pattern = {
end), end),
['/etc/Muttrc%.d/'] = starsetf('muttrc'), ['/etc/Muttrc%.d/'] = starsetf('muttrc'),
['/etc/nanorc$'] = 'nanorc', ['/etc/nanorc$'] = 'nanorc',
['/etc/nginx/'] = 'nginx', ['/etc/nginx/'] = starsetf('nginx'),
['/etc/pam%.conf$'] = 'pamconf', ['/etc/pam%.conf$'] = 'pamconf',
['/etc/pam%.d/'] = starsetf('pamconf'), ['/etc/pam%.d/'] = starsetf('pamconf'),
['/etc/passwd%-$'] = 'passwd', ['/etc/passwd%-$'] = 'passwd',
@@ -2169,6 +2169,160 @@ local pattern = {
['/log/user%.notice$'] = 'messages', ['/log/user%.notice$'] = 'messages',
['/log/user%.warn$'] = 'messages', ['/log/user%.warn$'] = 'messages',
['/log/user$'] = 'messages', ['/log/user$'] = 'messages',
['/log/auth%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.err%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.info%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.log%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.err%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.info%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.log%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/cron%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.err%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.info%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.log%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/daemon%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.err%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.info%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.log%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/debug%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.err%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.info%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.log%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/kern%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.err%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.info%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.log%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/lpr%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.err%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.info%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.log%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/mail%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.err%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.info%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.log%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/messages%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.err%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.info%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.log%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/news/news%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.err%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.info%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.log%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/syslog%.[0-9]*$'] = starsetf('messages'),
['/log/user%.crit%.[0-9]*$'] = starsetf('messages'),
['/log/user%.err%.[0-9]*$'] = starsetf('messages'),
['/log/user%.info%.[0-9]*$'] = starsetf('messages'),
['/log/user%.log%.[0-9]*$'] = starsetf('messages'),
['/log/user%.notice%.[0-9]*$'] = starsetf('messages'),
['/log/user%.warn%.[0-9]*$'] = starsetf('messages'),
['/log/user%.[0-9]*$'] = starsetf('messages'),
['/log/auth%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/auth%.err%-[0-9]*$'] = starsetf('messages'),
['/log/auth%.info%-[0-9]*$'] = starsetf('messages'),
['/log/auth%.log%-[0-9]*$'] = starsetf('messages'),
['/log/auth%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/auth%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/auth%-[0-9]*$'] = starsetf('messages'),
['/log/cron%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/cron%.err%-[0-9]*$'] = starsetf('messages'),
['/log/cron%.info%-[0-9]*$'] = starsetf('messages'),
['/log/cron%.log%-[0-9]*$'] = starsetf('messages'),
['/log/cron%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/cron%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/cron%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%.err%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%.info%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%.log%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/daemon%-[0-9]*$'] = starsetf('messages'),
['/log/debug%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/debug%.err%-[0-9]*$'] = starsetf('messages'),
['/log/debug%.info%-[0-9]*$'] = starsetf('messages'),
['/log/debug%.log%-[0-9]*$'] = starsetf('messages'),
['/log/debug%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/debug%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/debug%-[0-9]*$'] = starsetf('messages'),
['/log/kern%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/kern%.err%-[0-9]*$'] = starsetf('messages'),
['/log/kern%.info%-[0-9]*$'] = starsetf('messages'),
['/log/kern%.log%-[0-9]*$'] = starsetf('messages'),
['/log/kern%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/kern%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/kern%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%.err%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%.info%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%.log%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/lpr%-[0-9]*$'] = starsetf('messages'),
['/log/mail%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/mail%.err%-[0-9]*$'] = starsetf('messages'),
['/log/mail%.info%-[0-9]*$'] = starsetf('messages'),
['/log/mail%.log%-[0-9]*$'] = starsetf('messages'),
['/log/mail%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/mail%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/mail%-[0-9]*$'] = starsetf('messages'),
['/log/messages%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/messages%.err%-[0-9]*$'] = starsetf('messages'),
['/log/messages%.info%-[0-9]*$'] = starsetf('messages'),
['/log/messages%.log%-[0-9]*$'] = starsetf('messages'),
['/log/messages%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/messages%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/messages%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%.err%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%.info%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%.log%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/news/news%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%.err%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%.info%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%.log%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/syslog%-[0-9]*$'] = starsetf('messages'),
['/log/user%.crit%-[0-9]*$'] = starsetf('messages'),
['/log/user%.err%-[0-9]*$'] = starsetf('messages'),
['/log/user%.info%-[0-9]*$'] = starsetf('messages'),
['/log/user%.log%-[0-9]*$'] = starsetf('messages'),
['/log/user%.notice%-[0-9]*$'] = starsetf('messages'),
['/log/user%.warn%-[0-9]*$'] = starsetf('messages'),
['/log/user%-[0-9]*$'] = starsetf('messages'),
}, },
['/systemd/'] = { ['/systemd/'] = {
['/%.config/systemd/user/%.#'] = 'systemd', ['/%.config/systemd/user/%.#'] = 'systemd',
@@ -2312,7 +2466,7 @@ local pattern = {
['/wireplumber/.*%.conf$'] = 'spajson', ['/wireplumber/.*%.conf$'] = 'spajson',
['/%.ssh/.*%.conf$'] = 'sshconfig', ['/%.ssh/.*%.conf$'] = 'sshconfig',
['^%.?tmux.*%.conf$'] = 'tmux', ['^%.?tmux.*%.conf$'] = 'tmux',
['^%.?tmux.*%.conf'] = { 'tmux', { priority = -1 } }, ['^%.?tmux.*%.conf'] = starsetf('tmux'),
['/containers/containers%.conf$'] = 'toml', ['/containers/containers%.conf$'] = 'toml',
['/containers/containers%.conf%.d/.*%.conf$'] = 'toml', ['/containers/containers%.conf%.d/.*%.conf$'] = 'toml',
['/containers/containers%.conf%.modules/.*%.conf$'] = 'toml', ['/containers/containers%.conf%.modules/.*%.conf$'] = 'toml',
@@ -2345,7 +2499,7 @@ local pattern = {
}, },
['nginx'] = { ['nginx'] = {
['/nginx/.*%.conf$'] = 'nginx', ['/nginx/.*%.conf$'] = 'nginx',
['/usr/local/nginx/conf/'] = 'nginx', ['/usr/local/nginx/conf/'] = starsetf('nginx'),
['nginx%.conf$'] = 'nginx', ['nginx%.conf$'] = 'nginx',
['^nginx.*%.conf$'] = 'nginx', ['^nginx.*%.conf$'] = 'nginx',
}, },
@@ -2360,7 +2514,7 @@ local pattern = {
['s6.*/finish$'] = 'execline', ['s6.*/finish$'] = 'execline',
['s6.*/run$'] = 'execline', ['s6.*/run$'] = 'execline',
['s6.*/up$'] = 'execline', ['s6.*/up$'] = 'execline',
['^s6%-'] = 'execline', ['^s6%-'] = starsetf('execline'),
}, },
['utt'] = { ['utt'] = {
['^mutt%-.*%-%w+$'] = 'mail', ['^mutt%-.*%-%w+$'] = 'mail',
@@ -2451,19 +2605,19 @@ local pattern = {
['^crontab%.'] = starsetf('crontab'), ['^crontab%.'] = starsetf('crontab'),
['^cvs%d+$'] = 'cvs', ['^cvs%d+$'] = 'cvs',
['/DEBIAN/control$'] = 'debcontrol', ['/DEBIAN/control$'] = 'debcontrol',
['^php%.ini%-'] = 'dosini', ['^php%.ini%-'] = starsetf('dosini'),
['^php%-fpm%.conf'] = 'dosini', ['^php%-fpm%.conf'] = starsetf('dosini'),
['^www%.conf'] = 'dosini', ['^www%.conf'] = starsetf('dosini'),
['^drac%.'] = starsetf('dracula'), ['^drac%.'] = starsetf('dracula'),
['/dtrace/.*%.d$'] = 'dtrace', ['/dtrace/.*%.d$'] = 'dtrace',
['esmtprc$'] = 'esmtprc', ['esmtprc$'] = 'esmtprc',
['/0%.orig/'] = detect.foam, ['/0%.orig/'] = starsetf(detect.foam),
['/0/'] = detect.foam, ['/0/'] = starsetf(detect.foam),
['/constant/g$'] = detect.foam, ['/constant/g$'] = detect.foam,
['Transport%.'] = detect.foam, ['Transport%.'] = starsetf(detect.foam),
['^[a-zA-Z0-9].*Dict%.'] = detect.foam, ['^[a-zA-Z0-9].*Dict%.'] = starsetf(detect.foam),
['^[a-zA-Z0-9].*Dict$'] = detect.foam, ['^[a-zA-Z0-9].*Dict$'] = detect.foam,
['^[a-zA-Z].*Properties%.'] = detect.foam, ['^[a-zA-Z].*Properties%.'] = starsetf(detect.foam),
['^[a-zA-Z].*Properties$'] = detect.foam, ['^[a-zA-Z].*Properties$'] = detect.foam,
['/tmp/lltmp'] = starsetf('gedcom'), ['/tmp/lltmp'] = starsetf('gedcom'),
['^gkrellmrc_.$'] = 'gkrellmrc', ['^gkrellmrc_.$'] = 'gkrellmrc',