diff options
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index a289c85887..ca4678cce5 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 aba03e4b7f..a8c7ef4adb 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 47d8e14970..7eb84b7430 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 248, +/**/ 247, /**/ 246, |