diff options
| author | Christian Clason <c.clason@uni-graz.at> | 2024-10-12 17:28:56 +0200 |
|---|---|---|
| committer | Christian Clason <ch.clason+github@icloud.com> | 2024-10-13 00:46:29 +0200 |
| commit | 06625f9b3af22a2971cbd21274138c9653f2f723 (patch) | |
| tree | a295912ba0412aa28ab3fc1276dff75f4b872a27 | |
| parent | 5c2f2a0c65dfe7bbab0ae0a75293f3bcbd04f7ff (diff) | |
| download | rneovim-06625f9b3af22a2971cbd21274138c9653f2f723.tar.gz rneovim-06625f9b3af22a2971cbd21274138c9653f2f723.tar.bz2 rneovim-06625f9b3af22a2971cbd21274138c9653f2f723.zip | |
vim-patch:9.1.0777: filetype: Some upstream php files are not recognized
Problem: filetype: Some upstream php files are not recognized
Solution: Detect more config files from the PHP source
distribution as filetype ini (nisbet-hubbard).
closes: vim/vim#15840
https://github.com/vim/vim/commit/367499c5c39057bca267716d9aad20554d4d83fd
Co-authored-by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>
| -rw-r--r-- | runtime/lua/vim/filetype.lua | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_filetype.vim | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua index 445281deca..25e4dd33f7 100644 --- a/runtime/lua/vim/filetype.lua +++ b/runtime/lua/vim/filetype.lua @@ -2296,6 +2296,8 @@ local pattern = { ['^crontab%.'] = starsetf('crontab'), ['^cvs%d+$'] = 'cvs', ['^php%.ini%-'] = 'dosini', + ['^php%-fpm%.conf'] = 'dosini', + ['^www%.conf'] = 'dosini', ['^drac%.'] = starsetf('dracula'), ['/dtrace/.*%.d$'] = 'dtrace', ['esmtprc$'] = 'esmtprc', diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim index 9ae0289030..5143702897 100644 --- a/test/old/testdir/test_filetype.vim +++ b/test/old/testdir/test_filetype.vim @@ -227,7 +227,7 @@ func s:GetFilenameChecks() abort \ 'dockerfile': ['Containerfile', 'Dockerfile', 'dockerfile', 'file.Dockerfile', 'file.dockerfile', 'Dockerfile.debian', 'Containerfile.something'], \ 'dosbatch': ['file.bat'], \ 'dosini': ['/etc/yum.conf', '/etc/nfs.conf', '/etc/nfsmount.conf', 'file.ini', - \ 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', + \ 'npmrc', '.npmrc', 'php.ini', 'php.ini-5', 'php.ini-file', 'php-fpm.conf', 'php-fpm.conf.default', 'www.conf', 'www.conf.default', \ '/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', |