patch 9.1.1007: filetype: various ignore are not recognized
Commit:
https://github.com/vim/vim/commit/8cbe2e0a0a78f57bb545a97695bfedd6a95e6992
Author: Wu, Zhenyu <wuzhe...@ustc.edu>
Date: Sun Jan 12 09:27:01 2025 +0100
patch 9.1.1007: filetype: various ignore are not recognized
Problem: filetype: various ignore are not recognized
Solution: detect rg/docker/npm/vvsce ignore files as 'gitgnore' filetype
(Wu, Zhenyu)
Not only prettier, but many programs also support ignore files (like rg,
docker, npm, vscode). So use the gitignore filetype for them due to same
syntax
closes: #16428
Signed-off-by: Wu, Zhenyu <wuzhe...@ustc.edu>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 154ce79cb..29f702f27 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -951,6 +951,7 @@ au BufNewFile,BufRead */.config/git/attributes
setf gitattributes
au BufNewFile,BufRead */etc/gitattributes setf
gitattributes
au BufNewFile,BufRead .gitignore,*.git/info/exclude setf gitignore
au BufNewFile,BufRead */.config/git/ignore,*.prettierignore setf gitignore
+au BufNewFile,BufRead .rgignore,.ignore,.dockerignore,.npmignore,.vscodeignore
setf gitignore
au BufNewFile,BufRead git-rebase-todo setf gitrebase
au BufRead,BufNewFile .gitsendemail.msg.?????? setf
gitsendemail
au BufNewFile,BufRead *.git/*
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 6d64d9df6..3b3b2f920 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -309,7 +309,7 @@ def s:GetFilenameChecks(): dict<list<string>>
gitattributes: ['file.git/info/attributes', '.gitattributes',
'/.config/git/attributes', '/etc/gitattributes',
'/usr/local/etc/gitattributes', 'some.git/info/attributes'] +
WhenConfigHome('$XDG_CONFIG_HOME/git/attributes'),
gitcommit: ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG',
'EDIT_DESCRIPTION'],
gitconfig: ['file.git/config', 'file.git/config.worktree',
'file.git/worktrees/x/config.worktree', '.gitconfig', '.gitmodules',
'file.git/modules//config', '/.config/git/config', '/etc/gitconfig',
'/usr/local/etc/gitconfig', '/etc/gitconfig.d/file',
'any/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config',
'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'] +
WhenConfigHome('$XDG_CONFIG_HOME/git/config'),
- gitignore: ['file.git/info/exclude', '.gitignore', '/.config/git/ignore',
'some.git/info/exclude'] + WhenConfigHome('$XDG_CONFIG_HOME/git/ignore') +
['.prettierignore'],
+ gitignore: ['file.git/info/exclude', '.gitignore', '/.config/git/ignore',
'some.git/info/exclude'] + WhenConfigHome('$XDG_CONFIG_HOME/git/ignore') +
['.prettierignore', '.rgignore', '.ignore', '.dockerignore', '.npmignore',
'.vscodeignore'],
gitolite: ['gitolite.conf', '/gitolite-admin/conf/file',
'any/gitolite-admin/conf/file'],
gitrebase: ['git-rebase-todo'],
gitsendemail: ['.gitsendemail.msg.xxxxxx'],
diff --git a/src/version.c b/src/version.c
index 9d9f90535..45fcbd3a3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1007,
/**/
1006,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1tWtak-006jsm-Ey%40256bit.org.
