runtime(java): Stop handpicking syntax groups for @javaTop (#14727)
Commit:
https://github.com/vim/vim/commit/06bdac158072b90560915f8e664ee6d9bdab2f9b
Author: Aliaksei Budavei <32549825+zzzyxw...@users.noreply.github.com>
Date: Fri May 10 15:49:06 2024 +0300
runtime(java): Stop handpicking syntax groups for @javaTop
(https://github.com/vim/vim/issues/14727)
* runtime(java): Stop handpicking syntax groups for @javaTop
Also:
- Remove the obsolete comment for g:java_allow_cpp_keywords.
- Remove the commented out groups java\%[Debug\]StringError.
- Infer and set the preferred formatting Vim options from
the modeline.
Since vim-6-0u, non-contained syntax groups can be referred
to by using the "contains=TOP..." argument.
* Set &encoding and &termencoding to "utf-8" for test files
* Limit non-ASCII charset to [§ƒɐɘʬʭΑ-Τα-μ] for test files
Signed-off-by: Aliaksei Budavei <0x000...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index ff9b4b04b..4bf154473 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 <clau...@fleiner.com>
" Repository: https://github.com/zzzyxwvut/java-vim.git
-" Last Change: 2024 Apr 28
+" Last Change: 2024 May 07
" Please check :help java.vim for comments on some of the options available.
@@ -90,7 +90,6 @@ if s:module_info_cur_buf
syn keyword javaModuleStorageClass module transitive
syn keyword javaModuleStmt open requires exports opens uses
provides
syn keyword javaModuleExternal to with
- syn cluster javaTop
add=javaModuleStorageClass,javaModuleStmt,javaModuleExternal
endif
if exists("java_highlight_java_lang_ids")
@@ -107,7 +106,6 @@ if exists("java_highlight_all") ||
exists("java_highlight_java") || exists("ja
" the current keyword placement. The below _match_es follow suit.
syn keyword javaR_JavaLang ArithmeticException
ArrayIndexOutOfBoundsException ArrayStoreException ClassCastException
IllegalArgumentException IllegalMonitorStateException
IllegalThreadStateException IndexOutOfBoundsException
NegativeArraySizeException NullPointerException NumberFormatException
RuntimeException SecurityException StringIndexOutOfBoundsException
IllegalStateException UnsupportedOperationException
EnumConstantNotPresentException TypeNotPresentException IllegalCallerException
LayerInstantiationException WrongThreadException MatchException
- syn cluster javaTop add=javaR_JavaLang
syn cluster javaClasses add=javaR_JavaLang
hi def link javaR_JavaLang javaR_Java
" Member enumerations:
@@ -128,15 +126,12 @@ if exists("java_highlight_all") ||
exists("java_highlight_java") || exists("ja
syn match javaC_JavaLang "\<System\>" " See javaDebug.
" As of JDK 21, java.lang.Compiler is no more (deprecated in JDK 9).
syn keyword javaLangDeprecated Compiler
- syn cluster javaTop add=javaC_JavaLang
syn cluster javaClasses add=javaC_JavaLang
hi def link javaC_JavaLang javaC_Java
syn keyword javaE_JavaLang AbstractMethodError ClassCircularityError
ClassFormatError Error IllegalAccessError IncompatibleClassChangeError
InstantiationError InternalError LinkageError NoClassDefFoundError
NoSuchFieldError NoSuchMethodError OutOfMemoryError StackOverflowError
ThreadDeath UnknownError UnsatisfiedLinkError VerifyError VirtualMachineError
ExceptionInInitializerError UnsupportedClassVersionError AssertionError
BootstrapMethodError
- syn cluster javaTop add=javaE_JavaLang
syn cluster javaClasses add=javaE_JavaLang
hi def link javaE_JavaLang javaE_Java
syn keyword javaX_JavaLang ClassNotFoundException CloneNotSupportedException
Exception IllegalAccessException InstantiationException InterruptedException
NoSuchMethodException Throwable NoSuchFieldException
ReflectiveOperationException
- syn cluster javaTop add=javaX_JavaLang
syn cluster javaClasses add=javaX_JavaLang
hi def link javaX_JavaLang javaX_Java
@@ -152,7 +147,6 @@ if exists("java_highlight_all") ||
exists("java_highlight_java") || exists("ja
syn keyword javaLangObject clone equals finalize getClass hashCode
syn keyword javaLangObject notify notifyAll toString wait
hi def link javaLangObject javaConstant
- syn cluster javaTop add=javaLangObject
endif
if filereadable(expand("<sfile>:p:h")."/javaid.vim")
@@ -187,13 +181,6 @@ hi def link javaLabelVarType javaOperator
hi def link javaLabelNumber javaNumber
hi def link javaLabelCastType javaType
-" highlighting C++ keywords as errors removed, too many people find it
-" annoying. Was: if !exists("java_allow_cpp_keywords")
-
-" The following cluster contains all java groups except the contained ones
-syn cluster javaTop
add=javaExternal,javaError,javaBranch,javaLabelRegion,javaConditional,javaRepeat,javaBoolean,javaConstant,javaTypedef,javaOperator,javaType,javaStatement,javaStorageClass,javaAssert,javaExceptions,javaMethodDecl,javaClassDecl,javaScopeDecl,javaConceptKind,javaError2,javaUserLabel,javaLangObject,javaAnnotation,javaVarArg
-
-
" Comments
syn keyword javaTodo contained TODO FIXME XXX
@@ -223,8 +210,6 @@ syn match javaCommentError contained "/\*"me=e-1 display
hi def link javaCommentError javaError
hi def link javaCommentStart javaComment
-syn cluster javaTop add=javaComment,javaLineComment
-
if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
syntax case ignore
" syntax coloring for javadoc comments (HTML)
@@ -266,8 +251,6 @@ syn match javaTextBlockError +"""\s*"""+
syn region javaStrTemplEmbExp contained matchgroup=javaStrTempl start="\{"
end="}" contains=TOP
syn region javaStrTempl start=+\%(\.[[:space:]
]*\)\@<="+ end=+"+
contains=javaStrTemplEmbExp,javaSpecialChar,javaSpecialError,@Spell
syn region javaStrTempl start=+\%(\.[[:space:]
]*\)\@<="""[ \x0c
]*$+hs=e+1 end=+"""+he=s-1
contains=javaStrTemplEmbExp,javaSpecialChar,javaSpecialError,javaTextBlockError,@Spell
-" The next line is commented out, it can cause a crash for a long line
-"syn match javaStringError +"\%([^"\]\|\.\)*$+
syn match javaCharacter "'[^']*'"
contains=javaSpecialChar,javaSpecialCharError
syn match javaCharacter "'\''" contains=javaSpecialChar
syn match javaCharacter "'[^\]'"
@@ -286,8 +269,6 @@ syn match javaNumber
"\<0[xX]\%(\x\%(_*\x\)*\.\=\|\%(\x\%(_*\x\)*\)\=\.\x\%(
" Unicode characters
syn match javaSpecial "\u\x\x\x\x"
-syn cluster javaTop
add=javaString,javaStrTempl,javaCharacter,javaNumber,javaSpecial,javaStringError,javaTextBlockError
-
" Method declarations (JLS-17, §8.4.3, §8.4.4, §9.4).
if exists("java_highlight_functions")
syn cluster javaFuncParams
contains=javaAnnotation,@javaClasses,javaType,javaVarArg,javaComment,javaLineComment
@@ -328,7 +309,6 @@ if exists("java_highlight_functions")
syn match javaLambdaDef "\<\K\k*\>\%(\<default\>\)\@<!\s*->"
syn match javaBraces "[{}]"
- syn cluster javaTop add=javaFuncDef,javaBraces,javaLambdaDef
endif
if exists("java_highlight_debug")
@@ -341,8 +321,6 @@ if exists("java_highlight_debug")
syn region javaDebugStrTemplEmbExp contained matchgroup=javaDebugStrTempl
start="\{" end="}" contains=javaComment,javaLineComment,javaDebug\%(Paren\)\@!.*
syn region javaDebugStrTempl contained start=+\%(\.[[:space:]
]*\)\@<="+ end=+"+ contains=javaDebugStrTemplEmbExp,javaDebugSpecial
syn region javaDebugStrTempl contained start=+\%(\.[[:space:]
]*\)\@<="""[ \x0c
]*$+hs=e+1 end=+"""+he=s-1
contains=javaDebugStrTemplEmbExp,javaDebugSpecial,javaDebugTextBlockError
- " The next line is commented out, it can cause a crash for a long line
-" syn match javaDebugStringError contained +"\%([^"\]\|\.\)*$+
syn match javaDebugTextBlockError contained +"""\s*"""+
syn match javaDebugCharacter contained "'[^\]'"
syn match javaDebugSpecialCharacter contained "'\.'"
@@ -366,13 +344,10 @@ if exists("java_highlight_debug")
" FIXME: What API do "trace*" belong to?
" syn match javaDebug "\<trace[SL]\=\s*("me=e-1 contains=javaDebug.*
nextgroup=javaDebugParen
- syn cluster javaTop add=javaDebug
-
hi def link javaDebug Debug
hi def link javaDebugString DebugString
hi def link javaDebugStrTempl Macro
- hi def link javaDebugStringError javaError
- hi def link javaDebugTextBlockError javaDebugStringError
+ hi def link javaDebugTextBlockError Error
hi def link javaDebugType DebugType
hi def link javaDebugBoolean DebugBoolean
hi def link javaDebugNumber Debug
@@ -390,7 +365,6 @@ endif
if exists("java_mark_braces_in_parens_as_errors")
syn match javaInParen contained "[{}]"
hi def link javaInParen javaError
- syn cluster javaTop add=javaInParen
endif
" catch errors caused by wrong parenthesis
@@ -411,6 +385,10 @@ if exists("java_highlight_functions")
syn match javaLambdaDef "\k\@4<!(\%(\k\|[[:space:]<>?\[\]@,.]\)*)\s*->"
endif
+" The @javaTop cluster comprises non-contained Java syntax groups.
+" Note that the syntax file "aidl.vim" relies on its availability.
+syn cluster javaTop
contains=TOP,javaDocComment,javaFold,javaParenError,javaParenT
+
if !exists("java_minlines")
let java_minlines = 10
endif
@@ -452,8 +430,7 @@ hi def link javaCharacter Character
hi def link javaSpecialChar SpecialChar
hi def link javaNumber Number
hi def link javaError Error
-hi def link javaStringError Error
-hi def link javaTextBlockError javaStringError
+hi def link javaTextBlockError Error
hi def link javaStatement Statement
hi def link javaOperator Operator
hi def link javaComment Comment
@@ -497,4 +474,4 @@ let b:spell_options = "contained"
let &cpo = s:cpo_save
unlet s:selectable_regexp_engine s:module_info_cur_buf s:cpo_save
-" vim: ts=8
+" vim: sw=2 ts=8 noet sta
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump
index 628ead02a..8af1d018e 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_00.dump
@@ -1,5 +1,5 @@
>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t|
>|g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|i|n|d|e|n|t|2|'|
>+0#0000000&@14
-@75
+|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|
|e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8|
+0#0000000&@19
@75
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|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|;|
@34
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39
@@ -9,12 +9,12 @@
@2|/+0#0000e05&@1| |T|Y|P|E|S|.| +0#0000000&@63
@2|r+0#00e0003&|e|c|o|r|d| +0#0000000&|Τ|ʬ|<|α|>|(|α| |a|)| |{+0#00e0e07&|
+0#0000000&|}+0#00e0e07&| +0#0000000&@51
@75
-@2|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @66
+@2|e+0#00e0003&|n|u|m| +0#0000000&|E| @66
@2|{+0#00e0e07&| +0#0000000&@71
-@4|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,| |B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,|
|C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @39
-@4|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @39
-@4|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @55
-@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@35
+@4|A|(|"+0#e000002&|a|"|)+0#0000000&|,| |B|(|"+0#e000002&|b|"|)+0#0000000&|,|
|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,| @39
+@4|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @39
+@4|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @55
+@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}+0#00e0e07&|
+0#0000000&@35
@2|}+0#00e0e07&| +0#0000000&@71
@75
@57|1|,|1| @10|T|o|p|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
index 3fdd9af2e..09169e653 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
@@ -1,7 +1,7 @@
-| +0&#ffffff0@3|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,|
|B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,| |C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,|
|D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @39
-@4|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @39
-@4|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @55
-@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@35
+| +0&#ffffff0@3|A|(|"+0#e000002&|a|"|)+0#0000000&|,|
|B|(|"+0#e000002&|b|"|)+0#0000000&|,| |C|(|"+0#e000002&|c|"|)+0#0000000&|,|
|D|(|"+0#e000002&|d|"|)+0#0000000&|,| @39
+@4|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @39
+@4|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @55
+@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}+0#00e0e07&|
+0#0000000&@35
@2|}+0#00e0e07&| +0#0000000&@71
> @74
@2|@+0#e000e06&|T|a|r|g|e|t|(+0#0000000&|{+0#00e0e07&|E+0#0000000&|l|e|m|e|n|t|T|y|p|e|.|M|E|T|H|O|D|,|
|E|l|e|m|e|n|t|T|y|p|e|.|C|O|N|S|T|R|U|C|T|O|R|}+0#00e0e07&|)+0#0000000&| @18
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
index 081ecc9bb..4999b85e3 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
@@ -1,7 +1,7 @@
| +0#00e0e07#ffffff0@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@13
| +0#00e0e07&@63|)|;+0#0000000&| @8
| +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|
|μ|ʭ@1|$|0|_|(| +0#0000000&@23
-| +0#00e0e07&@23|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|𝛽|)|;+0#0000000&| @5
+| +0#00e0e07&@23|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|b|)|;+0#0000000&| @5
@75
| +0#00e0e07&@1>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&|
@15
| +0#00e0e07&@1|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@25
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
index c32786668..e8e086431 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
@@ -14,7 +14,7 @@
| +0#00e0e07&@1|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g|
|t|o|S|t|r|i|n|g|(|)| +0#0000000&|{+0#00e0e07&|
+0#0000000&|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)|
|"+0#e000002&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&|
|}+0#00e0e07&| +0#0000000&@5
|}+0#00e0e07&| +0#0000000&@73
@75
-|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @68
+|e+0#00e0003&|n|u|m| +0#0000000&|E|2| @67
|{+0#00e0e07&| +0#0000000&@73
-@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|𝗔|"|)+0#0000000&|,| @36
+@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @36
@57|7|3|,|3| @9|9|1|%|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_99.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_99.dump
index e00cbc527..fe2e508fd 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_99.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_99.dump
@@ -8,13 +8,13 @@
| +0#00e0e07&@1|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g|
|t|o|S|t|r|i|n|g|(|)| +0#0000000&|{+0#00e0e07&|
+0#0000000&|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)|
|"+0#e000002&|I|n|d|e|n|t|2|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&|
|}+0#00e0e07&| +0#0000000&@5
|}+0#00e0e07&| +0#0000000&@73
@75
-|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @68
+|e+0#00e0003&|n|u|m| +0#0000000&|E|2| @67
|{+0#00e0e07&| +0#0000000&@73
-@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|𝗔|"|)+0#0000000&|,| @36
-@2|B|(|"+0#e000002&|𝗕|"|)+0#0000000&|,| @65
-@2|C|(|"+0#e000002&|𝗖|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝗗|"|)+0#0000000&|,|
@57
-@2|E|(|"+0#e000002&|𝗘|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝗙|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝗚|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝗛|"|)+0#0000000&|;| @41
-@2|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @57
-@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@37
+@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @36
+@2|B|(|"+0#e000002&|b|"|)+0#0000000&|,| @65
+@2|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,|
@57
+@2|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @41
+@2|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @57
+@2|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|2|(|S|t|r|i|n|g| |s|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;|
|}+0#00e0e07&| +0#0000000&@36
>}+0#00e0e07&| +0#0000000&@73
@57|9|2|,|1| @9|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump
index 94508364c..dd817fa14 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_00.dump
@@ -1,5 +1,5 @@
>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t|
>|g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|i|n|d|e|n|t|4|'|
>+0#0000000&@14
-@75
+|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|
|e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8|
+0#0000000&@19
@75
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|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|;|
@34
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39
@@ -9,12 +9,12 @@
@4|/+0#0000e05&@1| |T|Y|P|E|S|.| +0#0000000&@61
@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|Τ|ʬ|<|α|>|(|α| |a|)| |{+0#00e0e07&|
+0#0000000&|}+0#00e0e07&| +0#0000000&@49
@75
-@4|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @64
+@4|e+0#00e0003&|n|u|m| +0#0000000&|E| @64
@4|{+0#00e0e07&| +0#0000000&@69
-@8|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,| |B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,|
|C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @35
-@8|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @35
-@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @51
-@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@31
+@8|A|(|"+0#e000002&|a|"|)+0#0000000&|,| |B|(|"+0#e000002&|b|"|)+0#0000000&|,|
|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,| @35
+@8|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @35
+@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51
+@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}+0#00e0e07&|
+0#0000000&@31
@4|}+0#00e0e07&| +0#0000000&@69
@75
@57|1|,|1| @10|T|o|p|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
index 6df14d210..d633df758 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
@@ -1,7 +1,7 @@
-| +0&#ffffff0@7|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,|
|B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,| |C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,|
|D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @35
-@8|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @35
-@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @51
-@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@31
+| +0&#ffffff0@7|A|(|"+0#e000002&|a|"|)+0#0000000&|,|
|B|(|"+0#e000002&|b|"|)+0#0000000&|,| |C|(|"+0#e000002&|c|"|)+0#0000000&|,|
|D|(|"+0#e000002&|d|"|)+0#0000000&|,| @35
+@8|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @35
+@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51
+@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}+0#00e0e07&|
+0#0000000&@31
@4|}+0#00e0e07&| +0#0000000&@69
> @74
@4|@+0#e000e06&|T|a|r|g|e|t|(+0#0000000&|{+0#00e0e07&|E+0#0000000&|l|e|m|e|n|t|T|y|p|e|.|M|E|T|H|O|D|,|
|E|l|e|m|e|n|t|T|y|p|e|.|C|O|N|S|T|R|U|C|T|O|R|}+0#00e0e07&|)+0#0000000&| @16
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
index ea25a59ce..d26b68c15 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
@@ -1,7 +1,7 @@
| +0#00e0e07#ffffff0@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11
| +0#00e0e07&@63|)|;+0#0000000&| @8
| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|
|μ|ʭ@1|$|0|_|(| +0#0000000&@21
-| +0#00e0e07&@23|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|𝛽|)|;+0#0000000&| @5
+| +0#00e0e07&@23|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|b|)|;+0#0000000&| @5
@75
| +0#00e0e07&@3>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&|
@13
| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@23
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
index a84066858..2893ca9c4 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
@@ -15,6 +15,6 @@
| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g|
|t|o|S|t|r|i|n|g|(|)| +0#0000000&|{+0#00e0e07&|
+0#0000000&|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)|
|"+0#e000002&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&|
|}+0#00e0e07&| +0#0000000&@3
|}+0#00e0e07&| +0#0000000&@73
@75
-|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @68
+|e+0#00e0003&|n|u|m| +0#0000000&|E|4| @67
|{+0#00e0e07&| +0#0000000&@73
@57|7|3|,|5| @9|9|0|%|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_99.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_99.dump
index fa21b2986..5c18b9464 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_99.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_99.dump
@@ -8,13 +8,13 @@
| +0#00e0e07&@3|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g|
|t|o|S|t|r|i|n|g|(|)| +0#0000000&|{+0#00e0e07&|
+0#0000000&|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)|
|"+0#e000002&|I|n|d|e|n|t|4|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&|
|}+0#00e0e07&| +0#0000000&@3
|}+0#00e0e07&| +0#0000000&@73
@75
-|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @68
+|e+0#00e0003&|n|u|m| +0#0000000&|E|4| @67
|{+0#00e0e07&| +0#0000000&@73
-@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|𝗔|"|)+0#0000000&|,| @34
-@4|B|(|"+0#e000002&|𝗕|"|)+0#0000000&|,| @63
-@4|C|(|"+0#e000002&|𝗖|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝗗|"|)+0#0000000&|,|
@55
-@4|E|(|"+0#e000002&|𝗘|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝗙|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝗚|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝗛|"|)+0#0000000&|;| @39
-@4|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @55
-@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@35
+@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @34
+@4|B|(|"+0#e000002&|b|"|)+0#0000000&|,| @63
+@4|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,|
@55
+@4|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @39
+@4|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @55
+@4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|4|(|S|t|r|i|n|g| |s|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;|
|}+0#00e0e07&| +0#0000000&@34
>}+0#00e0e07&| +0#0000000&@73
@57|9|2|,|1| @9|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump
index 8ea291ec4..d970b6a0d 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_00.dump
@@ -1,5 +1,5 @@
>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t|
>|g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|i|n|d|e|n|t|8|'|
>+0#0000000&@14
-@75
+|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|
|e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8|
+0#0000000&@19
@75
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|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|;|
@34
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39
@@ -9,12 +9,12 @@
@8|/+0#0000e05&@1| |T|Y|P|E|S|.| +0#0000000&@57
@8|r+0#00e0003&|e|c|o|r|d| +0#0000000&|Τ|ʬ|<|α|>|(|α| |a|)| |{+0#00e0e07&|
+0#0000000&|}+0#00e0e07&| +0#0000000&@45
@75
-@8|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @60
+@8|e+0#00e0003&|n|u|m| +0#0000000&|E| @60
@8|{+0#00e0e07&| +0#0000000&@65
-@16|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,| |B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,|
|C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @27
-@16|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @27
-@16|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @43
-@16|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;|
|}+0#00e0e07&| +0#0000000&@23
+@16|A|(|"+0#e000002&|a|"|)+0#0000000&|,| |B|(|"+0#e000002&|b|"|)+0#0000000&|,|
|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,| @27
+@16|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @27
+@16|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @43
+@16|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;|
|}+0#00e0e07&| +0#0000000&@23
@8|}+0#00e0e07&| +0#0000000&@65
@75
@57|1|,|1| @10|T|o|p|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
index 9edfa6a2e..506e120e9 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
@@ -1,7 +1,7 @@
-| +0&#ffffff0@15|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,|
|B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,| |C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,|
|D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @27
-@16|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @27
-@16|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @43
-@16|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;|
|}+0#00e0e07&| +0#0000000&@23
+| +0&#ffffff0@15|A|(|"+0#e000002&|a|"|)+0#0000000&|,|
|B|(|"+0#e000002&|b|"|)+0#0000000&|,| |C|(|"+0#e000002&|c|"|)+0#0000000&|,|
|D|(|"+0#e000002&|d|"|)+0#0000000&|,| @27
+@16|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @27
+@16|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @43
+@16|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;|
|}+0#00e0e07&| +0#0000000&@23
@8|}+0#00e0e07&| +0#0000000&@65
> @74
@8|@+0#e000e06&|T|a|r|g|e|t|(+0#0000000&|{+0#00e0e07&|E+0#0000000&|l|e|m|e|n|t|T|y|p|e|.|M|E|T|H|O|D|,|
|E|l|e|m|e|n|t|T|y|p|e|.|C|O|N|S|T|R|U|C|T|O|R|}+0#00e0e07&|)+0#0000000&| @12
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
index 41b7a0bad..6ec768b46 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
@@ -1,7 +1,7 @@
| +0#00e0e07#ffffff0@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@7
| +0#00e0e07&@63|)|;+0#0000000&| @8
| +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|
|μ|ʭ@1|$|0|_|(| +0#0000000&@17
-| +0#00e0e07&@23|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|𝛽|)|;+0#0000000&| @5
+| +0#00e0e07&@23|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|b|)|;+0#0000000&| @5
@75
| +0#00e0e07&@7>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&|
@9
| +0#00e0e07&@7|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@19
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
index 47ad5899e..1eb5b8e50 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
@@ -15,6 +15,6 @@
| +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g|
|t|o|S|t|r|i|n|g|(|)| +0#0000000&|{+0#00e0e07&|
+0#0000000&|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)|
|"+0#e000002&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&|
|}+0#00e0e07&
@1| +0#0000000&@73
@75
-|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @68
+|e+0#00e0003&|n|u|m| +0#0000000&|E|8| @67
|{+0#00e0e07&| +0#0000000&@73
@57|7|3|,|9| @9|9|0|%|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_99.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_99.dump
index 69c600d2d..864a3edcf 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_99.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_99.dump
@@ -8,13 +8,13 @@
| +0#00e0e07&@7|p+0#00e0003&|u|b|l|i|c| +0#00e0e07&|S|t|r|i|n|g|
|t|o|S|t|r|i|n|g|(|)| +0#0000000&|{+0#00e0e07&|
+0#0000000&|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)|
|"+0#e000002&|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&|
|}+0#00e0e07&
@1| +0#0000000&@73
@75
-|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @68
+|e+0#00e0003&|n|u|m| +0#0000000&|E|8| @67
|{+0#00e0e07&| +0#0000000&@73
-@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|𝗔|"|)+0#0000000&|,| @30
-@8|B|(|"+0#e000002&|𝗕|"|)+0#0000000&|,| @59
-@8|C|(|"+0#e000002&|𝗖|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝗗|"|)+0#0000000&|,|
@51
-@8|E|(|"+0#e000002&|𝗘|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝗙|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝗚|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝗛|"|)+0#0000000&|;| @35
-@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @51
-@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@31
+@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(+0#0000000&|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#0000000&|
|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @30
+@8|B|(|"+0#e000002&|b|"|)+0#0000000&|,| @59
+@8|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,|
@51
+@8|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @35
+@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51
+@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|8|(|S|t|r|i|n|g| |s|)|
|{+0#00e0e07&| +0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;|
|}+0#00e0e07&| +0#0000000&@30
>}+0#00e0e07&| +0#0000000&@73
@57|9|2|,|1| @9|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/java_methods_style_00.dump
b/runtime/syntax/testdir/dumps/java_methods_style_00.dump
index 800ec703a..9929ca212 100644
--- a/runtime/syntax/testdir/dumps/java_methods_style_00.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_00.dump
@@ -1,5 +1,5 @@
>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |l|e|t|
>|g|:|j|a|v|a|_|h|i|g|h|l|i|g|h|t|_|f|u|n|c|t|i|o|n|s| |=| |'|s|t|y|l|e|'|
>+0#0000000&@16
-@75
+|/+0#0000e05&@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |s|e|t|
|e|n|c|o|d|i|n|g|=|u|t|f|-|8| |t|e|r|m|e|n|c|o|d|i|n|g|=|u|t|f|-|8|
+0#0000000&@19
@75
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|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|;|
@34
|i+0#e000e06&|m|p|o|r|t|
+0#0000000&|j|a|v|a|.|l|a|n|g|.|a|n@1|o|t|a|t|i|o|n|.|T|a|r|g|e|t|;| @39
@@ -9,12 +9,12 @@
@4|/+0#0000e05&@1| |T|Y|P|E|S|.| +0#0000000&@61
@4|r+0#00e0003&|e|c|o|r|d| +0#0000000&|Τ|ʬ|<|α|>|(|α| |a|)| |{+0#00e0e07&|
+0#0000000&|}+0#00e0e07&| +0#0000000&@49
@75
-@4|e+0#00e0003&|n|u|m| +0#0000000&|𝓔| @64
+@4|e+0#00e0003&|n|u|m| +0#0000000&|E| @64
@4|{+0#00e0e07&| +0#0000000&@69
-@8|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,| |B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,|
|C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,| |D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @35
-@8|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @35
-@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @51
-@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@31
+@8|A|(|"+0#e000002&|a|"|)+0#0000000&|,| |B|(|"+0#e000002&|b|"|)+0#0000000&|,|
|C|(|"+0#e000002&|c|"|)+0#0000000&|,| |D|(|"+0#e000002&|d|"|)+0#0000000&|,| @35
+@8|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @35
+@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51
+@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}+0#00e0e07&|
+0#0000000&@31
@4|}+0#00e0e07&| +0#0000000&@69
@75
@57|1|,|1| @10|T|o|p|
diff --git a/runtime/syntax/testdir/dumps/java_methods_style_01.dump
b/runtime/syntax/testdir/dumps/java_methods_style_01.dump
index f80f65158..ddd2b1049 100644
--- a/runtime/syntax/testdir/dumps/java_methods_style_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_01.dump
@@ -1,7 +1,7 @@
-| +0&#ffffff0@7|A|(|"+0#e000002&|𝕬|"|)+0#0000000&|,|
|B|(|"+0#e000002&|𝕭|"|)+0#0000000&|,| |C|(|"+0#e000002&|𝕮|"|)+0#0000000&|,|
|D|(|"+0#e000002&|𝕯|"|)+0#0000000&|,| @35
-@8|E|(|"+0#e000002&|𝕰|"|)+0#0000000&|,| |F|(|"+0#e000002&|𝕱|"|)+0#0000000&|,|
|G|(|"+0#e000002&|𝕲|"|)+0#0000000&|,| |H|(|"+0#e000002&|𝕳|"|)+0#0000000&|;| @35
-@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |𝐬|;| @51
-@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|𝓔|(|S|t|r|i|n|g| |𝐬|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|𝐬| |=| |𝐬|;| |}+0#00e0e07&|
+0#0000000&@31
+| +0&#ffffff0@7|A|(|"+0#e000002&|a|"|)+0#0000000&|,|
|B|(|"+0#e000002&|b|"|)+0#0000000&|,| |C|(|"+0#e000002&|c|"|)+0#0000000&|,|
|D|(|"+0#e000002&|d|"|)+0#0000000&|,| @35
+@8|E|(|"+0#e000002&|e|"|)+0#0000000&|,| |F|(|"+0#e000002&|f|"|)+0#0000000&|,|
|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |H|(|"+0#e000002&|h|"|)+0#0000000&|;| @35
+@8|f+0#4040ff13&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51
+@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|E|(|S|t|r|i|n|g| |s|)| |{+0#00e0e07&|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}+0#00e0e07&|
+0#0000000&@31
@4|}+0#00e0e07&| +0#0000000&@69
> @74
@4|@+0#e000e06&|T|a|r|g|e|t|(+0#0000000&|{+0#00e0e07&|E+0#0000000&|l|e|m|e|n|t|T|y|p|e|.|M|E|T|H|O|D|,|
|E|l|e|m|e|n|t|T|y|p|e|.|C|O|N|S|T|R|U|C|T|O|R|}+0#00e0e07&|)+0#0000000&| @16
diff --git a/runtime/syntax/testdir/dumps/java_methods_style_03.dump
b/runtime/syntax/testdir/dumps/java_methods_style_03.dump
index 7bd71da95..29b82d23e 100644
--- a/runtime/syntax/testdir/dumps/java_methods_style_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_03.dump
@@ -1,7 +1,7 @@
| +0#00e0e07#ffffff0@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11
| +0#00e0e07&@31|)|;+0#0000000&| @40
| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|a+0#4040ff13&|b|s|t|r|a|c|t| +0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|
|μ|ʭ@1|$|0|_|(| +0#0000000&@21
-| +0#00e0e07&@11|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|𝛽|)|;+0#0000000&| @17
+| +0#00e0e07&@11|/+0#0000e05&|*|
|T+0#0000001#ffff4012|O|D|O|:+0#0000e05#ffffff0|
|@|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"|b|e|s|p|o|k|e|"|)|*|/| +0#00e0e07&|β|
|b|)|;+0#0000000&| @17
@75
| +0#00e0e07&@3>@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|v+0#00e0003&|o|i|d|
+0#00e0e07&|a|s|c|i@1|$|1|_|(|/+0#0000e05&|*|/@10|/+0#ffffff16#ff404010|*+0#0000e05#ffffff0|/|)+0#00e0e07&|;+0#0000000&|
@13
| +0#00e0e07&@3|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ|
+0#00e0e07&|p+0#00e0003&|r|i|v|a|t|e| +0#00e0e07&|n+0#e000e06&|a|t|i|v|e|
+0#00e0e07&|<|α|,| |β|>| |Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|1|_|(| +0#0000000&@23
diff --git a/runtime/syntax/testdir/input/java_methods_indent2.java
b/runtime/syntax/testdir/input/java_methods_indent2.java
index 63b65b740..7e6d62c60 100644
--- a/runtime/syntax/testdir/input/java_methods_indent2.java
+++ b/runtime/syntax/testdir/input/java_methods_indent2.java
@@ -1,5 +1,5 @@
// VIM_TEST_SETUP let g:java_highlight_functions = 'indent2'
-
+// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@@ -9,12 +9,12 @@ abstract class Indent2MethodsTests
// TYPES.
record Τʬ<α>(α a) { }
- enum 𝓔
+ enum E
{
- A("𝕬"), B("𝕭"), C("𝕮"), D("𝕯"),
- E("𝕰"), F("𝕱"), G("𝕲"), H("𝕳");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ A("a"), B("b"), C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E(String s) { this.s = s; }
}
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@@ -50,7 +50,7 @@ abstract class Indent2MethodsTests
@Tɐggablɘ @Tɐggablɘ abstract void ascii$0_(////////////////
);
@Tɐggablɘ @Tɐggablɘ abstract <α, β> Τʬ<α> μʭʭ$0_(
- /* TODO: @SuppressWarnings("bespoke")*/ β 𝛽);
+ /* TODO: @SuppressWarnings("bespoke")*/ β b);
@Tɐggablɘ private native void ascii$1_(/*////////////*/);
@Tɐggablɘ private native <α, β> Τʬ<α>[] μʭʭ$1_(
@@ -81,12 +81,12 @@ abstract class Indent2MethodsTests
public String toString() { return (String) "Indent2MethodsTests"; }
}
-enum 𝓔
+enum E2
{
- @SuppressWarnings("bespoke") A("𝗔"),
- B("𝗕"),
- C("𝗖"), D("𝗗"),
- E("𝗘"), F("𝗙"), G("𝗚"), H("𝗛");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ @SuppressWarnings("bespoke") A("a"),
+ B("b"),
+ C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E2(String s) { this.s = s; }
}
diff --git a/runtime/syntax/testdir/input/java_methods_indent4.java
b/runtime/syntax/testdir/input/java_methods_indent4.java
index 7ea831ffd..b3d5db9df 100644
--- a/runtime/syntax/testdir/input/java_methods_indent4.java
+++ b/runtime/syntax/testdir/input/java_methods_indent4.java
@@ -1,5 +1,5 @@
// VIM_TEST_SETUP let g:java_highlight_functions = 'indent4'
-
+// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@@ -9,12 +9,12 @@ abstract class Indent4MethodsTests
// TYPES.
record Τʬ<α>(α a) { }
- enum 𝓔
+ enum E
{
- A("𝕬"), B("𝕭"), C("𝕮"), D("𝕯"),
- E("𝕰"), F("𝕱"), G("𝕲"), H("𝕳");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ A("a"), B("b"), C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E(String s) { this.s = s; }
}
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@@ -50,7 +50,7 @@ abstract class Indent4MethodsTests
@Tɐggablɘ @Tɐggablɘ abstract void ascii$0_(////////////////
);
@Tɐggablɘ @Tɐggablɘ abstract <α, β> Τʬ<α> μʭʭ$0_(
- /* TODO: @SuppressWarnings("bespoke")*/ β 𝛽);
+ /* TODO: @SuppressWarnings("bespoke")*/ β b);
@Tɐggablɘ private native void ascii$1_(/*////////////*/);
@Tɐggablɘ private native <α, β> Τʬ<α>[] μʭʭ$1_(
@@ -81,12 +81,12 @@ abstract class Indent4MethodsTests
public String toString() { return (String) "Indent4MethodsTests"; }
}
-enum 𝓔
+enum E4
{
- @SuppressWarnings("bespoke") A("𝗔"),
- B("𝗕"),
- C("𝗖"), D("𝗗"),
- E("𝗘"), F("𝗙"), G("𝗚"), H("𝗛");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ @SuppressWarnings("bespoke") A("a"),
+ B("b"),
+ C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E4(String s) { this.s = s; }
}
diff --git a/runtime/syntax/testdir/input/java_methods_indent8.java
b/runtime/syntax/testdir/input/java_methods_indent8.java
index 90a982710..74114b52b 100644
--- a/runtime/syntax/testdir/input/java_methods_indent8.java
+++ b/runtime/syntax/testdir/input/java_methods_indent8.java
@@ -1,5 +1,5 @@
// VIM_TEST_SETUP let g:java_highlight_functions = 'indent8'
-
+// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@@ -9,12 +9,12 @@ abstract class Indent8MethodsTests
// TYPES.
record Τʬ<α>(α a) { }
- enum 𝓔
+ enum E
{
- A("𝕬"), B("𝕭"), C("𝕮"), D("𝕯"),
- E("𝕰"), F("𝕱"), G("𝕲"), H("𝕳");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ A("a"), B("b"), C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E(String s) { this.s = s; }
}
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@@ -50,7 +50,7 @@ abstract class Indent8MethodsTests
@Tɐggablɘ @Tɐggablɘ abstract void ascii$0_(////////////////
);
@Tɐggablɘ @Tɐggablɘ abstract <α, β> Τʬ<α> μʭʭ$0_(
- /* TODO: @SuppressWarnings("bespoke")*/ β 𝛽);
+ /* TODO: @SuppressWarnings("bespoke")*/ β b);
@Tɐggablɘ private native void ascii$1_(/*////////////*/);
@Tɐggablɘ private native <α, β> Τʬ<α>[] μʭʭ$1_(
@@ -81,12 +81,12 @@ abstract class Indent8MethodsTests
public String toString() { return (String) "Indent8MethodsTests"; }
}
-enum 𝓔
+enum E8
{
- @SuppressWarnings("bespoke") A("𝗔"),
- B("𝗕"),
- C("𝗖"), D("𝗗"),
- E("𝗘"), F("𝗙"), G("𝗚"), H("𝗛");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ @SuppressWarnings("bespoke") A("a"),
+ B("b"),
+ C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E8(String s) { this.s = s; }
}
diff --git a/runtime/syntax/testdir/input/java_methods_style.java
b/runtime/syntax/testdir/input/java_methods_style.java
index 0f97b105e..abb00aac8 100644
--- a/runtime/syntax/testdir/input/java_methods_style.java
+++ b/runtime/syntax/testdir/input/java_methods_style.java
@@ -1,5 +1,5 @@
// VIM_TEST_SETUP let g:java_highlight_functions = 'style'
-
+// VIM_TEST_SETUP set encoding=utf-8 termencoding=utf-8
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@@ -9,12 +9,12 @@ abstract class StyleMethodsTests
// TYPES.
record Τʬ<α>(α a) { }
- enum 𝓔
+ enum E
{
- A("𝕬"), B("𝕭"), C("𝕮"), D("𝕯"),
- E("𝕰"), F("𝕱"), G("𝕲"), H("𝕳");
- final String 𝐬;
- private 𝓔(String 𝐬) { this.𝐬 = 𝐬; }
+ A("a"), B("b"), C("c"), D("d"),
+ E("e"), F("f"), G("g"), H("h");
+ final String s;
+ private E(String s) { this.s = s; }
}
@Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
@@ -50,7 +50,7 @@ abstract class StyleMethodsTests
@Tɐggablɘ @Tɐggablɘ abstract void ascii$0_(////////////////
);
@Tɐggablɘ @Tɐggablɘ abstract <α, β> Τʬ<α> μʭʭ$0_(
- /* TODO: @SuppressWarnings("bespoke")*/ β 𝛽);
+ /* TODO: @SuppressWarnings("bespoke")*/ β b);
@Tɐggablɘ private native void ascii$1_(/*////////////*/);
@Tɐggablɘ private native <α, β> Τʬ<α>[] μʭʭ$1_(
--
--
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 vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1s5Pr4-00AOSc-Lm%40256bit.org.
