aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-03-31 19:50:45 +0200
committerChristian Clason <c.clason@uni-graz.at>2024-04-01 12:01:47 +0200
commitde1a54dfe1f18a855d32124786181a91be157aca (patch)
tree853625de0bef8bb94e84433b074bd0d7e3f11094
parent09869c3745f2341ed8d37a06a1cad91c570947af (diff)
downloadrneovim-de1a54dfe1f18a855d32124786181a91be157aca.tar.gz
rneovim-de1a54dfe1f18a855d32124786181a91be157aca.tar.bz2
rneovim-de1a54dfe1f18a855d32124786181a91be157aca.zip
vim-patch:9.1.0247: filetype: bundle config files are not recognized
Problem: filetype: bundle config files are not recognized Solution: Detect '*/.bundle/config' as yaml (Wu, Zhenyu) closes: vim/vim#14368 https://github.com/vim/vim/commit/3f6fa93b3b7d8e0bd30eddbbf4ae273c14d4455b Co-authored-by: Wu, Zhenyu <wuzhenyu@ustc.edu>
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 1d6dc73879..f3aae468c7 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -2052,6 +2052,7 @@ local pattern = {
-- Increase priority to run before the pattern below
['XF86Config%-4.*'] = starsetf(detect.xfree86_v4, { priority = -math.huge + 1 }),
['XF86Config.*'] = starsetf(detect.xfree86_v3),
+ ['.*/%.bundle/config'] = 'yaml',
['%.zcompdump.*'] = starsetf('zsh'),
-- .zlog* and zlog*
['%.?zlog.*'] = starsetf('zsh'),
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index b48ac13a91..5aa68d3e57 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -742,7 +742,7 @@ func s:GetFilenameChecks() abort
\ 'xsd': ['file.xsd'],
\ 'xslt': ['file.xsl', 'file.xslt'],
\ 'yacc': ['file.yy', 'file.yxx', 'file.y++'],
- \ 'yaml': ['file.yaml', 'file.yml', 'file.eyaml', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle'],
+ \ 'yaml': ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle'],
\ 'yang': ['file.yang'],
\ 'yuck': ['file.yuck'],
\ 'z8a': ['file.z8a'],