runtime(syntax-tests): Break up non-ASCII over-75-byte-long lines
Commit:
https://github.com/vim/vim/commit/af2c8e256a36ef4d2ff278c2f7e5e3935c3edb00
Author: Aliaksei Budavei <0x000...@gmail.com>
Date: Wed Aug 6 12:50:30 2025 +0200
runtime(syntax-tests): Break up non-ASCII over-75-byte-long lines
And anticipate occasional multibyte line wrapping owing to:
> A poorly rendered line may otherwise become wrapped when enough of
> spurious U+FFFD (0xEF 0xBF 0xBD) characters claim more columns than
> are available (75) and then invalidate line correspondence under test.
Observe that for "vim_ex_command.vim" another workaround is
chosen: the long line containing an only multibyte character
near its EOL is conversely made longer by padding and moving
the character to a separate _tail_ part of the wrapped line.
That is, the _head_ part of the line is all ASCII characters
and the wrapped _tail_ part is a mix of various characters
whose total byte count is within bounds.
Other unmodified tracked files of interest:
java_lambda_expressions.java,
java_lambda_expressions_signature.java,
java_numbers.java,
markdown_conceal.markdown,
vim9_generic_function_example_set.vim
Also, remove stray U+FFFC (0xEF 0xBF 0xBC) characters.
Related to #16559 and #17704.
Reference:
https://github.com/vim/vim/blob/0fde6aebddef5cb0428e85040994ba45e55cba99/runtime/syntax/testdir/README.txt#L120-L123
closes: #17868
Signed-off-by: Aliaksei Budavei <0x000...@gmail.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/runtime/syntax/testdir/dumps/c_character_constant_00.dump
b/runtime/syntax/testdir/dumps/c_character_constant_00.dump
index 458e2b807..c808f9581 100644
--- a/runtime/syntax/testdir/dumps/c_character_constant_00.dump
+++ b/runtime/syntax/testdir/dumps/c_character_constant_00.dump
@@ -13,8 +13,8 @@
@75
@4|/+0#0000e05&@1| |i|n|t|e|g|e|r| |c|h|a|r|a|c|t|e|r| |c|o|n|s|t|a|n|t|s|,|
+0#0000000&@39
@4|i+0#00e0003&|n|t| +0#0000000&|c|1|=|'+0#e000002&|a|'|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|a|'|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|"+0#e000002&|,+0#0000000&| |c|1|)|;| @28
-@4|i+0#00e0003&|n|t| +0#0000000&|c|2|=|'+0#e000002&|🍌*&|'+&|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|🍌*&|'+&|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|\|n|"+0#e000002&|,+0#0000000&| |c|2|)|;|
|/+0#0000e05&@1| |i|m|p|l|e|m|e|n|t|a|t|i|o|n|-|d|e|f|i|n|e
-|d| +0#0000000&@73
+@4|/+0#0000e05&@1| |i|m|p|l|e|m|e|n|t|a|t|i|o|n|-|d|e|f|i|n|e|d| +0#0000000&@45
+@4|i+0#00e0003&|n|t| +0#0000000&|c|2|=|'+0#e000002&|🍌*&|'+&|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|🍌*&|'+&|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|\|n|"+0#e000002&|,+0#0000000&| |c|2|)|;|
@24
@75
@4|/+0#0000e05&@1| |m|u|l|t|i|c|h|a|r|a|c|t|e|r| |c|o|n|s|t|a|n|t|
+0#0000000&@44
@57|1|,|1| @10|T|o|p|
diff --git a/runtime/syntax/testdir/dumps/c_character_constant_01.dump
b/runtime/syntax/testdir/dumps/c_character_constant_01.dump
index f0ed04d32..23d3d7235 100644
--- a/runtime/syntax/testdir/dumps/c_character_constant_01.dump
+++ b/runtime/syntax/testdir/dumps/c_character_constant_01.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@3|/+0#0000e05&@1| |i|n|t|e|g|e|r| |c|h|a|r|a|c|t|e|r|
|c|o|n|s|t|a|n|t|s|,| +0#0000000&@39
@4|i+0#00e0003&|n|t| +0#0000000&|c|1|=|'+0#e000002&|a|'|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|a|'|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|"+0#e000002&|,+0#0000000&| |c|1|)|;| @28
-@4|i+0#00e0003&|n|t| +0#0000000&|c|2|=|'+0#e000002&|🍌*&|'+&|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|🍌*&|'+&|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|\|n|"+0#e000002&|,+0#0000000&| |c|2|)|;|
|/+0#0000e05&@1| |i|m|p|l|e|m|e|n|t|a|t|i|o|n|-|d|e|f|i|n|e
-|d| +0#0000000&@73
+@4|/+0#0000e05&@1| |i|m|p|l|e|m|e|n|t|a|t|i|o|n|-|d|e|f|i|n|e|d| +0#0000000&@45
+@4|i+0#00e0003&|n|t| +0#0000000&|c|2|=|'+0#e000002&|🍌*&|'+&|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|🍌*&|'+&|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|\|n|"+0#e000002&|,+0#0000000&| |c|2|)|;|
@24
@75
@4>/+0#0000e05&@1| |m|u|l|t|i|c|h|a|r|a|c|t|e|r| |c|o|n|s|t|a|n|t|
+0#0000000&@44
@4|i+0#00e0003&|n|t| +0#0000000&|c|3|=|'|a|b|'|;|
|p|r|i|n|t|f|(|"+0#e000002&|'|a|b|'|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|\|n|"+0#e000002&|,+0#0000000&| |c|3|)|;|
|/+0#0000e05&@1| |i|m|p|l|e|m|e|n|t|a|t|i|o|n|-|d|e|f|i|n|e
@@ -17,4 +17,4 @@
@4|/+0#0000e05&@1| |3|2|-|b|i|t| |w|i|d|e| |c|h|a|r|a|c|t|e|r|
|c|o|n|s|t|a|n|t|s| +0#0000000&@36
@4|c+0#00e0003&|h|a|r|3|2|_|t| +0#0000000&|U|c|1| |=|
|U+0#e000002&|'|a|'|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|a|'|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|"+0#e000002&|,+0#0000000&|
|(|i+0#00e0003&|n|t|)+0#0000000&|U|c|1|)|;| @13
@4|c+0#00e0003&|h|a|r|3|2|_|t| +0#0000000&|U|c|2| |=|
|U+0#e000002&|'|¢|'|;+0#0000000&|
|p|r|i|n|t|f|(|"+0#e000002&|'|¢|'|:|\+0#e000e06&|t|
+0#e000002&|%+0#e000e06&|#|0|1|0|x|\|n|"+0#e000002&|,+0#0000000&|
|(|i+0#00e0003&|n|t|)+0#0000000&|U|c|2|)|;| @13
-@57|1|8|,|5| @9|5|6|%|
+@57|1|9|,|5| @9|5|6|%|
diff --git a/runtime/syntax/testdir/dumps/c_character_constant_02.dump
b/runtime/syntax/testdir/dumps/c_character_constant_02.dump
index e08b11b9d..38a35c3c9 100644
--- a/runtime/syntax/testdir/dumps/c_character_constant_02.dump
+++ b/runtime/syntax/testdir/dumps/c_character_constant_02.dump
@@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
-| +0#0000000&@56|3|5|,|5| @9|B|o|t|
+| +0#0000000&@56|3|6|,|5| @9|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/c_string_literal_01.dump
b/runtime/syntax/testdir/dumps/c_string_literal_01.dump
index a2c5a46a6..971f8958d 100644
--- a/runtime/syntax/testdir/dumps/c_string_literal_01.dump
+++ b/runtime/syntax/testdir/dumps/c_string_literal_01.dump
@@ -17,4 +17,4 @@
@4|p|u|t|s|(|"+0#e000002&|}|"|)+0#0000000&|;| @60
@4|p|r|i|n|t|f|(| @63
|#+0#e000e06&|i|f| |_@1|S|T|D|C|_|V|E|R|S|I|O|N|_@1| |>|=|
|2+0#e000002&|0|2|3|1@1|L| +0#0000000&@43
-@57|1|9|,|1| @9|3@1|%|
+@57|1|9|,|1| @9|3|1|%|
diff --git a/runtime/syntax/testdir/dumps/c_string_literal_02.dump
b/runtime/syntax/testdir/dumps/c_string_literal_02.dump
index a038a3663..dfb2d6829 100644
--- a/runtime/syntax/testdir/dumps/c_string_literal_02.dump
+++ b/runtime/syntax/testdir/dumps/c_string_literal_02.dump
@@ -11,10 +11,10 @@
@7|p|r|i|n|t|f|(|"+0#e000002&|0|x|%+0#e000e06&|0|2|X|
+0#e000002&|"|,+0#0000000&| |+|(|u+0#00e0003&|n|s|i|g|n|e|d|
+0#0000000&|c+0#00e0003&|h|a|r|)+0#0000000&|s|2|[|n|]|)|;| @26
|#+0#e000e06&|e|n|d|i|f| +0#0000000&@68
@4|p|u|t|s|(|"+0#e000002&|}|"|)+0#0000000&|;| @60
-@4|p|r|i|n|t|f|(|"+0#e000002&|
|u|\+0#e000e06&|"|a+0#e000002&|猫*&|🍌|\+0#e000e06&|"| +0#e000002&|i|s| |a|
|c|h|a|r|1|6|_|t|[|%+0#e000e06&|z|u|]+0#e000002&| |h|o|l|d|i|n|g| |{|
|"|,+0#0000000&| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|3| |/|
|s+0#af5f00255&|i|z|e|o|f| +0#0000000&
-|*|s|3|)|;| @69
+@4|p|r|i|n|t|f|(|"+0#e000002&|
|u|\+0#e000e06&|"|a+0#e000002&|猫*&|🍌|\+0#e000e06&|"| +0#e000002&|i|s| |a|
|c|h|a|r|1|6|_|t|[|%+0#e000e06&|z|u|]+0#e000002&| |h|o|l|d|i|n|g| |{|
|"|,+0#0000000&| @19
+@20|s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|3| |/| |s+0#af5f00255&|i|z|e|o|f|
+0#0000000&|*|s|3|)|;| @30
@4|f+0#af5f00255&|o|r|(+0#0000000&|s+0#00e0003&|i|z|e|_|t| +0#0000000&|n| |=|
|0+0#e000002&|;+0#0000000&| |n| |<| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|3|
|/| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|*|s|3|;| |+@1|n|)| @20
@7|p|r|i|n|t|f|(|"+0#e000002&|0|x|%|0|4|"|
+0#0000000&|P|R|I|X|L|E|A|S|T|1|6|"+0#e000002&| |"|,+0#0000000&|
|s|3|[|n|]|)|;| @29
@4|p|u|t|s|(|"+0#e000002&|}|"|)+0#0000000&|;| @60
-@4|p|r|i|n|t|f|(|"+0#e000002&|
|U|\+0#e000e06&|"|a+0#e000002&|猫*&|🍌|\+0#e000e06&|"| +0#e000002&|i|s| |a|
|c|h|a|r|3|2|_|t|[|%+0#e000e06&|z|u|]+0#e000002&| |h|o|l|d|i|n|g| |{|
|"|,+0#0000000&| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|4| |/|
|s+0#af5f00255&|i|z|e|@+0#4040ff13&@2
-| +0#0000000&@56|3|6|,|1| @9|7|5|%|
+@4|p|r|i|n|t|f|(|"+0#e000002&|
|U|\+0#e000e06&|"|a+0#e000002&|猫*&|🍌|\+0#e000e06&|"| +0#e000002&|i|s| |a|
|c|h|a|r|3|2|_|t|[|%+0#e000e06&|z|u|]+0#e000002&| |h|o|l|d|i|n|g| |{|
|"|,+0#0000000&| @19
+@57|3|6|,|1| @9|7|5|%|
diff --git a/runtime/syntax/testdir/dumps/c_string_literal_03.dump
b/runtime/syntax/testdir/dumps/c_string_literal_03.dump
index 081796705..09f624f6e 100644
--- a/runtime/syntax/testdir/dumps/c_string_literal_03.dump
+++ b/runtime/syntax/testdir/dumps/c_string_literal_03.dump
@@ -1,5 +1,5 @@
-| +0&#ffffff0@3|p|r|i|n|t|f|(|"+0#e000002&|
|U|\+0#e000e06&|"|a+0#e000002&|猫*&|🍌|\+0#e000e06&|"| +0#e000002&|i|s| |a|
|c|h|a|r|3|2|_|t|[|%+0#e000e06&|z|u|]+0#e000002&| |h|o|l|d|i|n|g| |{|
|"|,+0#0000000&| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|4| |/|
|s+0#af5f00255&|i|z|e|o|f| +0#0000000&
-|*|s|4|)|;| @69
+| +0&#ffffff0@3|p|r|i|n|t|f|(|"+0#e000002&|
|U|\+0#e000e06&|"|a+0#e000002&|猫*&|🍌|\+0#e000e06&|"| +0#e000002&|i|s| |a|
|c|h|a|r|3|2|_|t|[|%+0#e000e06&|z|u|]+0#e000002&| |h|o|l|d|i|n|g| |{|
|"|,+0#0000000&| @19
+@20|s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|4| |/| |s+0#af5f00255&|i|z|e|o|f|
+0#0000000&|*|s|4|)|;| @30
@4|f+0#af5f00255&|o|r|(+0#0000000&|s+0#00e0003&|i|z|e|_|t| +0#0000000&|n| |=|
|0+0#e000002&|;+0#0000000&| |n| |<| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|s|4|
|/| |s+0#af5f00255&|i|z|e|o|f| +0#0000000&|*|s|4|;| |+@1|n|)| @20
@7|p|r|i|n|t|f|(|"+0#e000002&|0|x|%|0|8|"|
+0#0000000&|P|R|I|X|L|E|A|S|T|3|2|"+0#e000002&| |"|,+0#0000000&|
|s|4|[|n|]|)|;| @29
@4|p|u|t|s|(|"+0#e000002&|}|"|)+0#0000000&|;| @60
@@ -17,4 +17,4 @@
|~| @73
|~| @73
|~| @73
-| +0#0000000&@56|5|2|,|5| @9|B|o|t|
+| +0#0000000&@56|5|4|,|5| @9|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/java_contextual_keywords_00.dump
b/runtime/syntax/testdir/dumps/java_contextual_keywords_00.dump
index 821c54b4d..af069e599 100644
--- a/runtime/syntax/testdir/dumps/java_contextual_keywords_00.dump
+++ b/runtime/syntax/testdir/dumps/java_contextual_keywords_00.dump
@@ -1,4 +1,4 @@
->/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |:|h|i|g|h|l|i|g|h|t|
|l|i|n|k| |j|a|v|a|C|o|n|c|e|p|t|K|i|n|d| |N|o|n|T|e|x|t| +0#0000000&@17
+>/+0#0000e05#ffffff0@1| |V|I|M|_|T|E|S|T|_|S|E|T|U|P| |h|i|g|h|l|i|g|h|t|
|l|i|n|k| |j|a|v|a|C|o|n|c|e|p|t|K|i|n|d| |N|o|n|T|e|x|t| +0#0000000&@18
@75
@75
@75
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
index ef600debb..9d6ec06e3 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@1|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @56
@75
-@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@43
-| +0#00e0e07&@1|p+0#00e0003&|r|o|t|e|c|t|e|d|
+0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@4
+@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@33
+| +0#00e0e07&@1|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@14
| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6
@2>{| @71
@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@64
diff --git
a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump
index 192f4073f..beb784a21 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@1|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @56
@75
-@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@43
-@2|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|s+0#00e0003&|t|a|t|i|c|
+0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@4
+@2|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@33
+@2|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@14
@24|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)+0#00e0e07&| +0#0000000&@6
@2>{| @71
@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@64
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
index 68661ea1b..5b762a676 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@3|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
@75
-@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@41
-| +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d|
+0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@2
+@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@31
+| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@12
| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6
@4>{| @69
@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60
diff --git
a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump
index 154f313d3..3a060f6dc 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@3|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
@75
-@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@41
-@4|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|s+0#00e0003&|t|a|t|i|c|
+0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@2
+@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@31
+@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@12
@24|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)+0#00e0e07&| +0#0000000&@6
@4>{| @69
@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
index 5293743fa..212736b04 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
@@ -1,10 +1,9 @@
| +0&#ffffff0@7|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @50
@75
-@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@37
-| +0#00e0e07&@7|p+0#00e0003&|r|o|t|e|c|t|e|d|
+0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_
-|(| +0#0000000&@73
-| +0#00e0e07&@23>j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6
-@8|{| @65
+@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@27
+| +0#00e0e07&@7|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@8
+| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@6
+@8>{| @65
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@52
@8|I|n|d|e|n|t|8|M|e|t|h|o|d|s|T|e|s|t|s|.|<+0#00e0003&|α+0#0000000&|,|
|β|>+0#00e0003&|μ+0#0000000&|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;|
@26
@8|}| @65
@@ -17,4 +16,5 @@
| +0#00e0e07&@23|j|a|v|a|.|u|t|i|l|.|L|i|s|t|<|?| |e+0#00e0003&|x|t|e|n|d|s|
+0#00e0e07&|E|>| |c|s|)| +0#0000000&@19
@8|{| @65
@16|r+0#af5f00255&|e|t|u|r|n|
+0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @25
-@57|7|2|,|2|5| @8|7|0|%|
+@24|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|@+0#4040ff13&@2
+| +0#0000000&@56|7|3|,|9| @9|7|0|%|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
index d9341aa0d..525f5838f 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@15|r+0#af5f00255&|e|t|u|r|n|
+0#0000000&|c|s|.|s|t|r|e|a|m|(|)|.|f|i|l|t|e|r|(|f|i|l|t|e|r|)| @25
-@24|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e
+|
+0&#ffffff0@23|.|c|o|l@1|e|c|t|(|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|C|o|l@1|e|c|t|o|r|s|.|t|o|U|n|m|o|d|i|f|i|a|b|l|e
|L|i|s|t|(|)@1|;| @66
@8|}| @65
@75
-@8>@+0#e000e06&|O|v|e|r@1|i|d|e|
+0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&|
+0#0000000&@31
-| +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&|{| |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&| |}
+@8|@+0#e000e06&|O|v|e|r@1|i|d|e|
+0#0000000&|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|c|a|s|t|"|)+0#e000e06&|
+0#0000000&@31
+| +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&|{| |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&| |}
@1| @73
@75
|e+0#00e0003&|n|u|m| +0#0000000&|E|8| @67
@@ -17,4 +16,5 @@
@16|(+0#00e0e07&|)| |-|>| +0#0000000&|{| @51
@8|}|)@1|,| |D|(|"+0#e000002&|d|"|,+0#0000000&|
|(|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|B|o@1|l|e|a|n|S|u|p@1|l|i|e|r|)|
|(+0#00e0e07&|)| |-|>| +0#0000000&|t+0#e000002&|r|u|e|)+0#0000000&|,| @5
@8|E|(|"+0#e000002&|e|"|,+0#0000000&| |n+0#af5f00255&|e|w|
+0#0000000&|c+0#00e0003&|h|a|r|[+0#0000000&|]| |{|
|'+0#e000002&|a|'|,+0#0000000&| |'+0#e000002&|b|'|,+0#0000000&|
|'+0#e000002&|c|'|,+0#0000000&| |'+0#e000002&|d|'| +0#0000000&|}|)|,|
|F|(|"+0#e000002&|f|"|,+0#0000000&| |n+0#af5f00255&|e|w|
+0#0000000&|O|b|j|e|c|t|(|)| |{| @2
-@57|8@1|,|9| @9|8@1|%|
+@16|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g| |n|a|m|e| |=|
|"+0#e000002&@1|;+0#0000000&| @31
+@57|8|9|,|9| @9|8|9|%|
diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
index 930cfdb30..bc43e5f2f 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@7|E|(|"+0#e000002&|e|"|,+0#0000000&| |n+0#af5f00255&|e|w|
+0#0000000&|c+0#00e0003&|h|a|r|[+0#0000000&|]| |{|
|'+0#e000002&|a|'|,+0#0000000&| |'+0#e000002&|b|'|,+0#0000000&|
|'+0#e000002&|c|'|,+0#0000000&| |'+0#e000002&|d|'| +0#0000000&|}|)|,|
|F|(|"+0#e000002&|f|"|,+0#0000000&| |n+0#af5f00255&|e|w|
+0#0000000&|O|b|j|e|c|t|(|)| |{| @2
-@16|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g| |n|a|m|e| |=|
|"+0#e000002&@1|;+0#0000000&| @31
+| +0&#ffffff0@15|t+0#00e0003&|r|a|n|s|i|e|n|t| +0#0000000&|S|t|r|i|n|g|
|n|a|m|e| |=| |"+0#e000002&@1|;+0#0000000&| @31
@16|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c|
+0#0000000&|S|t|r|i|n|g| |t|o|S|t|r|i|n|g|(|)| |{| |r+0#af5f00255&|e|t|u|r|n|
+0#0000000&|t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e|;| |}| @2
@8|}|)|,|
|/+0#0000e05&@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|\|/@1|
+0#0000000&
@8|G|(|"+0#e000002&|g|"|)+0#0000000&|,| |@+0#e000e06&|D|e|p|r|e|c|a|t|e|d|
+0#0000000&|H|(|"+0#e000002&|h|"|)+0#0000000&|;| @39
-> @74
-@8|f+0#00e0003&|i|n|a|l| +0#0000000&|S|t|r|i|n|g| |s|;| @51
+@75
+@8>f+0#00e0003&|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|)| |{|
|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @30
@8|p+0#00e0003&|r|i|v|a|t|e|
+0#0000000&|<+0#00e0003&|δ+0#0000000&|>+0#00e0003&|
+0#0000000&|E|8|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{|
|t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @20
@75
@@ -17,4 +16,5 @@
|~| @73
|~| @73
|~| @73
-| +0#0000000&@56|1|0|6|,|0|-|1| @6|B|o|t|
+|~| @73
+| +0#0000000&@56|1|0|7|,|9| @8|B|o|t|
diff --git
a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump
index ea9f48bdf..25d651bed 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump
@@ -1,10 +1,9 @@
| +0&#ffffff0@7|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @50
@75
-@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@37
-@8|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|s+0#00e0003&|t|a|t|i|c|
+0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_
-|(| +0#0000000&@73
-@24>j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)+0#00e0e07&| +0#0000000&@6
-@8|{| @65
+@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@27
+@8|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@8
+@24|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)+0#00e0e07&| +0#0000000&@6
+@8>{| @65
@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@52
@8|I|n|d|e|n|t|8|$|M|e|t|h|o|d|s|T|e|s|t|s|.|<|α|,|
|β|>|μ|ʭ@1|$|9|8|_|(|ƒ|)|[|0+0#e000002&|]+0#0000000&|;| @25
@8|}| @65
@@ -17,4 +16,5 @@
|}| @73
|}| @73
@75
-@57|7|2|,|2|5| @8|7|6|%|
+|e+0#00e0003&|n|u|m| +0#0000000&|E|8|$| @66
+@57|7|3|,|9| @9|7@1|%|
diff --git
a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump
index e8e7646a4..97f2ea2f0 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump
@@ -1,10 +1,9 @@
-| +0&#ffffff0@74
-|e+0#00e0003&|n|u|m| +0#0000000&|E|8|$| @66
+|e+0#00e0003#ffffff0|n|u|m| +0#0000000&|E|8|$| @66
|{| @73
@8|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|b|e|s|p|o|k|e|"|)+0#e000e06&|
+0#0000000&|A|(|"+0#e000002&|a|"|)+0#0000000&|,| @30
@8|B|(|"+0#e000002&|b|"| +0#0000000&@61
-@16>/+0#0000e05&|*|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|*|/|)+0#0000000&|,
-| @7|C|(|"+0#e000002&|c|"|,+0#0000000&| |n+0#af5f00255&|e|w|
+0#0000000&|T|h|r|e|a|d|(| @48
+@16|/+0#0000e05&|*|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|/|\|*|/|)+0#0000000&|,
+| @7>C|(|"+0#e000002&|c|"|,+0#0000000&| |n+0#af5f00255&|e|w|
+0#0000000&|T|h|r|e|a|d|(| @48
@75
@16|(+0#00e0e07&|)| |-|>| +0#0000000&|{| @51
@8|}|)@1|,| |D|(|"+0#e000002&|d|"|,+0#0000000&|
|(|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|B|o@1|l|e|a|n|S|u|p@1|l|i|e|r|)|
|(+0#00e0e07&|)| |-|>| +0#0000000&|t+0#e000002&|r|u|e|)+0#0000000&|,| @5
@@ -17,4 +16,5 @@
@8|f+0#00e0003&|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|)| |{|
|t+0#00e0003&|h|i|s|.+0#0000000&|s| |=| |s|;| |}| @29
@8|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|δ|>| |E|8|$|(|S|t|r|i|n|g| |s|,|
|δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @19
-@57|8@1|,|1|7| @8|9|6|%|
+@75
+@57|8|9|,|9| @9|9|7|%|
diff --git
a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump
b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump
index 73021e903..860cc4041 100644
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump
@@ -1,5 +1,4 @@
-| +0&#ffffff0@7|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|δ|>|
|E|8|$|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{|
|t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @19
-@75
+| +0&#ffffff0@74
@8|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#0000000&|p+0#00e0003&|u|b|l|i|c|
+0#0000000&|S|t|r|i|n|g| |t+0#00e0e07&|o|S|t|r|i|n|g|(|)| +0#0000000&|{|
|r+0#af5f00255&|e|t|u|r|n|
+0#0000000&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}
>}| @73
|~+0#4040ff13&| @73
@@ -17,4 +16,5 @@
|~| @73
|~| @73
|~| @73
+|~| @73
| +0#0000000&@56|1|0|4|,|1| @8|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/java_methods_style_04.dump
b/runtime/syntax/testdir/dumps/java_methods_style_04.dump
index 288a11035..e291225a7 100644
--- a/runtime/syntax/testdir/dumps/java_methods_style_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_04.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@3|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
@75
-@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@41
-| +0#00e0e07&@3|p+0#00e0003&|r|o|t|e|c|t|e|d|
+0#00e0e07&|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@2
+@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@31
+| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|f+0#00e0003&|i|n|a|l|
+0#00e0e07&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#00e0e07&|s+0#00e0003&|t|r|i|c|t|f|p|
+0#00e0e07&|<+0#00e0003&|α+0#00e0e07&|,| |β|>+0#00e0003&|
+0#00e0e07&|Τ|ʬ|<|α|>|[|]| |μ|ʭ@1|$|9@1|_|(| +0#0000000&@12
| +0#00e0e07&@11|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)| +0#0000000&@18
@4>{| @69
@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60
diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump
b/runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump
index 1b823f514..63ed52e21 100644
--- a/runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump
@@ -1,7 +1,7 @@
| +0&#ffffff0@3|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
@75
-@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&@41
-@4|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&|s+0#00e0003&|t|a|t|i|c|
+0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@2
+@4|@+0#e000e06&|S|u|p@1|r|e|s@1|W|a|r|n|i|n|g|s|(|"+0#e000002&|s|t|r|i|c|t|f|p|"|)+0#e000e06&|
+0#0000000&|p+0#00e0003&|r|o|t|e|c|t|e|d| +0#0000000&@31
+@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|f+0#00e0003&|i|n|a|l|
+0#0000000&|s+0#00e0003&|y|n|c|h|r|o|n|i|z|e|d|
+0#0000000&|s+0#00e0003&|t|r|i|c|t|f|p| +0#0000000&|<|α|,| |β|>|
|Τ|ʬ|<|α|>|[|]| |μ+0#00e0e07&|ʭ@1|$|9@1|_|(| +0#0000000&@12
@12|j|a|v|a|.|u|t|i|l|.|f|u|n|c|t|i|o|n|.|F|u|n|c|t|i|o|n|<|β|,|
|Τ|ʬ|<|α|>|[|]|[|]|>| |ƒ|)+0#00e0e07&| +0#0000000&@18
@4>{| @69
@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&@60
diff --git a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
index 4c68fac98..4133ae322 100644
--- a/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
+++ b/runtime/syntax/testdir/dumps/vim9_ex_loadkeymap_01.dump
@@ -11,8 +11,8 @@
|#+0#0000e05&| |V|i|m|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| |c|h|a|r|a|c|t|e|r|s|
+0#0000000&@43
|\|#| |<+0#e000e06&|c|h|a|r|-|0|x|0@1|a|3|>|
+0#0000000&@14|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
|n|t| +0#0000000&@72
-|"| |“| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
-@1|e|n|t| +0#0000000&@70
+|#+0#0000e05&| |L|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@24
+|"| |“| @71
|:| |#| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
|n|t| +0#0000000&@72
@75
diff --git a/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
b/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
index 53cfd8c5d..82f79ef53 100644
--- a/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
+++ b/runtime/syntax/testdir/dumps/vim9_function_calls_17.dump
@@ -10,7 +10,7 @@
@75
@75
|#+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n|
|c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
-|| @73
+@75
|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|
+0#0000000&@59
|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)|
+0#0000000&@52
@75
diff --git a/runtime/syntax/testdir/dumps/vim_ex_command_08.dump
b/runtime/syntax/testdir/dumps/vim_ex_command_08.dump
index 0d828c7c9..e6792e6a9 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_command_08.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_command_08.dump
@@ -13,8 +13,8 @@
@75
|c+0#af5f00255&|o|m@1|a|n|d|
+0#0000000&|-+0#e000e06&|r|a|n|g|e|=|%+0#00e0003&|
+0#0000000&|-+0#e000e06&|n|a|r|g|s|=|?+0#00e0003&|
+0#0000000&|-+0#e000e06&|b|a|n|g| +0#0000000&|T+0#0000001#ffff4012|b|
+0#0000000#ffffff0|{+0#e000e06&| +0#0000000&@38
@4|i+0#af5f00255&|f| +0#0000000&|"+0#e000002&|<|b|a|n|g|>|"|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|"+0#e000002&|!|"| +0#0000000&@52
-@8|:|<+0#e000e06&|l|i|n|e|1|>|,+0#0000000&|<+0#e000e06&|l|i|n|e|2|>|s+0#af5f00255&|/+0#e000e06&|\+0#0000000&|v|"|[|^|"|]|*|"|/+0#e000e06&|\+0#0000000&|=|s|u|b|s|t|i|t|u|t|e|(|s|u|b|m|a|t|c|h|(|0|)|,|
|"| |"|,| |"|•|"|,| |"|g|"
-|)|/+0#e000e06&|g|e| +0#0000000&@70
+@8|:|<+0#e000e06&|l|i|n|e|1|>|,+0#0000000&|<+0#e000e06&|l|i|n|e|2|>|s+0#af5f00255&|/+0#e000e06&|\+0#0000000&|v|"|[|^|"|]|*|"|/+0#e000e06&|\+0#0000000&|=|s|u|b|s|t|i|t|u|t|e|(|s|u|b|m|a|t|c|h|(|0|)|,|
|"| |"|,| @8
+|"|•|"|,| |"|g|"|)|/+0#e000e06&|g|e| +0#0000000&@62
@4|e+0#af5f00255&|n|d|i|f| +0#0000000&@65
@4|i+0#af5f00255&|f| +0#0000000&|"+0#e000002&|<|a|r|g|s|>|"|
+0#0000000&|=+0#af5f00255&@1| +0#0000000&|"+0#e000002&@1| +0#0000000&@53
@57|1|4|0|,|0|-|1| @6|8@1|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump
b/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump
index 2b8b90e1c..27d466b16 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_delfunction_01.dump
@@ -16,5 +16,5 @@
@75
|"+0#0000e05&| |I|s@1|u|e|
|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|4|2|0|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|9|2|7@1|9|8|6|8|7|
+0#0000000&@5
|"+0#0000e05&| |(|a|r|g| |n|a|m|e|d| |/|f|u|%|\|[|n|c|t|i|o|n|]|/|)|
+0#0000000&@46
-|| @73
+@75
@57|1|9|,|1| @9|8|6|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump
b/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump
index 203e37f9d..64f7d3026 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_delfunction_02.dump
@@ -1,4 +1,4 @@
-|+0&#ffffff0| @73
+| +0&#ffffff0@74
|s+0#af5f00255&|i|l|e|n|t|!| +0#0000000&|d+0#af5f00255&|e|l|f|u|n|c|!|
+0#0000000&|f|u|n|c| @53
> @74
|~+0#4040ff13&| @73
diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
b/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
index 009622987..03e355005 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_14.dump
@@ -14,7 +14,7 @@
@75
|"+0#0000e05&| |I|s@1|u|e|
|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|4|2|0|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|9|2|7@1|9|8|6|8|7|
+0#0000000&@5
|"+0#0000e05&| |(|f|u|n|c|t|i|o|n| |n|a|m|e|d|
|/|s|:|f|u|%|\|[|n|c|t|i|o|n|]|/|)| +0#0000000&@39
-|| @73
+@75
|f+0#af5f00255&|u|n|c|!|
+0#0000000&|s+0#e000e06&|:|f+0#0000000&|u|n|c|(+0#e000e06&|_+0#00e0e07&|,+0#0000000&|
|f+0#00e0e07&|u|n|c|)+0#e000e06&| +0#0000000&@53
@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|a+0#00e0e07&|:|f|u|n|c| +0#0000000&@57
@57|2|5|1|,|1| @8|9@1|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
b/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
index e64fe80c8..c1e406164 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_function_fold_14.dump
@@ -15,6 +15,6 @@
| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |I|s@1|u|e|
|h|t@1|p|s|:|/@1|g|i|t|h|u|b|.|c|o|m|/|v|i|m|/|v|i|m|/|p|u|l@1|/|1|7|4|2|0|#|i|s@1|u|e|c|o|m@1|e|n|t|-|2|9|2|7@1|9|8|6|8|7|
+0#0000000&@3
| +0#0000e05#a8a8a8255@1|"+0&#ffffff0| |(|f|u|n|c|t|i|o|n| |n|a|m|e|d|
|/|s|:|f|u|%|\|[|n|c|t|i|o|n|]|/|)| +0#0000000&@37
-| +0#0000e05#a8a8a8255@1|+0#0000000#ffffff0| @71
+| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@72
|-+0#0000e05#a8a8a8255| |f+0#af5f00255#ffffff0|u|n|c|!|
+0#0000000&|s+0#e000e06&|:|f+0#0000000&|u|n|c|(+0#e000e06&|_+0#00e0e07&|,+0#0000000&|
|f+0#00e0e07&|u|n|c|)+0#e000e06&| +0#0000000&@51
@57|2|5|2|,|1| @8|7|4|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
index 246775f5d..fb5cde1e8 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_loadkeymap_01.dump
@@ -10,8 +10,8 @@
|"+0#0000e05&| |V|i|m|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| |c|h|a|r|a|c|t|e|r|s|
+0#0000000&@43
|#| |<+0#e000e06&|c|h|a|r|-|0|x|0@1|a|3|>| +0#0000000&@15|L+0#0000e05&|i|n|e|
|s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a| |V|i|m|9|-|s|c|r|i|p|t| |c|o|m@1|e
|n|t| +0#0000000&@72
-|\|"| |“| @26|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
-@1|e|n|t| +0#0000000&@70
+|"+0#0000e05&| |L|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m@1|e|n|t| +0#0000000&@24
+|\|"| |“| @70
|:| |"| @27|L+0#0000e05&|i|n|e| |s|h|o|u|l|d| |n|o|t| |m|a|t|c|h| |a|s| |a|
|l|e|g|a|c|y|-|s|c|r|i|p|t| |c|o|m
@1|e|n|t| +0#0000000&@70
@75
diff --git a/runtime/syntax/testdir/dumps/vim_ex_set_04.dump
b/runtime/syntax/testdir/dumps/vim_ex_set_04.dump
index ad9fdf803..3d9fcd20b 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_set_04.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_set_04.dump
@@ -17,4 +17,4 @@
|s+0#af5f00255&|e|t|
+0#0000000&|t+0#e000e06&|e|r|m|=+0#af5f00255&|$+0#e000e06&|T|E|R|M|.+0#0000000&|n|e|w|
@56
|s+0#af5f00255&|e|t|
+0#0000000&|p+0#e000e06&|a|t|h|=+0#af5f00255&|/+0#0000000&|u|s|r|/|$+0#e000e06&|I|N|C|L|U|D|E|,|$|H|O|M|E|/+0#0000000&|i|n|c|l|u|d|e|,+0#e000e06&|.+0#0000000&|
@36
@75
-@57|7|2|,|1| @9|5|9|%|
+@57|7|2|,|1| @9|5|8|%|
diff --git a/runtime/syntax/testdir/dumps/vim_ex_set_07.dump
b/runtime/syntax/testdir/dumps/vim_ex_set_07.dump
index b28274ec7..c8402b543 100644
--- a/runtime/syntax/testdir/dumps/vim_ex_set_07.dump
+++ b/runtime/syntax/testdir/dumps/vim_ex_set_07.dump
@@ -6,7 +6,8 @@
>s+0#af5f00255&|e|t|
>+0#0000000&|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Ф+0#0000000&|Ы|В|А|П|Р|О|Л|Д|Ж|Э|Ё|;|A|S|D|F|G|H|J|K|L|\@1|:+0#e000e06&|\+0#0000000&@1|"|\@1|||
> @30
@6|\+0#e000e06&|
+0#0000000&|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Я+0#0000000&|Ч|С|М|И|Т|Ь|Б|Ю|;|Z|X|C|V|B|N|M|<+0#e000e06&|>|
+0#0000000&@38
@75
-|s+0#af5f00255&|e|t|
+0#0000000&|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Ф+0#0000000&|Ы|В|А|П|Р|О|Л|Д|Ж|Э|Ё|;|A|S|D|F|G|H|J|K|L|\@1|:+0#e000e06&|\+0#0000000&@1|"|\@1|||
|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Я+0#0000000&|Ч|С|М|И|Т|Ь|Б|Ю|;|Z|X|C|V|B|N|M|<+0#e000e06&|>|
+0#0000000&@1
+|s+0#af5f00255&|e|t|
+0#0000000&|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Ф+0#0000000&|Ы|В|А|П|Р|;|A|S|D|F|G|H|
|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|О+0#0000000&|Л|Д|Ж|Э|Ё|;|J|K|L|\@1|:+0#e000e06&|\+0#0000000&@1|"|\@1|||
@19
+@6|\+0#e000e06&|
+0#0000000&|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Я+0#0000000&|Ч|С|М|И|;|Z|X|C|V|B|
|l+0#e000e06&|a|n|g|m|a|p|++0#af5f00255&|=|Т+0#0000000&|Ь|Б|Ю|;|N|M|<+0#e000e06&|>|
+0#0000000&@27
@75
|~+0#4040ff13&| @73
|~| @73
@@ -16,5 +17,4 @@
|~| @73
|~| @73
|~| @73
-|~| @73
| +0#0000000&@56|1|2|6|,|1| @8|B|o|t|
diff --git a/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
index bf9957334..50bf79772 100644
--- a/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
+++ b/runtime/syntax/testdir/dumps/vim_function_calls_15.dump
@@ -6,7 +6,7 @@
> @74
@75
|"+0#0000e05&| |I|s@1|u|e| |#|1|7@1|6@1| |(|v|a|l|i|d| |f|u|n|c|t|i|o|n|
|c|a|l@1| |h|i|g|h|l|i|g|h|t|e|d| |a|s| |e|r@1|o|r|)| +0#0000000&@17
-|| @73
+@75
|c+0#af5f00255&|a|l@1|
+0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|f+0#0000001#ffff4012|o@1|(+0#e000e06#ffffff0|)|
+0#0000000&@54
|c+0#af5f00255&|a|l@1|
+0#0000000&|m|o|d|u|l|e|[|0+0#e000002&|]+0#0000000&|.+0#af5f00255&|s+0#0000001#ffff4012|u|b|s|t|i|t|u|t|e|(+0#e000e06#ffffff0|)|
+0#0000000&@47
@75
diff --git a/runtime/syntax/testdir/input/c_character_constant.c
b/runtime/syntax/testdir/input/c_character_constant.c
index 0962f9b7e..56d028b1a 100644
--- a/runtime/syntax/testdir/input/c_character_constant.c
+++ b/runtime/syntax/testdir/input/c_character_constant.c
@@ -13,7 +13,8 @@ int main (void)
// integer character constants,
int c1='a'; printf("'a': %#010x
", c1);
- int c2='🍌'; printf("'🍌': %#010x
", c2); // implementation-defined
+ // implementation-defined
+ int c2='🍌'; printf("'🍌': %#010x
", c2);
// multicharacter constant
int c3='ab'; printf("'ab': %#010x
", c3); // implementation-defined
diff --git a/runtime/syntax/testdir/input/c_string_literal.c
b/runtime/syntax/testdir/input/c_string_literal.c
index a59d58db6..cb67a40a2 100644
--- a/runtime/syntax/testdir/input/c_string_literal.c
+++ b/runtime/syntax/testdir/input/c_string_literal.c
@@ -41,11 +41,13 @@ int main(void)
printf("0x%02X ", +(unsigned char)s2[n]);
#endif
puts("}");
- printf(" u\"a猫🍌\" is a char16_t[%zu] holding { ", sizeof s3 / sizeof *s3);
+ printf(" u\"a猫🍌\" is a char16_t[%zu] holding { ",
+ sizeof s3 / sizeof *s3);
for(size_t n = 0; n < sizeof s3 / sizeof *s3; ++n)
printf("0x%04" PRIXLEAST16" ", s3[n]);
puts("}");
- printf(" U\"a猫🍌\" is a char32_t[%zu] holding { ", sizeof s4 / sizeof *s4);
+ printf(" U\"a猫🍌\" is a char32_t[%zu] holding { ",
+ sizeof s4 / sizeof *s4);
for(size_t n = 0; n < sizeof s4 / sizeof *s4; ++n)
printf("0x%08" PRIXLEAST32" ", s4[n]);
puts("}");
diff --git a/runtime/syntax/testdir/input/java_contextual_keywords.java
b/runtime/syntax/testdir/input/java_contextual_keywords.java
index 3fb9576d2..c38854d31 100644
--- a/runtime/syntax/testdir/input/java_contextual_keywords.java
+++ b/runtime/syntax/testdir/input/java_contextual_keywords.java
@@ -1,4 +1,4 @@
-// VIM_TEST_SETUP :highlight link javaConceptKind NonText
+// VIM_TEST_SETUP highlight link javaConceptKind NonText
diff --git a/runtime/syntax/testdir/input/java_methods_indent2.java
b/runtime/syntax/testdir/input/java_methods_indent2.java
index 5ab06635f..1b2e8632f 100644
--- a/runtime/syntax/testdir/input/java_methods_indent2.java
+++ b/runtime/syntax/testdir/input/java_methods_indent2.java
@@ -67,8 +67,8 @@ abstract class Indent2MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_indent2_signature.java
b/runtime/syntax/testdir/input/java_methods_indent2_signature.java
index 05e633bf2..8303e2354 100644
--- a/runtime/syntax/testdir/input/java_methods_indent2_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_indent2_signature.java
@@ -67,8 +67,8 @@ abstract class Indent2$MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_indent4.java
b/runtime/syntax/testdir/input/java_methods_indent4.java
index 092ded79c..cc3314976 100644
--- a/runtime/syntax/testdir/input/java_methods_indent4.java
+++ b/runtime/syntax/testdir/input/java_methods_indent4.java
@@ -67,8 +67,8 @@ abstract class Indent4MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_indent4_signature.java
b/runtime/syntax/testdir/input/java_methods_indent4_signature.java
index f21d95d0c..eace2683d 100644
--- a/runtime/syntax/testdir/input/java_methods_indent4_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_indent4_signature.java
@@ -67,8 +67,8 @@ abstract class Indent4$MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_indent8.java
b/runtime/syntax/testdir/input/java_methods_indent8.java
index ec17f5116..aadf9759e 100644
--- a/runtime/syntax/testdir/input/java_methods_indent8.java
+++ b/runtime/syntax/testdir/input/java_methods_indent8.java
@@ -67,8 +67,8 @@ abstract class Indent8MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_indent8_signature.java
b/runtime/syntax/testdir/input/java_methods_indent8_signature.java
index 8d8219690..677ce5a03 100644
--- a/runtime/syntax/testdir/input/java_methods_indent8_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_indent8_signature.java
@@ -67,8 +67,8 @@ abstract class Indent8$MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_style.java
b/runtime/syntax/testdir/input/java_methods_style.java
index af0c7af62..f9a6f5771 100644
--- a/runtime/syntax/testdir/input/java_methods_style.java
+++ b/runtime/syntax/testdir/input/java_methods_style.java
@@ -67,8 +67,8 @@ abstract class StyleMethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/java_methods_style_signature.java
b/runtime/syntax/testdir/input/java_methods_style_signature.java
index 8e3b4d64b..28a2f8887 100644
--- a/runtime/syntax/testdir/input/java_methods_style_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_style_signature.java
@@ -67,8 +67,8 @@ abstract class Style$MethodsTests
protected static final synchronized strictfp void ascii$99_()
{ ascii$98_(); }
- @SuppressWarnings("strictfp")
- protected static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
+ @SuppressWarnings("strictfp") protected
+ static final synchronized strictfp <α, β> Τʬ<α>[] μʭʭ$99_(
java.util.function.Function<β, Τʬ<α>[][]> ƒ)
{
return
diff --git a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
index fcae0a352..b6b5fece9 100644
--- a/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
+++ b/runtime/syntax/testdir/input/vim9_ex_loadkeymap.vim
@@ -22,6 +22,7 @@ c <char-0103> Special notation allowed in
RHS - octal
# Vim-script comment characters
\# <char-0x00a3> Line should not match as a Vim9-script comment
-" “ Line should not match as a legacy-script comment
+# Line should not match as a legacy-script comment
+" “
: # Line should not match as a Vim9-script comment
diff --git a/runtime/syntax/testdir/input/vim9_function_calls.vim
b/runtime/syntax/testdir/input/vim9_function_calls.vim
index c4245510e..63e82c662 100644
--- a/runtime/syntax/testdir/input/vim9_function_calls.vim
+++ b/runtime/syntax/testdir/input/vim9_function_calls.vim
@@ -311,7 +311,7 @@ if !isdirectory(&directory) | mkdir(&directory, "p") | endif
# Issue #17766 (valid function call highlighted as error)
-
+
module[0].foo()
module[0].substitute()
diff --git a/runtime/syntax/testdir/input/vim_ex_command.vim
b/runtime/syntax/testdir/input/vim_ex_command.vim
index 6fd59bf10..56890143c 100644
--- a/runtime/syntax/testdir/input/vim_ex_command.vim
+++ b/runtime/syntax/testdir/input/vim_ex_command.vim
@@ -147,7 +147,7 @@ command! -bang -nargs=* -complete=file Make AsyncRun
-program=make @ <args>
command -range=% -nargs=? -bang Tb {
if "<bang>" == "!"
- :<line1>,<line2>s/ "[^"]*"/\=substitute(submatch(0), " ", "•", "g")/ge
+ :<line1>,<line2>s/ "[^"]*"/\=substitute(submatch(0), " ", "•",
"g")/ge
endif
if "<args>" == ""
:<line1>,<line2>!column -t
diff --git a/runtime/syntax/testdir/input/vim_ex_delfunction.vim
b/runtime/syntax/testdir/input/vim_ex_delfunction.vim
index 18ecd48f4..04c33e926 100644
--- a/runtime/syntax/testdir/input/vim_ex_delfunction.vim
+++ b/runtime/syntax/testdir/input/vim_ex_delfunction.vim
@@ -29,6 +29,6 @@ delfunction Foo " comment
" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
" (arg named /fu%\[nction]/)
-
+
silent! delfunc! func
diff --git a/runtime/syntax/testdir/input/vim_ex_function.vim
b/runtime/syntax/testdir/input/vim_ex_function.vim
index ad57f641a..8a0f398fe 100644
--- a/runtime/syntax/testdir/input/vim_ex_function.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function.vim
@@ -259,7 +259,7 @@ endfunction
" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
" (function named /s:fu%\[nction]/)
-
+
func! s:func(_, func)
return a:func
endfunc
diff --git a/runtime/syntax/testdir/input/vim_ex_function_fold.vim
b/runtime/syntax/testdir/input/vim_ex_function_fold.vim
index 3517506ad..c64c62de8 100644
--- a/runtime/syntax/testdir/input/vim_ex_function_fold.vim
+++ b/runtime/syntax/testdir/input/vim_ex_function_fold.vim
@@ -261,7 +261,7 @@ endfunction
" Issue https://github.com/vim/vim/pull/17420#issuecomment-2927798687
" (function named /s:fu%\[nction]/)
-
+
func! s:func(_, func)
return a:func
endfunc
diff --git a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
index 4271e0eb1..853256c91 100644
--- a/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
+++ b/runtime/syntax/testdir/input/vim_ex_loadkeymap.vim
@@ -21,6 +21,7 @@ c <char-0103> Special notation allowed in
RHS - octal
" Vim-script comment characters
# <char-0x00a3> Line should not match as a Vim9-script comment
-\" “ Line should not match as a legacy-script comment
+" Line should not match as a legacy-script comment
+\" “
: " Line should not match as a legacy-script comment
diff --git a/runtime/syntax/testdir/input/vim_ex_set.vim
b/runtime/syntax/testdir/input/vim_ex_set.vim
index a27a965b4..379f8065e 100644
--- a/runtime/syntax/testdir/input/vim_ex_set.vim
+++ b/runtime/syntax/testdir/input/vim_ex_set.vim
@@ -126,5 +126,6 @@ set langmap+=ЯЧСМИТЬБЮ;ZXCVBNM<>
set langmap+=ФЫВАПРОЛДЖЭЁ;ASDFGHJKL\:\"\|
\ langmap+=ЯЧСМИТЬБЮ;ZXCVBNM<>
-set langmap+=ФЫВАПРОЛДЖЭЁ;ASDFGHJKL\:\"\| langmap+=ЯЧСМИТЬБЮ;ZXCVBNM<>
+set langmap+=ФЫВАПР;ASDFGH langmap+=ОЛДЖЭЁ;JKL\:\"\|
+ \ langmap+=ЯЧСМИ;ZXCVB langmap+=ТЬБЮ;NM<>
diff --git a/runtime/syntax/testdir/input/vim_function_calls.vim
b/runtime/syntax/testdir/input/vim_function_calls.vim
index eed260c8b..60158161c 100644
--- a/runtime/syntax/testdir/input/vim_function_calls.vim
+++ b/runtime/syntax/testdir/input/vim_function_calls.vim
@@ -271,7 +271,7 @@ call module.foo().substitute()
" Issue #17766 (valid function call highlighted as error)
-
+
call module[0].foo()
call module[0].substitute()
--
--
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 visit
https://groups.google.com/d/msgid/vim_dev/E1ujbsQ-00Fomx-7p%40256bit.org.
