patch 9.1.0290: filetype: xilinx files are not recognized
Commit:
https://github.com/vim/vim/commit/614691ceefb2b2470cd9097013ffc140f81d6a71
Author: Wu, Zhenyu <wuzhe...@ustc.edu>
Date: Tue Apr 9 22:14:37 2024 +0200
patch 9.1.0290: filetype: xilinx files are not recognized
Problem: filetype: xilinx files are not recognized
Solution: Add a few xilinx specific file patterns,
inspect lpr files for being xml/pascal
(Wu, Zhenyu)
closes: #14454
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 51630d20e..e84a5b614 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1588,8 +1588,16 @@ au BufNewFile,BufRead *.pas
setf pascal
" Pascal or Puppet manifest
au BufNewFile,BufRead *.pp call dist#ft#FTpp()
-" Delphi or Lazarus program file
-au BufNewFile,BufRead *.dpr,*.lpr setf pascal
+" Delphi
+au BufNewFile,BufRead *.dpr setf pascal
+
+" Xilinx labtools project file or Lazarus program file
+au BufNewFile,BufRead *.lpr
+ \ if getline(1) =~# "<?xml" |
+ \ setf xml |
+ \ else |
+ \ setf pascal |
+ \ endif
" Free Pascal makefile definition file
au BufNewFile,BufRead *.fpc setf fpcmake
@@ -2607,6 +2615,10 @@ au BufNewFile,BufRead xorg.conf,xorg.conf-4 let
b:xf86conf_xfree86_version = 4 |
" Xinetd conf
au BufNewFile,BufRead */etc/xinetd.conf setf xinetd
+" Xilinx Vivado/Vitis project files and block design files
+au BufNewFile,BufRead *.xpr,*.xpfm,*.spfm,*.bxml setf xml
+au BufNewFile,BufRead *.bd,*.bda,*.xci setf json
+
" XS Perl extension interface language
au BufNewFile,BufRead *.xs setf xs
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 8417eaee8..3321b306c 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -351,7 +351,7 @@ def s:GetFilenameChecks(): dict<list<string>>
jq: ['file.jq'],
jovial: ['file.jov', 'file.j73', 'file.jovial'],
jproperties: ['file.properties', 'file.properties_xx',
'file.properties_xx_xx', 'some.properties_xx_xx_file', 'org.eclipse.xyz.prefs'],
- json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson',
'file.webmanifest', 'Pipfile.lock', 'file.ipynb', 'file.jupyterlab-settings',
'.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf',
'file.sublime-project', 'file.sublime-settings', 'file.sublime-workspace'],
+ json: ['file.json', 'file.jsonp', 'file.json-patch', 'file.geojson',
'file.webmanifest', 'Pipfile.lock', 'file.ipynb', 'file.jupyterlab-settings',
'.prettierrc', '.firebaserc', '.stylelintrc', 'file.slnf',
'file.sublime-project', 'file.sublime-settings', 'file.sublime-workspace',
'file.bd', 'file.bda', 'file.xci'],
json5: ['file.json5'],
jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc',
'.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json', 'tsconfig.test.json',
'tsconfig-test.json', '.luaurc'],
jsonl: ['file.jsonl'],
@@ -815,7 +815,7 @@ def s:GetFilenameChecks(): dict<list<string>>
xinetd: ['/etc/xinetd.conf', '/etc/xinetd.d/file', 'any/etc/xinetd.conf',
'any/etc/xinetd.d/file'],
xkb: ['/usr/share/X11/xkb/compat/pc', '/usr/share/X11/xkb/geometry/pc',
'/usr/share/X11/xkb/keycodes/evdev', '/usr/share/X11/xkb/symbols/pc',
'/usr/share/X11/xkb/types/pc'],
xmath: ['file.msc', 'file.msf'],
- xml: ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj',
'file.csproj.user', 'file.fsproj', 'file.fsproj.user', 'file.vbproj',
'file.vbproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu',
'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl',
'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu',
'file.atom', 'file.rss', 'file.cdxml', 'file.psc1', 'file.mpd', 'fonts.conf'],
+ xml: ['/etc/blkid.tab', '/etc/blkid.tab.old', 'file.xmi', 'file.csproj',
'file.csproj.user', 'file.fsproj', 'file.fsproj.user', 'file.vbproj',
'file.vbproj.user', 'file.ui', 'file.tpm', '/etc/xdg/menus/file.menu',
'fglrxrc', 'file.xlf', 'file.xliff', 'file.xul', 'file.wsdl', 'file.wpl',
'any/etc/blkid.tab', 'any/etc/blkid.tab.old', 'any/etc/xdg/menus/file.menu',
'file.atom', 'file.rss', 'file.cdxml', 'file.psc1', 'file.mpd', 'fonts.conf',
'file.xpr', 'file.xpfm', 'file.spfm', 'file.bxml'],
xmodmap: ['anyXmodmap', 'Xmodmap', 'some-Xmodmap', 'some-xmodmap',
'some-xmodmap-file', 'xmodmap', 'xmodmap-file'],
xpm: ['file.xpm'],
xpm2: ['file.xpm2'],
diff --git a/src/version.c b/src/version.c
index f1c52c5ae..f215931ee 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 */
+/**/
+ 290,
/**/
289,
/**/
--
--
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 on the web visit
https://groups.google.com/d/msgid/vim_dev/E1ruI6V-000q9l-2V%40256bit.org.
