runtime(java): Reference a modern syntax item generator for type names
And generalise the sourcing of "javaid.vim" for Java
buffers.
Resolves zzzyxwvut/java-vim#10.
closes: #17411
Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 513fdac..76b8dc0 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 9.1. Last change: 2025 May 21
+*syntax.txt* For Vim version 9.1. Last change: 2025 May 31
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2067,13 +2067,8 @@
All (exported) public types declared in `java.lang` are always automatically
imported and available as simple names. To highlight them, use: >
:let g:java_highlight_java_lang_ids = 1
-
-You can also highlight types of most standard Java packages if you download
-the javaid.vim script at http://www.fleiner.com/vim/download.html. If you
-prefer to only highlight types of a certain package, say `java.io`, use the
-following: >
- :let g:java_highlight_java_io = 1
-Check the javaid.vim file for a list of all the packages that are supported.
+You can also generate syntax items for other public and protected types and
+opt in to highlight some of their names see |java-package-info-url|.
Headers of indented function declarations can be highlighted (along with parts
of lambda expressions and method reference expressions), but it depends on how
@@ -2226,7 +2221,8 @@
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
optionality will be discontinued.
-
+ *java-package-info-url*
+https://github.com/zzzyxwvut/java-vim/blob/42cbd51/tools/javaid/src/javaid/package-info.java
JSON *json.vim* *ft-json-syntax* *g:vim_json_conceal*
*g:vim_json_warnings*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index d3c77d1..44dd76f 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -8580,6 +8580,7 @@
j motion.txt /*j*
java-cinoptions indent.txt /*java-cinoptions*
java-indenting indent.txt /*java-indenting*
+java-package-info-url syntax.txt /*java-package-info-url*
java.vim syntax.txt /*java.vim*
javascript-cinoptions indent.txt /*javascript-cinoptions*
javascript-indenting indent.txt /*javascript-indenting*
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 37b99b7..8128512 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 <claudio@fleiner.com>
" Repository: https://github.com/zzzyxwvut/java-vim.git
-" Last Change: 2025 Apr 28
+" Last Change: 2025 May 30
" Please check ":help java.vim" for comments on some of the options
" available.
@@ -301,9 +301,7 @@
hi def link javaLangObject javaConstant
endif
-if filereadable(expand("<sfile>:p:h") . "/javaid.vim")
- source <sfile>:p:h/javaid.vim
-endif
+runtime syntax/javaid.vim
if exists("g:java_space_errors")
if !exists("g:java_no_trail_space_error")