From c9eaff0a8ac7d8c38878361b53343348d93afff5 Mon Sep 17 00:00:00 2001 From: Aliaksei Budavei <0x000c70@gmail.com> Date: Mon, 23 Mar 2026 19:54:00 +0000 Subject: [PATCH] runtime(java): Make changes for JDK 26 Reintroduce supported syntax-preview-feature numbers 455, 488, and 507 as _a new number_ 530. Reference: https://openjdk.org/jeps/530 (Primitive Types in Patterns etc.) closes: #19793 Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com> Signed-off-by: Christian Brabandt --- runtime/doc/syntax.txt | 6 +++--- runtime/syntax/java.vim | 4 ++-- runtime/syntax/testdir/dumps/java_previews_455_00.dump | 2 +- runtime/syntax/testdir/input/java_previews_455.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 16756c22f0..c771a400ab 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 9.2. Last change: 2026 Feb 14 +*syntax.txt* For Vim version 9.2. Last change: 2026 Mar 22 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2285,11 +2285,11 @@ cycles for such a feature to become either integrated into the platform or withdrawn from this effort. To cater for early adopters, there is optional support in Vim for syntax related preview features that are implemented. You can request it by specifying a list of preview feature numbers as follows: > - :let g:java_syntax_previews = [507] + :let g:java_syntax_previews = [530] The supported JEP numbers are to be drawn from this table: `430`: String Templates [JDK 21] - `507`: Primitive types in Patterns, instanceof, and switch + `530`: Primitive types in Patterns, instanceof, and switch Note that as soon as the particular preview feature will have been integrated into the Java platform, its entry will be removed from the table and related diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim index bc874904f6..ee2b06ffd9 100644 --- a/runtime/syntax/java.vim +++ b/runtime/syntax/java.vim @@ -3,7 +3,7 @@ " Maintainer: Aliaksei Budavei <0x000c70 AT gmail DOT com> " Former Maintainer: Claudio Fleiner " Repository: https://github.com/zzzyxwvut/java-vim.git -" Last Change: 2026 Feb 06 +" Last Change: 2026 Mar 22 " Please check ":help java.vim" for comments on some of the options " available. @@ -381,7 +381,7 @@ endif exec 'syn match javaUserLabel "^\s*\<\K\k*\>\%(\\)\@' . s:ff.Peek('7', '') . '" matchgroup=NONE end=":\|->" contains=javaBoolean,javaNumber,javaCharacter,javaString,javaConstant,@javaClasses,javaGenerics,javaType,javaLabelDefault,javaLabelVarType,javaLabelWhenClause else syn region javaLabelRegion transparent matchgroup=javaLabel start="\" matchgroup=NONE end=":\|->" contains=javaLabelCastType,javaLabelNumber,javaCharacter,javaString,javaConstant,@javaClasses,javaGenerics,javaLabelDefault,javaLabelVarType,javaLabelWhenClause diff --git a/runtime/syntax/testdir/dumps/java_previews_455_00.dump b/runtime/syntax/testdir/dumps/java_previews_455_00.dump index 3a61cf84c3..1612b79266 100644 --- a/runtime/syntax/testdir/dumps/java_previews_455_00.dump +++ b/runtime/syntax/testdir/dumps/java_previews_455_00.dump @@ -1,4 +1,4 @@ ->/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|s|y|n|t|a|x|_|p|r|e|v|i|e|w|s| |=| |[|4|5@1|,| |4|8@1|,| |5|0|7|]| +0#0000000&@12 +>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t| |g|:|j|a|v|a|_|s|y|n|t|a|x|_|p|r|e|v|i|e|w|s| |=| |[|4|5@1|,| |4|8@1|,| |5|0|7|,| |5|3|0|]| +0#0000000&@7 @75 @75 @75 diff --git a/runtime/syntax/testdir/input/java_previews_455.java b/runtime/syntax/testdir/input/java_previews_455.java index bdffa23f74..69f3798430 100644 --- a/runtime/syntax/testdir/input/java_previews_455.java +++ b/runtime/syntax/testdir/input/java_previews_455.java @@ -1,4 +1,4 @@ -// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507] +// VIM_TEST_SETUP let g:java_syntax_previews = [455, 488, 507, 530]