thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

runtime(java): Match raw-, non-generic-, and generic-type names of "java.lang"

Browse Source 
And only match innermost element types of parameterised
array types.

References:
https://docs.oracle.com/javase/specs/jls/se21/html/jls-4.html#jls-4.8
https://docs.oracle.com/javase/specs/jls/se21/html/jls-6.html#jls-6.1
https://docs.oracle.com/javase/specs/jls/se21/html/jls-10.html

closes: #17499

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Aliaksei Budavei
2025-06-10 20:37:39 +02:00
committed by Christian Brabandt
parent 572d46035f
commit c413ac7068
27 changed files with 310 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
runtime/syntax/testdir/dumps/java_generics_06.dump
View File

@@ -1,20 +1,20 @@
| +0&#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|L|o|n|g|.|p|a|r|s|e|L|o|n|g|(|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|x|)| |{| @32
@12|c+0#af5f00255&|a|s|e| +0#0000000&|B+0#0000001#ffff4012|i|n|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|(+0#0000000#ffffff0|L|o|n|g| |b|)| |-|>| |L|o|n|g|.|t|o|B|i|n|a|r|y|S|t|r|i|n|g|(|b|)|;| @16
@12|c+0#af5f00255&|a|s|e| +0#0000000&|O+0#0000001#ffff4012|c|t|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|(+0#0000000#ffffff0|L|o|n|g| |o|)| |-|>| |L|o|n|g|.|t|o|O|c|t|a|l|S|t|r|i|n|g|(|o|)|;| @17
@12|c+0#af5f00255&|a|s|e| +0#0000000&|H+0#0000001#ffff4012|e|x|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|(+0#0000000#ffffff0|L|o|n|g| |h|)| |-|>| |L|o|n|g|.|t|o|H|e|x|S|t|r|i|n|g|(|h|)|;| @19
@12|d+0#af5f00255&|e|f|a|u|l|t| +0#0000000&|-|>| |L|o|n|g|.|t|o|S|t|r|i|n|g|(|x|.|v|a|l|u|e|(|)@1|;| @26
@8>}|,| |x|.|r|a|d|i|x|(|)@1|;| @52
| +0&#ffffff0@7|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|p|.|a|(|)|.|a|p@1|l|y|(|L+0#e000002&|o|n|g|.+0#0000000&|p|a|r|s|e|L|o|n|g|(|p|.|b|(|)|.|a|p@1|l|y|(|x|)|,| |r|a|d|i|x|)@1|;| @8
@4|}| @69
@75
@4|@+0#e000e06&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|(| +0#0000000&@41
@16|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|E|l|e|m|e|n|t|T|y|p|e|.|T|Y|P|E|_|U|S|E|)+0#e000e06&| +0#0000000&@16
@4|@+0#00e0003&|i|n|t|e|r|f|a|c|e| +0#0000000&|T|a|g@1|a|b|l|e| @51
| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|l+0#00e0003&|o|n|g| +0#00e0e07&|t|o|D|e|c|i|m|a|l|(|N+0#0000001#ffff4012|u|m|<|L+0#e000002#ffffff0|o|n|g|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|x|)| +0#0000000&@36
@4|{| @69
| +0#00e0e07&@7|S|t|r|i|n|g| |v|a|l|u|e|(|)| +0#0000000&|d+0#00e0003&|e|f|a|u|l|t| +0#0000000&|"+0#e000002&@1|;+0#0000000&| @40
@8>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|L+0#e000002&|o|n|g|.+0#0000000&|p|a|r|s|e|L|o|n|g|(|s+0#af5f00255&|w|i|t|c|h| +0#0000000&|(|x|)| |{| @32
@12|c+0#af5f00255&|a|s|e| +0#0000000&|B+0#0000001#ffff4012|i|n|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|(+0#0000000#ffffff0|L+0#e000002&|o|n|g| +0#0000000&|b|)| |-|>| |L+0#e000002&|o|n|g|.+0#0000000&|t|o|B|i|n|a|r|y|S|t|r|i|n|g|(|b|)|;| @16
@12|c+0#af5f00255&|a|s|e| +0#0000000&|O+0#0000001#ffff4012|c|t|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|(+0#0000000#ffffff0|L+0#e000002&|o|n|g| +0#0000000&|o|)| |-|>| |L+0#e000002&|o|n|g|.+0#0000000&|t|o|O|c|t|a|l|S|t|r|i|n|g|(|o|)|;| @17
@12|c+0#af5f00255&|a|s|e| +0#0000000&|H+0#0000001#ffff4012|e|x|<|?+0#0000000#ffffff0|>+0#0000001#ffff4012|(+0#0000000#ffffff0|L+0#e000002&|o|n|g| +0#0000000&|h|)| |-|>| |L+0#e000002&|o|n|g|.+0#0000000&|t|o|H|e|x|S|t|r|i|n|g|(|h|)|;| @19
@12|d+0#af5f00255&|e|f|a|u|l|t| +0#0000000&|-|>| |L+0#e000002&|o|n|g|.+0#0000000&|t+0#e000002&|o|S|t|r|i|n|g|(+0#0000000&|x|.|v|a|l|u|e|(|)@1|;| @26
@8|}|,| |x|.|r|a|d|i|x|(|)@1|;| @52
@4|}| @69
@75
| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|C+0#0000001#ffff4012|l|a|s@1|<|?+0#00e0e07#ffffff0|>+0#0000001#ffff4012| +0#00e0e07#ffffff0|e|i|t|h|e|r|C|o|m|p|a|r|a|b|l|e|O|r|I|t|e|r|a|b|l|e|(|O+0#e000002&|b|j|e|c|t| +0#00e0e07&|o|)| +0#0000000&@18
@4|{| @69
@8|i+0#00e0003&|n|t| +0#0000000&|N| |=| |0+0#e000002&|,+0#0000000&| |X| |=| |1+0#e000002&|,+0#0000000&| |Y| |=| |2+0#e000002&|;+0#0000000&| @42
@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|f| |=| |y+0#00e0e07&|-|>|N+0#0000000&|<|y|.|i|n|t|V|a|l|u|e|(|)|;| @31
@8|P+0#0000001#ffff4012|r|e|d|i|c|a|t|e|<|T+0#0000000#ffffff0|>+0#0000001#ffff4012| +0#0000000#ffffff0|g| |=| |y+0#00e0e07&|-|>|X+0#0000001#ffff4012|<|N+0#0000000#ffffff0|&@1|(|I|n|t|e|g|e|r|)|y|>+0#0000001#ffff4012|N+0#0000000#ffffff0|;| @28
@57|1|0|9|,|3|-|9| @6|8|5|%|
@8|f+0#00e0003&|i|n|a|l| +0#0000000&|b+0#00e0003&|o@1|l|e|a|n| +0#0000000&|c|o|m|p|a|r|a|b|l|e|;| @41
@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(@1|c|o|m|p|a|r|a|b|l|e| |=| |o| |i+0#af5f00255&|n|s|t|a|n|c|e|o|f| +0#0000000&|C+0#00e0003&|o|m|p|a|r|a|b|l|e|)+0#0000000&| |^| @18
@24|o| |i+0#af5f00255&|n|s|t|a|n|c|e|o|f| +0#0000000&|I+0#00e0003&|t|e|r|a|b|l|e|)+0#0000000&| @28
@12|?| |(|c|o|m|p|a|r|a|b|l|e|)| @48
@57|1|0|9|,|3|-|9| @6|7|5|%|