patch 9.1.0926: filetype: Pixi lock files are not recognized

Problem:  filetype: Pixi lock files are not recognized
Solution: detect "pixi.lock" file as yaml filetype
          (Brandon Maier)

Reference:
https://pixi.sh/latest/features/lockfile/

closes: #16212

Signed-off-by: Brandon Maier <brandon.maier@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index cac7c2ca421aa4bd11c4798e7102618c199c25ac..eb1d8512894de7a62cde601a796345560ecea7c7 100644 (file)
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1873,6 +1873,9 @@ au BufNewFile,BufRead requires/*.txt              setf requirements
 au BufNewFile,BufRead Pipfile                  setf toml
 au BufNewFile,BufRead Pipfile.lock             setf json
 
+" Pixi lock
+au BufNewFile,BufRead pixi.lock                        setf yaml
+
 " PL/1, PL/I
 au BufNewFile,BufRead *.pli,*.pl1              setf pli
 

diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index e9535bf0337d4b8636837a51e221dafd625a7390..583cca63960da7fbf8f49dd9ddb6d56bc9332404 100644 (file)
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -893,7 +893,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     xslt: ['file.xsl', 'file.xslt'],
     yacc: ['file.yy', 'file.yxx', 'file.y++'],
     yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'matplotlibrc', 'yarn.lock',
-           '/home/user/.kube/config', '.condarc', 'condarc'],
+           '/home/user/.kube/config', '.condarc', 'condarc', 'pixi.lock'],
     yang: ['file.yang'],
     yuck: ['file.yuck'],
     z8a: ['file.z8a'],

diff --git a/src/version.c b/src/version.c
index 789df38a235c47633a9a9f324299620b68a93b6a..caf3d5d4866c162bcff6bc02616fb121b6c4202a 100644 (file)
--- 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 */
+/**/
+    926,
 /**/
     925,
 /**/