kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 05:05:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.4014: git and gitcommit file types not properly recognized (#16953)

Browse Source 
Problem:    Git and gitcommit file types not properly recognized.
Solution:   Adjust filetype detection. (Tim Pope, closes vim/vim#9477)
c689f8c3d9
This commit is contained in:
Christian Clason 2022-01-07 10:27:34 +01:00 committed by GitHub
parent e58071c92c
commit bba679c431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/filetype.vim
View File

@ -493,7 +493,7 @@ au BufNewFile,BufRead */debian/patches/* call dist#ft#Dep3patch()
" Diff files
au BufNewFile,BufRead *.diff,*.rej setf diff
au BufNewFile,BufRead *.patch
\ if getline(1) =~ '^From [0-9a-f]\{40\} Mon Sep 17 00:00:00 2001$' |
\ if getline(1) =~# '^From [0-9a-f]\{40,\} Mon Sep 17 00:00:00 2001$' |
\ setf gitsendemail |
\ else |
\ setf diff |
@ -672,6 +672,7 @@ autocmd BufRead,BufNewFile *.gift setf gift
" Git
au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
au BufNewFile,BufRead NOTES_EDITMSG,EDIT_DESCRIPTION setf gitcommit
au BufNewFile,BufRead *.git/config,.gitconfig,/etc/gitconfig setf gitconfig
au BufNewFile,BufRead */.config/git/config setf gitconfig
au BufNewFile,BufRead .gitmodules,*.git/modules/*/config setf gitconfig
@ -680,12 +681,8 @@ if !empty($XDG_CONFIG_HOME)
endif
au BufNewFile,BufRead git-rebase-todo setf gitrebase
au BufRead,BufNewFile .gitsendemail.msg.?????? setf gitsendemail
au BufNewFile,BufRead .msg.[0-9]*
\ if getline(1) =~ '^From.*# This line is ignored.$' |
\ setf gitsendemail |
\ endif
au BufNewFile,BufRead *.git/*
\ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
\ if getline(1) =~# '^\x\{40,\}\>\|^ref: ' |
\ setf git |
\ endif

2
runtime/lua/vim/filetype.lua
View File

@ -868,6 +868,8 @@ local filename = {
["TAG_EDITMSG"] = "gitcommit",
["MERGE_MSG"] = "gitcommit",
["COMMIT_EDITMSG"] = "gitcommit",
["NOTES_EDITMSG"] = "gitcommit",
["EDIT_DESCRIPTION"] = "gitcommit",
[".gitconfig"] = "gitconfig",
[".gitmodules"] = "gitconfig",
["/.config/git/config"] = "gitconfig",

2
runtime/scripts.vim
View File

@ -384,7 +384,7 @@ else
set ft=scheme
" Git output
elseif s:line1 =~# '^\(commit\|tree\|object\) \x\{40\}\>\|^tag \S\+$'
elseif s:line1 =~# '^\(commit\|tree\|object\) \x\{40,\}\>\|^tag \S\+$'
set ft=git
" Gprof (gnu profiler)

53
src/nvim/testdir/test_filetype.vim
View File

@ -195,7 +195,7 @@ let s:filename_checks = {
\ 'gedcom': ['file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'],
\ 'gemtext': ['file.gmi', 'file.gemini'],
\ 'gift': ['file.gift'],
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'],
\ 'gitcommit': ['COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'],
\ 'gitconfig': ['file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'],
\ 'gitolite': ['gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'],
\ 'gitrebase': ['git-rebase-todo'],
@ -1045,4 +1045,55 @@ func Test_dep3patch_file()
call delete('debian/patches', 'rf')
endfunc
func Test_patch_file()
filetype on
call writefile([], 'Xfile.patch')
split Xfile.patch
call assert_equal('diff', &filetype)
bwipe!
call writefile(['From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001'], 'Xfile.patch')
split Xfile.patch
call assert_equal('gitsendemail', &filetype)
bwipe!
call writefile(['From 0000000000000000000000000000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001'], 'Xfile.patch')
split Xfile.patch
call assert_equal('gitsendemail', &filetype)
bwipe!
call delete('Xfile.patch')
filetype off
endfunc
func Test_git_file()
filetype on
call assert_true(mkdir('Xrepo.git', 'p'))
call writefile([], 'Xrepo.git/HEAD')
split Xrepo.git/HEAD
call assert_equal('', &filetype)
bwipe!
call writefile(['0000000000000000000000000000000000000000'], 'Xrepo.git/HEAD')
split Xrepo.git/HEAD
call assert_equal('git', &filetype)
bwipe!
call writefile(['0000000000000000000000000000000000000000000000000000000000000000'], 'Xrepo.git/HEAD')
split Xrepo.git/HEAD
call assert_equal('git', &filetype)
bwipe!
call writefile(['ref: refs/heads/master'], 'Xrepo.git/HEAD')
split Xrepo.git/HEAD
call assert_equal('git', &filetype)
bwipe!
call delete('Xrepo.git', 'rf')
filetype off
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
test/functional/lua/filetype_spec.lua
View File

@ -253,7 +253,7 @@ describe('vim.filetype', function()
['gedcom'] = {'file.ged', 'lltxxxxx.txt', '/tmp/lltmp', '/tmp/lltmp-file', 'any/tmp/lltmp', 'any/tmp/lltmp-file'},
['gemtext'] = {'file.gmi', 'file.gemini'},
['gift'] = {'file.gift'},
['gitcommit'] = {'COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG'},
['gitcommit'] = {'COMMIT_EDITMSG', 'MERGE_MSG', 'TAG_EDITMSG', 'NOTES_EDITMSG', 'EDIT_DESCRIPTION'},
['gitconfig'] = {'file.git/config', '.gitconfig', '.gitmodules', 'file.git/modules//config', '/.config/git/config', '/etc/gitconfig', '/etc/gitconfig.d/file', '/.gitconfig.d/file', 'any/.config/git/config', 'any/.gitconfig.d/file', 'some.git/config', 'some.git/modules/any/config'},
['gitolite'] = {'gitolite.conf', '/gitolite-admin/conf/file', 'any/gitolite-admin/conf/file'},
['gitrebase'] = {'git-rebase-todo'},