aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2024-12-15 12:04:33 +0100
committerChristian Clason <ch.clason+github@icloud.com>2024-12-15 12:42:27 +0100
commit6c2c77b128e74c69be0d4fd79637c742f7eaba34 (patch)
tree2ab787635bdff5919c879555b03a561936760cf7
parent820984daea8ed8143b0380f628dd54c2f2f581af (diff)
downloadrneovim-6c2c77b128e74c69be0d4fd79637c742f7eaba34.tar.gz
rneovim-6c2c77b128e74c69be0d4fd79637c742f7eaba34.tar.bz2
rneovim-6c2c77b128e74c69be0d4fd79637c742f7eaba34.zip
vim-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: vim/vim#16212 https://github.com/vim/vim/commit/7d1bb90dcf711c732a49e0a45e56028a4853a17d Co-authored-by: Brandon Maier <brandon.maier@gmail.com>
-rw-r--r--runtime/lua/vim/filetype.lua1
-rw-r--r--test/old/testdir/test_filetype.vim2
2 files changed, 2 insertions, 1 deletions
diff --git a/runtime/lua/vim/filetype.lua b/runtime/lua/vim/filetype.lua
index 8a51d2a9d3..eb68e24acf 100644
--- a/runtime/lua/vim/filetype.lua
+++ b/runtime/lua/vim/filetype.lua
@@ -1874,6 +1874,7 @@ local filename = {
['.clangd'] = 'yaml',
['.clang-format'] = 'yaml',
['.clang-tidy'] = 'yaml',
+ ['pixi.lock'] = 'yaml',
['yarn.lock'] = 'yaml',
matplotlibrc = 'yaml',
['.condarc'] = 'yaml',
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index d1551885b1..222cdb9504 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -890,7 +890,7 @@ func s:GetFilenameChecks() abort
\ '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'],