aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-13 22:54:27 -05:00
Code Activity

patch 9.1.1886: filetype: Android aconfig files are not recognized

Browse Source 
Problem:  filetype: Android aconfig files are not recognized
Solution: Detect *.aconfig files as pbtxt filetype (Bruno Belanyi)

Reference:
https://source.android.com/docs/setup/build/feature-flagging/declare-flag

closes: #18656

Signed-off-by: Bruno Belanyi <bruno@belanyi.fr>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Bruno Belanyi
2025-10-28 20:31:55 +00:00
committed by Christian Brabandt
parent b2e6b328da
commit 7adeb09bb2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/autoload/dist/ft.vim vendored
View File

@@ -3,7 +3,7 @@ vim9script
# Vim functions for file type detection # Vim functions for file type detection
# #
# Maintainer: The Vim Project <https://github.com/vim/vim> # Maintainer: The Vim Project <https://github.com/vim/vim>
# Last Change: 2025 Oct 09 # Last Change: 2025 Oct 28
# Former Maintainer: Bram Moolenaar <Bram@vim.org> # Former Maintainer: Bram Moolenaar <Bram@vim.org>
# These functions are moved here from runtime/filetype.vim to make startup # These functions are moved here from runtime/filetype.vim to make startup
@@ -2473,6 +2473,7 @@ const ft_from_ext = {
"textproto": "pbtxt", "textproto": "pbtxt",
"textpb": "pbtxt", "textpb": "pbtxt",
"pbtxt": "pbtxt", "pbtxt": "pbtxt",
"aconfig": "pbtxt", # Android aconfig files
# Poke # Poke
"pk": "poke", "pk": "poke",
# Nvidia PTX (Parallel Thread Execution) # Nvidia PTX (Parallel Thread Execution)

2
src/testdir/test_filetype.vim
View File

@@ -603,7 +603,7 @@ def s:GetFilenameChecks(): dict<list<string>>
papp: ['file.papp', 'file.pxml', 'file.pxsl'], papp: ['file.papp', 'file.pxml', 'file.pxsl'],
pascal: ['file.pas', 'file.dpr', 'file.lpr'], 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'], 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.txtpb', 'file.textproto', 'file.textpb', 'file.pbtxt'], pbtxt: ['file.txtpb', 'file.textproto', 'file.textpb', 'file.pbtxt', 'file.aconfig'],
pccts: ['file.g'], pccts: ['file.g'],
pcmk: ['file.pcmk'], pcmk: ['file.pcmk'],
pdf: ['file.pdf'], pdf: ['file.pdf'],

2
src/version.c
View File

@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1886,
/**/ /**/
1885, 1885,
/**/ /**/