patch 9.1.0238: filetype: jupyterlab and sublime config are not recognized
Commit:
https://github.com/vim/vim/commit/75c607dff7c9e02766ae0fd3588e08da00394d0f
Author: Wu, Zhenyu <[email protected]>
Date: Sun Mar 31 19:08:07 2024 +0200
patch 9.1.0238: filetype: jupyterlab and sublime config are not recognized
Problem: filetype: jupyterlab and sublime config are not recognized
Solution: Detect jupyterlab and sublime config files as json
(Wu, Zhenyu)
closes: #14359
Signed-off-by: Wu, Zhenyu <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index cbd677cef..bda088531 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1098,8 +1098,11 @@ au BufNewFile,BufRead *.json-patch setf
json
" Geojson is also json
au BufNewFile,BufRead *.geojson setf json
-" Jupyter Notebook is also json
-au BufNewFile,BufRead *.ipynb setf json
+" Jupyter Notebook and jupyterlab config is also json
+au BufNewFile,BufRead *.ipynb,*.jupyterlab-settings setf json
+
+" Sublime config
+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
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index b1af7026d..d84805f16 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -350,7 +350,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', '.prettierrc', '.firebaserc',
'.stylelintrc', 'file.slnf'],
+ 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'],
json5: ['file.json5'],
jsonc: ['file.jsonc', '.babelrc', '.eslintrc', '.jsfmtrc', '.jshintrc',
'.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 2bf701cf6..b1844bfda 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 */
+/**/
+ 238,
/**/
237,
/**/
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1rqylu-000LfW-Be%40256bit.org.
