patch 9.1.0355: filetype: flake.lock files are not recognized
Commit:
https://github.com/vim/vim/commit/ce736033ae86e14e8b1a56a3e4843c7ab24e48d2
Author: Riley Bruins <ribr...@hotmail.com>
Date: Fri Apr 19 15:13:38 2024 +0200
patch 9.1.0355: filetype: flake.lock files are not recognized
Problem: filetype: flake.lock files are not recognized
Solution: Detect 'flake.lock' as json filetype
(Riley Bruins)
closes: #14589
Signed-off-by: Riley Bruins <ribr...@hotmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c7fc33196..8c7c015ef 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1167,7 +1167,7 @@ au BufNewFile,BufRead *.ipynb,*.jupyterlab-settings
setf json
au BufNewFile,BufRead *.sublime-project,*.sublime-settings,*.sublime-workspace
setf json
" Other files that look like json
-au BufNewFile,BufRead .prettierrc,.firebaserc,.stylelintrc setf json
+au BufNewFile,BufRead .prettierrc,.firebaserc,.stylelintrc,flake.lock setf
json
" JSONC (JSON with comments)
au BufNewFile,BufRead *.jsonc,.babelrc,.eslintrc,.jsfmtrc setf jsonc
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 02a6e2d1c..1d9954d1e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -361,7 +361,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',
'file.bd', 'file.bda', 'file.xci'],
+ 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', 'flake.lock'],
json5: ['file.json5'],
jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc',
'.jscsrc', '.vsconfig', '.hintrc', '.swrc', 'jsconfig.json', 'tsconfig.json',
'tsconfig.test.json', 'tsconfig-test.json', '.luaurc'],
jsonl: ['file.jsonl'],
diff --git a/src/version.c b/src/version.c
index 23d2c803d..df4217dbf 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 */
+/**/
+ 355,
/**/
354,
/**/
--
--
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/E1rxoJa-002J6v-0i%40256bit.org.
