diff options
author | Wu, Zhenyu <wuzhenyu@ustc.edu> | 2024-04-13 18:13:42 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2024-04-13 18:13:42 +0200 |
commit | 0881329d129866fa49444e7fb6e622e54285a8ff (patch) | |
tree | 175b75b674663d3a6dc81122916f8c9df0452dc8 | |
parent | 5392970921aba5112f529a5d93407ae65c285fb1 (diff) |
patch 9.1.0315: filetype: a few more dosini files are not recognizedv9.1.0315
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>
-rw-r--r-- | runtime/filetype.vim | 25 | ||||
-rw-r--r-- | src/testdir/test_filetype.vim | 11 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 34 insertions, 4 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index e3c98e6725..7f3704fc31 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -546,9 +546,18 @@ au BufNewFile,BufRead m3makefile,m3overrides setf m3build " XDG mimeapps.list au BufNewFile,BufRead mimeapps.list setf dosini -" Many Python tools use dosini as their config, like pip, setuptools, pudb, coverage +" Many tools written in Python use dosini as their config +" like setuptools, pudb, coverage, pypi, gitlint, oelint-adv, pylint, bpython, mypy " (must be before *.cfg) -au BufNewFile,BufRead pip.conf,setup.cfg,pudb.cfg,.coveragerc setf dosini +au BufNewFile,BufRead pip.conf,setup.cfg,pudb.cfg,.coveragerc,.pypirc,.gitlint,.oelint.cfg setf dosini +au BufNewFile,BufRead {.,}pylintrc,*/bpython/config,*/mypy/config setf dosini + +" Many tools written in Python use toml as their config, like black +au BufNewFile,BufRead .black setf toml +au BufNewFile,BufRead black + \ if getline(1) =~ 'tool.back' + \| setf toml + \| endif " LXQt's programs use dosini as their config au BufNewFile,BufRead */{lxqt,screengrab}/*.conf setf dosini @@ -565,6 +574,9 @@ au BufNewFile,BufRead *.qc setf c " ~/.texlive/texmf-config/tex/latex/docstrip/docstrip.cfg au BufNewFile,BufRead */tex/latex/**.cfg setf tex +" Wakatime config +au BufNewFile,BufRead .wakatime.cfg setf dosini + " Configure files au BufNewFile,BufRead *.cfg\c call dist#ft#FTcfg() @@ -777,6 +789,9 @@ au BufNewFile,BufRead *.fir setf firrtl " Fish shell au BufNewFile,BufRead *.fish setf fish +" Flatpak config +au BufNewFile,BufRead */flatpak/repo/config setf dosini + " FlexWiki - disabled, because it has side effects when a .wiki file " is not actually FlexWiki "au BufNewFile,BufRead *.wiki setf flexwiki @@ -1654,6 +1669,9 @@ else endif au BufNewFile,BufRead *.plx,*.al,*.psgi setf perl +" Perl Reply +au BufNewFile,BufRead .replyrc setf dosini + " Perl, XPM or XPM2 au BufNewFile,BufRead *.pm \ if getline(1) =~ "XPM2" | @@ -2925,6 +2943,9 @@ au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc* call s:StarSetf('muttrc') au BufNewFile,BufRead .neomuttrc*,*/.neomutt/neomuttrc* call s:StarSetf('neomuttrc') au BufNewFile,BufRead neomuttrc*,Neomuttrc* call s:StarSetf('neomuttrc') +" Nfs +au BufNewFile,BufRead nfs.conf,nfsmount.conf setf dosini + " Nroff macros au BufNewFile,BufRead tmac.* call s:StarSetf('nroff') diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 7dc282f05c..f70b9ceb44 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -212,7 +212,14 @@ def s:GetFilenameChecks(): dict<list<string>> 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'], - 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'], + dosini: ['/etc/yum.conf', '/etc/nfs.conf', '/etc/nfsmount.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', '.pypirc', '.gitlint', '.oelint.cfg', 'pylintrc', '.pylintrc', + '/home/user/.config/bpython/config', '/home/user/.config/mypy/config', '.wakatime.cfg', '.replyrc', + 'psprint.conf', 'sofficerc', 'any/.config/lxqt/globalkeyshortcuts.conf', 'any/.config/screengrab/screengrab.conf', + 'any/.local/share/flatpak/repo/config'], dot: ['file.dot', 'file.gv'], dracula: ['file.drac', 'file.drc', 'filelvs', 'filelpe', 'drac.file', 'lpe', 'lvs', 'some-lpe', 'some-lvs'], dtd: ['file.dtd'], @@ -748,7 +755,7 @@ def s:GetFilenameChecks(): dict<list<string>> tla: ['file.tla'], tli: ['file.tli'], tmux: ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'], - toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config'], + toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config', '.black'], tpp: ['file.tpp'], treetop: ['file.treetop'], trustees: ['trustees.conf'], diff --git a/src/version.c b/src/version.c index 9faa0539ed..627a910749 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 315, +/**/ 314, /**/ 313, |