diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2023-06-04 00:39:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-04 00:39:46 +0200 |
| commit | 0a439e38634542fd961bb4f04b1cdda304cb1bb5 (patch) | |
| tree | 2e5ccda940fbcfe0b613acb46e9d36ad534d52a5 | |
| parent | 72300feecfbdd7e313ffb06442d6e80989028ac5 (diff) | |
| download | rneovim-0a439e38634542fd961bb4f04b1cdda304cb1bb5.tar.gz rneovim-0a439e38634542fd961bb4f04b1cdda304cb1bb5.tar.bz2 rneovim-0a439e38634542fd961bb4f04b1cdda304cb1bb5.zip | |
vim-patch:9.0.1601: filetype detection fails for *.conf file without comments (#23896)
Problem: Filetype detection fails for *.conf file without comments.
(Dmitrii Tcyganok)
Solution: Use "conf" filetype as a fallback for an empty .conf file.
(closes vim/vim#12487, closes vim/vim#12483)
https://github.com/vim/vim/commit/664fd12aa27a3c6bd19cfa474c4630d6c03fcc61
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| -rw-r--r-- | runtime/lua/vim/filetype/detect.lua | 3 | ||||
| -rw-r--r-- | test/old/testdir/test_filetype.vim | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype/detect.lua b/runtime/lua/vim/filetype/detect.lua index 70e590ed10..b347215895 100644 --- a/runtime/lua/vim/filetype/detect.lua +++ b/runtime/lua/vim/filetype/detect.lua @@ -196,6 +196,9 @@ function M.conf(path, bufnr) if vim.fn.did_filetype() ~= 0 or path:find(vim.g.ft_ignore_pat) then return end + if path:find('%.conf$') then + return 'conf' + end for _, line in ipairs(getlines(bufnr, 1, 5)) do if line:find('^#') then return 'conf' diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim index 9ca267f78c..6a508de236 100644 --- a/test/old/testdir/test_filetype.vim +++ b/test/old/testdir/test_filetype.vim @@ -121,7 +121,7 @@ let s:filename_checks = { \ 'cobol': ['file.cbl', 'file.cob', 'file.lib'], \ 'coco': ['file.atg'], \ 'conaryrecipe': ['file.recipe'], - \ 'conf': ['auto.master'], + \ 'conf': ['auto.master', 'file.conf'], \ 'config': ['configure.in', 'configure.ac', '/etc/hostname.file', 'any/etc/hostname.file'], \ 'confini': ['/etc/pacman.conf', 'any/etc/pacman.conf', 'mpv.conf', 'any/.aws/config', 'any/.aws/credentials', 'file.nmconnection'], \ 'context': ['tex/context/any/file.tex', 'file.mkii', 'file.mkiv', 'file.mkvi', 'file.mkxl', 'file.mklx'], |