Commit: patch 9.1.0248: filetype: yarn lock files are not recognized

3 views
Skip to first unread message

Christian Brabandt

unread,
Mar 31, 2024, 2:00:13 PM3/31/24
to vim...@googlegroups.com
patch 9.1.0248: filetype: yarn lock files are not recognized

Commit: https://github.com/vim/vim/commit/3b497aa2470ff613fed79569bc8589dae8dc3190
Author: Wu, Zhenyu <wuzh...@ustc.edu>
Date: Sun Mar 31 19:51:19 2024 +0200

patch 9.1.0248: filetype: yarn lock files are not recognized

Problem: filetype: yarn lock files are not recognized
Solution: Detect 'yarn.lock' files as yaml
(Wu, Zhenyu)

closes: #14369

Signed-off-by: Wu, Zhenyu <wuzh...@ustc.edu>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a289c8588..ca4678cce 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2959,6 +2959,9 @@ au filetypedetect BufNewFile,BufRead,StdinReadPost *
\ setf FALLBACK conf |
\ endif

+" Yarn lock
+au BufNewFile,BufRead yarn.lock setf yaml
+

" If the GUI is already running, may still need to install the Syntax menu.
" Don't do it when the 'M' flag is included in 'guioptions'.
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index aba03e4b7..a8c7ef4ad 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -820,7 +820,7 @@ def s:GetFilenameChecks(): dict<list<string>>
xsd: ['file.xsd'],
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'],
+ yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'yarn.lock'],
yang: ['file.yang'],
yuck: ['file.yuck'],
z8a: ['file.z8a'],
diff --git a/src/version.c b/src/version.c
index 47d8e1497..7eb84b743 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 */
+/**/
+ 248,
/**/
247,
/**/
Reply all
Reply to author
Forward
0 new messages