Commit: patch 9.1.0951: filetype: jshell files are not recognized

2 views
Skip to first unread message

Christian Brabandt

unread,
Dec 22, 2024, 5:00:17 AM12/22/24
to vim...@googlegroups.com
patch 9.1.0951: filetype: jshell files are not recognized

Commit: https://github.com/vim/vim/commit/62e3014ab1146d7f78694c97fc6974f1af2cc5af
Author: Konfekt <Kon...@users.noreply.github.com>
Date: Sun Dec 22 10:57:33 2024 +0100

patch 9.1.0951: filetype: jshell files are not recognized

Problem: filetype: jshell files are not recognized
Solution: detect '*.jsh' files as java filetype
(Konfekt)

closes: #16260

Signed-off-by: Konfekt <Kon...@users.noreply.github.com>
Signed-off-by: Aliaksei Budavei <0x00...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d962e0f54..fe3d4b554 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1200,7 +1200,7 @@ au BufNewFile,BufRead *.jpl,*.jpr setf jam
au BufNewFile,BufRead *.janet setf janet

" Java
-au BufNewFile,BufRead *.java,*.jav setf java
+au BufNewFile,BufRead *.java,*.jav,*.jsh setf java

" JavaCC
au BufNewFile,BufRead *.jj,*.jjt setf javacc
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index c650867d6..4761e7137 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -375,7 +375,7 @@ def s:GetFilenameChecks(): dict<list<string>>
jal: ['file.jal', 'file.JAL'],
jam: ['file.jpl', 'file.jpr', 'JAM-file.file', 'JAM.file', 'Prl-file.file', 'Prl.file'],
janet: ['file.janet'],
- java: ['file.java', 'file.jav'],
+ java: ['file.java', 'file.jav', 'file.jsh'],
javacc: ['file.jj', 'file.jjt'],
javascript: ['file.js', 'file.jsm', 'file.javascript', 'file.es', 'file.mjs', 'file.cjs', '.node_repl_history', '.bun_repl_history', 'deno_history.txt'],
'javascript.glimmer': ['file.gjs'],
diff --git a/src/version.c b/src/version.c
index 82eb6ea8e..f34048e91 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 */
+/**/
+ 951,
/**/
950,
/**/
Reply all
Reply to author
Forward
0 new messages