Commit: patch 9.1.0303: filetype: some protocol buffer files not recognized

8 views
Skip to first unread message

Christian Brabandt

unread,
Apr 10, 2024, 4:45:12 PM4/10/24
to vim...@googlegroups.com
patch 9.1.0303: filetype: some protocol buffer files not recognized

Commit: https://github.com/vim/vim/commit/e54a8e7c73bbfba0c77e928f27fb3a9bffd2e8fd
Author: Bruno BELANYI <br...@belanyi.fr>
Date: Wed Apr 10 22:34:42 2024 +0200

patch 9.1.0303: filetype: some protocol buffer files not recognized

Problem: filetype: some protocol buffer files not recognized
Solution: Detect '*.textproto', '*.textpb', '*.txtpb' as pbtxt files
(Bruno Belanyi)

See: https://protobuf.dev/reference/protobuf/textformat-spec/#text-format-files

closes: #14463

Signed-off-by: Bruno BELANYI <br...@belanyi.fr>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 99ac2028e..732362d2a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1787,7 +1787,7 @@ au BufNewFile,BufRead *.psl setf psl

" Google protocol buffers
au BufNewFile,BufRead *.proto setf proto
-au BufNewFile,BufRead *.pbtxt setf pbtxt
+au BufNewFile,BufRead *.txtpb,*.textproto,*.textpb,*.pbtxt setf pbtxt

" Poke
au BufNewFile,BufRead *.pk setf poke
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index ddcd243dd..5d42cc55e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -522,7 +522,7 @@ def s:GetFilenameChecks(): dict<list<string>>
papp: ['file.papp', 'file.pxml', 'file.pxsl'],
pascal: ['file.pas', 'file.dpr', 'file.lpr'],
passwd: ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak', '/etc/passwd', '/etc/passwd-', '/etc/passwd.edit', '/etc/shadow', '/etc/shadow-', '/etc/shadow.edit', '/var/backups/passwd.bak', '/var/backups/shadow.bak'],
- pbtxt: ['file.pbtxt'],
+ pbtxt: ['file.txtpb', 'file.textproto', 'file.textpb', 'file.pbtxt'],
pccts: ['file.g'],
pcmk: ['file.pcmk'],
pdf: ['file.pdf'],
diff --git a/src/version.c b/src/version.c
index 5fb7b1f82..65b5bd5b3 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 */
+/**/
+ 303,
/**/
302,
/**/
Reply all
Reply to author
Forward
0 new messages