Skip to content

Commit 0881329

Browse files
Freed-Wuchrisbra
authored andcommitted
patch 9.1.0315: filetype: a few more dosini files are not recognized
Problem: filetype: a few more dosini files are not recognized Solution: Detect wakatime, reply config files, flatpak, nfs config files and a few more python tools as dosini (or toml) (Wu, Zhenyu) Refer: - https://packaging.python.org/en/latest/specifications/pypirc/ - https://jorisroovers.com/gitlint/latest/configuration/ - https://pylint.pycqa.org/en/latest/user_guide/usage/run.html#command-line-options - https://docs.bpython-interpreter.org/en/latest/configuration.html - https://mypy.readthedocs.io/en/stable/config_file.html#the-mypy-configuration-file - https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#configuration-via-a-file - https://github.com/wakatime/wakatime-cli?tab=readme-ov-file#usage - https://metacpan.org/dist/Reply/view/bin/reply#-cfg-~/.replyrc close: #14512 Signed-off-by: Wu, Zhenyu <wuzhenyu@ustc.edu> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 5392970 commit 0881329

3 files changed

Lines changed: 34 additions & 4 deletions

File tree

runtime/filetype.vim

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,9 +546,18 @@ au BufNewFile,BufRead m3makefile,m3overrides setf m3build
546546
" XDG mimeapps.list
547547
au BufNewFile,BufRead mimeapps.list setf dosini
548548

549-
" Many Python tools use dosini as their config, like pip, setuptools, pudb, coverage
549+
" Many tools written in Python use dosini as their config
550+
" like setuptools, pudb, coverage, pypi, gitlint, oelint-adv, pylint, bpython, mypy
550551
" (must be before *.cfg)
551-
au BufNewFile,BufRead pip.conf,setup.cfg,pudb.cfg,.coveragerc setf dosini
552+
au BufNewFile,BufRead pip.conf,setup.cfg,pudb.cfg,.coveragerc,.pypirc,.gitlint,.oelint.cfg setf dosini
553+
au BufNewFile,BufRead {.,}pylintrc,*/bpython/config,*/mypy/config setf dosini
554+
555+
" Many tools written in Python use toml as their config, like black
556+
au BufNewFile,BufRead .black setf toml
557+
au BufNewFile,BufRead black
558+
\ if getline(1) =~ 'tool.back'
559+
\| setf toml
560+
\| endif
552561

553562
" LXQt's programs use dosini as their config
554563
au BufNewFile,BufRead */{lxqt,screengrab}/*.conf setf dosini
@@ -565,6 +574,9 @@ au BufNewFile,BufRead *.qc setf c
565574
" ~/.texlive/texmf-config/tex/latex/docstrip/docstrip.cfg
566575
au BufNewFile,BufRead */tex/latex/**.cfg setf tex
567576

577+
" Wakatime config
578+
au BufNewFile,BufRead .wakatime.cfg setf dosini
579+
568580
" Configure files
569581
au BufNewFile,BufRead *.cfg\c call dist#ft#FTcfg()
570582

@@ -777,6 +789,9 @@ au BufNewFile,BufRead *.fir setf firrtl
777789
" Fish shell
778790
au BufNewFile,BufRead *.fish setf fish
779791

792+
" Flatpak config
793+
au BufNewFile,BufRead */flatpak/repo/config setf dosini
794+
780795
" FlexWiki - disabled, because it has side effects when a .wiki file
781796
" is not actually FlexWiki
782797
"au BufNewFile,BufRead *.wiki setf flexwiki
@@ -1654,6 +1669,9 @@ else
16541669
endif
16551670
au BufNewFile,BufRead *.plx,*.al,*.psgi setf perl
16561671

1672+
" Perl Reply
1673+
au BufNewFile,BufRead .replyrc setf dosini
1674+
16571675
" Perl, XPM or XPM2
16581676
au BufNewFile,BufRead *.pm
16591677
\ if getline(1) =~ "XPM2" |
@@ -2925,6 +2943,9 @@ au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc* call s:StarSetf('muttrc')
29252943
au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc* call s:StarSetf('neomuttrc')
29262944
au BufNewFile,BufRead neomuttrc*,Neomuttrc* call s:StarSetf('neomuttrc')
29272945

2946+
" Nfs
2947+
au BufNewFile,BufRead nfs.conf,nfsmount.conf setf dosini
2948+
29282949
" Nroff macros
29292950
au BufNewFile,BufRead tmac.* call s:StarSetf('nroff')
29302951

src/testdir/test_filetype.vim

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,14 @@ def s:GetFilenameChecks(): dict<list<string>>
212212
dnsmasq: ['/etc/dnsmasq.conf', '/etc/dnsmasq.d/file', 'any/etc/dnsmasq.conf', 'any/etc/dnsmasq.d/file'],
213213
dockerfile: ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'],
214214
dosbatch: ['file.bat'],
215-
dosini: ['/etc/yum.conf', 'file.ini', 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', '/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap', 'file.vbp', 'ja2.ini', 'JA2.INI', 'mimeapps.list', 'pip.conf', 'setup.cfg', 'pudb.cfg', '.coveragerc', 'psprint.conf', 'sofficerc', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf'],
215+
dosini: ['/etc/yum.conf', '/etc/nfs.conf', '/etc/nfsmount.conf', 'file.ini',
216+
'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file',
217+
'/etc/yum.repos.d/file', 'any/etc/yum.conf', 'any/etc/yum.repos.d/file', 'file.wrap',
218+
'file.vbp', 'ja2.ini', 'JA2.INI', 'mimeapps.list', 'pip.conf', 'setup.cfg', 'pudb.cfg',
219+
'.coveragerc', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc', '.pylintrc',
220+
'/home/user/.config/bpython/config', '/home/user/.config/mypy/config', '.wakatime.cfg', '.replyrc',
221+
'psprint.conf', 'sofficerc', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf',
222+
'any/.local/share/flatpak/repo/config'],
216223
dot: ['file.dot', 'file.gv'],
217224
dracula: ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'],
218225
dtd: ['file.dtd'],
@@ -748,7 +755,7 @@ def s:GetFilenameChecks(): dict<list<string>>
748755
tla: ['file.tla'],
749756
tli: ['file.tli'],
750757
tmux: ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'],
751-
toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config'],
758+
toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config', '.black'],
752759
tpp: ['file.tpp'],
753760
treetop: ['file.treetop'],
754761
trustees: ['trustees.conf'],

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,8 @@ static char *(features[]) =
704704

705705
static int included_patches[] =
706706
{ /* Add new patch number below this line */
707+
/**/
708+
315,
707709
/**/
708710
314,
709711
/**/

0 commit comments

Comments
 (0)