runtime(java): Allow for org.TopLevelType<T>.NestedType return types

closes: #19349

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index 149f5fd5a7b69cde2895ab700c312c5fb1bdbe0e..bc874904f6a07437452a0291a7c2385cbebd3411 100644 (file)
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -3,7 +3,7 @@
 " Maintainer:          Aliaksei Budavei <0x000c70 AT gmail DOT com>
 " Former Maintainer:   Claudio Fleiner <claudio@fleiner.com>
 " Repository:          https://github.com/zzzyxwvut/java-vim.git
-" Last Change:         2025 Oct 08
+" Last Change:         2026 Feb 06
 
 " Please check ":help java.vim" for comments on some of the options
 " available.
@@ -37,6 +37,8 @@ set cpo&vim
 
 """" STRIVE TO REMAIN COMPATIBLE FOR AT LEAST VIM 7.0.
 let s:ff = {}
+let s:vv = {}
+let s:vv.ignore_folding = get(g:, 'java_ignore_folding', '')
 
 function! s:ff.LeftConstant(x, y) abort
   return a:x
@@ -60,7 +62,7 @@ else
 endif
 
 function! s:ff.QueryFoldArgForSyntaxItems(kind) abort
-  return stridx(s:java_ignore_folding, a:kind) < 0 ? "fold" : ""
+  return stridx(s:vv.ignore_folding, a:kind) < 0 ? "fold" : ""
 endfunction
 
 if !exists("*s:ReportOnce")
@@ -94,8 +96,6 @@ if exists("g:java_foldtext_show_first_or_second_line")
   setlocal foldtext=JavaSyntaxFoldTextExpr()
 endif
 
-let s:java_ignore_folding = get(g:, 'java_ignore_folding', '')
-
 " Admit the ASCII dollar sign to keyword characters (JLS-17, §3.8):
 try
   exec 'syntax iskeyword ' . &l:iskeyword . ',$'
@@ -211,6 +211,15 @@ let s:with_html = !exists("g:java_ignore_html")
 let s:with_markdown = !exists("g:java_ignore_markdown")
 lockvar s:with_html s:with_markdown
 
+" Note that the delimiting angle brackets are omitted.
+let s:vv.type_param_list = '\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '<!'
+" COMBAK: Revisit reference types once JDK-8259731 and JDK-8316779
+" will have been resolved.
+let s:vv.param_type_head = 'b\%%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\|\%%(\<\K\k*\>\.\)*%s\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>'
+" Allow for org.example.TopLevelType<T>.MemberType return types.
+let s:vv.void_or_param_type = 'void\|\%(' . printf(s:vv.param_type_head, '\%(') . '\%(<' . s:vv.type_param_list . '>\.\=\)\=\)\+\)\%(\[\]\)*'
+let s:vv.param_type_head = printf(s:vv.param_type_head, '')
+
 " Java module declarations (JLS-17, §7.7).
 "
 " Note that a "module-info" file will be recognised with an arbitrary
@@ -344,13 +353,13 @@ if exists("g:java_highlight_generics")
 
   " Match sections of generic methods and constructors and their
   " parameterised use.
-  exec 'syn region javaTypeParamSection transparent matchgroup=javaGenericsCX start=/' . s:ff.Engine('\%#=2', '') . '\%(^\|\s\)\@' . s:ff.Peek('1', '') . '<=<\%(\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '<!>\_s\+\%(\%(void\|\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '<!>\)\=\)\%(\[\]\)*\)\_s\+\)\=\<\K\k*\>\s*(\)\@=/ end=/>/ contains=javaGenerics,@javaTypeParams'
+  exec 'syn region javaTypeParamSection transparent matchgroup=javaGenericsCX start=/' . s:ff.Engine('\%#=2', '') . '\%(^\|\s\)\@' . s:ff.Peek('1', '') . '<=<\%(' . s:vv.type_param_list . '>\_s\+\%(\%(' . s:vv.void_or_param_type . '\)\_s\+\)\=\<\K\k*\>\s*(\)\@=/ end=/>/ contains=javaGenerics,@javaTypeParams'
   exec 'syn region javaTypeParamSection transparent matchgroup=javaGenericsCX start=/\%(\%(\<new\|::\|\.\)[[:space:]\n]*\)\@' . s:ff.PeekFor('javaTypeParamSection', 80) . '<=<>\@!/ end=/>/ contains=javaGenerics,@javaTypeParams'
 
   for s:ctx in [{'gsg': 'javaGenerics', 'ghg': 'javaGenericsC1', 'csg': 'javaGenericsX', 'c': ''},
       \ {'gsg': 'javaGenericsX', 'ghg': 'javaGenericsC2', 'csg': 'javaGenerics', 'c': ' contained'}]
     " Match sections of generic types and their parameterised use.
-    exec 'syn region ' . s:ctx.gsg . s:ctx.c . ' transparent matchgroup=' . s:ctx.ghg . ' start=/' . s:ff.Engine('\%#=2', '') . '\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\><\%([[:space:]\n]*\%([?@]\|\<\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\)\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\)\)\@=/ end=/>/ contains=' . s:ctx.csg . ',@javaTypeParams'
+    exec 'syn region ' . s:ctx.gsg . s:ctx.c . ' transparent matchgroup=' . s:ctx.ghg . ' start=/' . s:ff.Engine('\%#=2', '') . '\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\><\%([[:space:]\n]*\%([?@]\|' . s:vv.param_type_head . '\)\)\@=/ end=/>/ contains=' . s:ctx.csg . ',@javaTypeParams'
   endfor
 
   unlet s:ctx
@@ -745,8 +754,8 @@ if exists("g:java_highlight_functions")
     " "[^=]*", all records with "\<record\s", and let the "*Skip*"
     " definitions take care of constructor declarations and enum
     " constants (with no support for @Foo(value = "bar")).  Also,
-    " reject inlined declarations with "[^{]" for signature.
-    exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start="' . s:ff.PeekTo('\%(', '') . '^' . s:indent . '\%(<\%(/\*.\{-}\*/\|[^(){}>]\|\n\)\+>\+\s\+\|\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)\+\)\=\%(\<\K\k*\>\.\)*\K\k*\>[^={]*\%(\<record\)\@' . s:ff.Peek('6', '') . '<!\s' . s:ff.PeekFrom('\)\@' . s:ff.PeekFor('javaFuncDef', 120) . '<=', '') . '\K\k*\s*(" end=")" contains=@javaFuncParams'
+    " reject inlined declarations with "[^{;]" for signature.
+    exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start="' . s:ff.PeekTo('\%(', '') . '^' . s:indent . '\%(<\%(/\*.\{-}\*/\|[^(){}>]\|\n\)\+>\+\s\+\|\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)\+\)\=\%(\<\K\k*\>\.\)*\K\k*\>[^={;]*\%(\<record\)\@' . s:ff.Peek('6', '') . '<!\s' . s:ff.PeekFrom('\)\@' . s:ff.PeekFor('javaFuncDef', 120) . '<=', '') . '\K\k*\s*(" end=")" contains=@javaFuncParams'
     " As long as package-private constructors cannot be matched with
     " javaFuncDef, do not look with javaConstructorSkipDeclarator for
     " them.  (Approximate "javaTypeParamSection" if necessary.)
@@ -755,9 +764,10 @@ if exists("g:java_highlight_functions")
     " javaFuncDef, make related adjustments:
     " (1) Claim all enum constants of a line as a unit.
     exec 'syn match javaEnumSkipConstant contained transparent /^' . s:indent . '\%(\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\K\k*\s*\%((.*)\)\=\s*[,;({]\s*\)\+/ contains=@javaEnumConstants'
-    " (2) Define a syntax group for top level enumerations and tell
-    " apart their constants from method declarations.
-    exec 'syn region javaTopEnumDeclaration transparent start=/\%(^\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\%(p\%(ublic\|rotected\|rivate\)\s\+\)\=\%(strictfp\s\+\)\=\<enum\_s\+\)\@' . s:ff.PeekFor('javaTopEnumDeclaration', 80) . '<=\K\k*\%(\_s\+implements\_s.\+\)\=\_s*{/ end=/}/ contains=@javaTop,javaEnumSkipConstant'
+    " (2) Define javaTopEnum{Block,Declaration} for top level enums
+    " and tell apart their constants from method declarations.
+    syn region javaTopEnumBlock contained transparent matchgroup=javaTopEnumBlockStart start="{" end="}" contains=@javaTop,javaEnumSkipConstant
+    exec 'syn match javaTopEnumDeclaration transparent /\%(^\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\%(p\%(ublic\|rotected\|rivate\)\s\+\)\=\%(strictfp\s\+\)\=\<enum\_s\+\)\@' . s:ff.PeekFor('javaTopEnumDeclaration', 80) . '<=\K\k*\%(\_s\+implements\_s.\+\)\=\_s*{\@=/ nextgroup=javaTopEnumBlock skipwhite skipempty'
     " (3) Define a base variant of javaParenT without using @javaTop
     " in order to not include javaFuncDef.
     syn region javaParenE transparent matchgroup=javaParen start="(" end=")" contains=@javaEnumConstants,javaInParen
@@ -769,7 +779,7 @@ if exists("g:java_highlight_functions")
 
     " Match arbitrarily indented camelCasedName method declarations.
     " Match: [@ɐ] [abstract] [<α, β>] Τʬ[<γ>][[][]] μʭʭ(/* ... */);
-    exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start=/' . s:ff.Engine('\%#=2', '') . s:ff.PeekTo('\%(', '') . '^\s\+\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\%(p\%(ublic\|rotected\|rivate\)\s\+\)\=\%(\%(abstract\|default\)\s\+\|\%(\%(final\|\%(native\|strictfp\)\|s\%(tatic\|ynchronized\)\)\s\+\)*\)\=\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '<!>\s\+\)\=\%(void\|\%(b\%(oolean\|yte\)\|char\|short\|int\|long\|float\|double\|\%(\<\K\k*\>\.\)*\<' . s:ff.UpperCase('[$_[:upper:]]', '[^a-z0-9]') . '\k*\>\%(<\%([^(){}]\|\n\)\+[[:space:]-]\@' . s:ff.Peek('1', '') . '<!>\)\=\)\%(\[\]\)*\)\s\+' . s:ff.PeekFrom('\)\@' . s:ff.PeekFor('javaFuncDef', 120) . '<=', '') . '\<' . s:ff.LowerCase('[$_[:lower:]]', '[^A-Z0-9]') . '\k*\>\s*(/ end=/)/ skip=/\/\*.\{-}\*\/\|\/\/.*$/ contains=@javaFuncParams'
+    exec 'syn region javaFuncDef ' . s:ff.GroupArgs('transparent matchgroup=javaFuncDefStart', '') . ' start=/' . s:ff.Engine('\%#=2', '') . s:ff.PeekTo('\%(', '') . '^\s\+\%(\%(@\%(\K\k*\.\)*\K\k*\>\)\s\+\)*\%(p\%(ublic\|rotected\|rivate\)\s\+\)\=\%(\%(abstract\|default\)\s\+\|\%(\%(final\|\%(native\|strictfp\)\|s\%(tatic\|ynchronized\)\)\s\+\)*\)\=\%(<' . s:vv.type_param_list . '>\s\+\)\=\%(' . s:vv.void_or_param_type . '\)\s\+' . s:ff.PeekFrom('\)\@' . s:ff.PeekFor('javaFuncDef', 120) . '<=', '') . '\<' . s:ff.LowerCase('[$_[:lower:]]', '[^A-Z0-9]') . '\k*\>\s*(/ end=/)/ skip=/\/\*.\{-}\*\/\|\/\/.*$/ contains=@javaFuncParams'
   endif
 endif
 
@@ -977,7 +987,7 @@ endif
 
 let b:spell_options = "contained"
 let &cpo = s:cpo_save
-unlet s:cpo_save s:ff s:java_ignore_folding s:with_html s:with_markdown
+unlet s:cpo_save s:ff s:vv s:with_html s:with_markdown
 
 " See ":help vim9-mix".
 if !has("vim9script")

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
index 36fe19daa21cff34f9653e4df20be8bd87f34340..84136624f7ac2a91aec55e3fc8474eeb9be54ed1 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_01.dump
@@ -17,4 +17,4 @@
 @4|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @51
 @2|}| @71
 @75
-@57|1|9|,|0|-|1| @7|1|3|%| 
+@57|1|9|,|0|-|1| @7|1|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump
index fbaf738978bbb4d73dce7e72722eb17a17716900..f1b32b2a13f45db040b1c6faeae4114255881b2c 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_02.dump
@@ -17,4 +17,4 @@
 @75
 @2|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@61
 | +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#00e0003&|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
-@57|3|7|,|3| @9|3@1|%| 
+@57|3|7|,|3| @9|2|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
index 598d994b5b505991ddf13bf1662d0d578fb5d9db..2b8c8fcf8a8323c9b75184f28b6f5e96092f9884 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_03.dump
@@ -17,4 +17,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&@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&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@11
 @2|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @56
-@57|5@1|,|3| @9|5|2|%| 
+@57|5@1|,|3| @9|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
index 9d6ec06e3d51f0a89b641cd42725449fe06eb9bd..19c25ddf5fd6f83d77e6a5f876911feee862dacb 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_04.dump
@@ -17,4 +17,4 @@
 @4|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|)| @37
 @6|.|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|;| @9
 @2|}| @71
-@57|7|3|,|3| @9|7|2|%| 
+@57|7|3|,|3| @9|5@1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump
index d9e6540f574d3a496f07f44a57d1ce507d043870..b8f5600191234ad2cd577a313d55ae5d414b86f1 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_05.dump
@@ -17,4 +17,4 @@
 @4|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&| @43
 @4|@+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|;| |}| @14
 @2|}|)|,| |/+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&@6
-@57|9|1|,|0|-|1| @7|9|1|%| 
+@57|9|1|,|0|-|1| @7|7|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump
index f0d7c5e6d80a5f5894d677e65f28f5e28de3030b..6a8a84ca327723466b47645f32f76a25ab689312 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_06.dump
@@ -7,14 +7,14 @@
 @75
 | +0#00e0e07&@1|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|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&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @5
 |}| @73
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|9|,|3| @8|B|o|t| 
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|C+0#00e0e07&|2|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&@58
+|{| @73
+@2|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |C|2|A|l|i|a|s|(|T| |n|a|m|e|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @21
+@75
+@1| +0#00e0003&|c|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @59
+@2|{| @71
+@4|f+0#00e0003&|i|n|a|l| +0#0000000&|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|e|r| |=| @20
+@6|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|e|r|(|)|;| @31
+@75
+@57|1|0|9|,|3| @8|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_07.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_07.dump
new file mode 100644 (file)
index 0000000..bb470b3
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+@4|C+0#00e0e07&|2|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&|.+0#0000000&|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| @43
+@4|{| @69
+@6|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @50
+@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @56
+@4>}| @69
+@75
+@4|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|(|)| @36
+@4|{| @69
+@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|(|)|;| @42
+@4|}| @69
+@2|}| @71
+@75
+| +0#00e0e07&@1|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#00e0003&|A+0#00e0e07&|>+0#00e0003&| +0#00e0e07&|C|2|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b|u|i|l|d|e|r|(|A| |n|a|m|e|)| +0#0000000&@27
+@2|{| @71
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|C|2|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @29
+@2|}| @71
+|}| @73
+|~+0#4040ff13&| @73
+| +0#0000000&@56|1|2|7|,|5| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.dump
index 7108a8dae03d966e08e92b4de303efc91ddf17e2..7e0ba24090057939ffa12b38697b620b2ca79ea7 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_01.dump
@@ -17,4 +17,4 @@
 @4|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @51
 @2|}| @71
 @75
-@57|1|9|,|0|-|1| @7|1|5|%| 
+@57|1|9|,|0|-|1| @7|1@1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.dump
index 62a1848c354066f940b44f9a03d019fb7ab7a755..65a00445c64b5f344aee7503d2196d6db7b2c550 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_02.dump
@@ -17,4 +17,4 @@
 @75
 @2|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@61
 @2|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|a+0#00e0003&|b|s|t|r|a|c|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@13
-@57|3|7|,|3| @9|3|6|%| 
+@57|3|7|,|3| @9|2|7|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.dump
index b5f1c5def5a23e81702acec3dba552f5d93f390c..8b31dc4ebc2309886a5c649785c93df823741af1 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_03.dump
@@ -17,4 +17,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&@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&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|9@1|_|(|)| +0#0000000&@11
 @2|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @56
-@57|5@1|,|3| @9|5|7|%| 
+@57|5@1|,|3| @9|4|3|%| 

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 beb784a21a26891c928f391fbcdaa3beaf584cf1..2f42c92d478a65a3f1e98dcf11564059b588b290 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_04.dump
@@ -17,4 +17,4 @@
 |e+0#00e0003&|n|u|m| +0#0000000&|E|2|$| @66
 |{| @73
 @2|@+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&|,| @36
-@57|7|3|,|3| @9|7|8|%| 
+@57|7|3|,|3| @9|5|9|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.dump
index d1e6b0301d4c570e0e8393b9fde0c44ae19c650c..4256a37dcf3873fdebe5612e7cdff0a302f19899 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_05.dump
@@ -17,4 +17,4 @@
 @75
 @2|@+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|(|)|;| |}| @5
 |}| @73
-@57|9|1|,|5| @9|B|o|t| 
+@57|9|1|,|5| @9|7|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_06.dump
new file mode 100644 (file)
index 0000000..57f5db9
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_06.dump
@@ -0,0 +1,20 @@
+|}+0&#ffffff0| @73
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|C|2|$|A|l|i|a|s|<|T|>| @57
+|{| @73
+@2|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |C|2|$|A|l|i|a|s|(|T| |n|a|m|e|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @20
+> @74
+@1| +0#00e0003&|c|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @59
+@2|{| @71
+@4|f+0#00e0003&|i|n|a|l| +0#0000000&|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T|>| |b|u|i|l|d|e|r| |=| @20
+@6|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<|T|>|b|u|i|l|d|e|r|(|)|;| @31
+@75
+@4|C|2|$|A|l|i|a|s|<|T|>|.|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| @42
+@4|{| @69
+@6|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @50
+@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @56
+@4|}| @69
+@75
+@4|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T|>| |b|u|i|l|d|(|)| @36
+@4|{| @69
+@57|1|0|9|,|0|-|1| @6|9|1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent2_signature_07.dump b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_07.dump
new file mode 100644 (file)
index 0000000..2a5058c
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent2_signature_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@3|{| @69
+@6|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<|T|>|b|u|i|l|d|(|)|;| @42
+@4|}| @69
+@2|}| @71
+@75
+@2>s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|A|>| |C|2|$|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b+0#00e0e07&|u|i|l|d|e|r|(|A+0#0000000&| |n|a|m|e|)+0#00e0e07&| +0#0000000&@26
+@2|{| @71
+@4|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|C|2|$|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @28
+@2|}| @71
+|}| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|2|7|,|3| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
index 53d546dc95d06e3f15590e5ee2dc06dbf99709f9..e8c7a8d014c46e9337b08cc285b80871d644c291 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_01.dump
@@ -17,4 +17,4 @@
 @8|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @47
 @4|}| @69
 @75
-@57|1|9|,|0|-|1| @7|1|3|%| 
+@57|1|9|,|0|-|1| @7|1|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump
index 5793cb4fb0a55035e411cef064ec75336ab8867f..73e83cfa831d98a1944846422f0161c694749ba7 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_02.dump
@@ -17,4 +17,4 @@
 @75
 @4|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@59
 | +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#00e0003&|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
-@57|3|7|,|5| @9|3@1|%| 
+@57|3|7|,|5| @9|2|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
index 7b3f96937ccbcae921888f0e918f01290c0512b5..4b80bff4afc532674c1ab8bec7ca647af805ba84 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_03.dump
@@ -17,4 +17,4 @@
 @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&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@9
 @4|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
-@57|5@1|,|5| @9|5|2|%| 
+@57|5@1|,|5| @9|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
index 5b762a676888cd7707cba39372a804b7ec7a854b..4559fa09c2dcfd91ce2f2bb596c4703106d13ac2 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_04.dump
@@ -17,4 +17,4 @@
 @4|{| @69
 @8|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|)| @33
 @12|.|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|;| @3
-@57|7|3|,|5| @9|7|1|%| 
+@57|7|3|,|5| @9|5@1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump
index e194e0fb3dabe2c91b5589b9a31f68b43c072a86..0028091ac1bd4b915a97c222c6b042d291449ef8 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_05.dump
@@ -17,4 +17,4 @@
 @4|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|(|)| |{| @6
 @8|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&| @39
 @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|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|;| |}| @10
-@57|9|0|,|1| @9|9|0|%| 
+@57|9|0|,|1| @9|7|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump
index 39f0d58b20b1cefb9d8030c82a92b9cf668224f0..c87f36d03c884b78c46a82eee1e45eb0565d30fa 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_06.dump
@@ -8,13 +8,13 @@
 @75
 | +0#00e0e07&@3|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|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&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}| @3
 |}| @73
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|8|,|5| @8|B|o|t| 
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|C+0#00e0e07&|4|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&@58
+|{| @73
+@4|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |C|4|A|l|i|a|s|(|T| |n|a|m|e|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @19
+@75
+@1| +0#00e0003&@2|c|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @57
+@4|{| @69
+@8|f+0#00e0003&|i|n|a|l| +0#0000000&|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|e|r| |=| @16
+@12|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|e|r|(|)|;| @25
+@57|1|0|8|,|5| @8|8|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_07.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_07.dump
new file mode 100644 (file)
index 0000000..9826a7d
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@11|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|e|r|(|)|;| @25
+@75
+@8|C+0#00e0e07&|4|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&|.+0#0000000&|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| @39
+@8|{| @65
+@12|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @44
+@12>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @50
+@8|}| @65
+@75
+@8|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|(|)| @32
+@8|{| @65
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|(|)|;| @36
+@8|}| @65
+@4|}| @69
+@75
+| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#00e0003&|A+0#00e0e07&|>+0#00e0003&| +0#00e0e07&|C|4|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b|u|i|l|d|e|r|(|A| |n|a|m|e|)| +0#0000000&@25
+@4|{| @69
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|C|4|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @25
+@4|}| @69
+|}| @73
+@57|1|2|6|,|1|3| @7|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.dump
index 6f98ab866bf8d6270b7c9478438ecfced31b3b3d..da3cbc43349732dc1bff0a4d0acaeb3af7786c0f 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_01.dump
@@ -17,4 +17,4 @@
 @8|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @47
 @4|}| @69
 @75
-@57|1|9|,|0|-|1| @7|1|5|%| 
+@57|1|9|,|0|-|1| @7|1@1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.dump
index cb22e022e4f4b657e3a795a4feee843f68ca601b..9af0026f3d53af27658212af55b1a655ff49377b 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_02.dump
@@ -17,4 +17,4 @@
 @75
 @4|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@59
 @4|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|a+0#00e0003&|b|s|t|r|a|c|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11
-@57|3|7|,|5| @9|3|6|%| 
+@57|3|7|,|5| @9|2|7|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.dump
index 6fd414a8109fd90628d795bedc474611f555dc26..7d1f0622847a8d2ff136f677ec0d316dd6bae05a 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_03.dump
@@ -17,4 +17,4 @@
 @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&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|9@1|_|(|)| +0#0000000&@9
 @4|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
-@57|5@1|,|5| @9|5|7|%| 
+@57|5@1|,|5| @9|4|3|%| 

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 3a060f6dc11991ca5c235a1d7b52976a19024794..22a2123ee8739bc7ae6742ea88387b1dbe7d6fc3 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_04.dump
@@ -17,4 +17,4 @@
 @75
 |e+0#00e0003&|n|u|m| +0#0000000&|E|4|$| @66
 |{| @73
-@57|7|3|,|5| @9|7@1|%| 
+@57|7|3|,|5| @9|5|9|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.dump
index 056a7d2292ce61ebcf2247979047ad10600ada47..12c3ca481316cdfd9c0ca0ac96b07fe567ea1786 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_05.dump
@@ -17,4 +17,4 @@
 @4|p+0#00e0003&|r|i|v|a|t|e| +0#0000000&|<|δ|>| |E|4|$|(|S|t|r|i|n|g| |s|,| |δ| |d|u|m@1|y|)| |{| |t+0#00e0003&|h|i|s|(+0#0000000&|s|)|;| |}| @23
 @75
 @4|@+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|(|)|;| |}| @3
-@57|9|0|,|0|-|1| @7|9|8|%| 
+@57|9|0|,|0|-|1| @7|7|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_06.dump
index e4569eae507b42ae6a109dccd61d5ad0ab81430b..5b60ef4dfcfc87166dd11da7e4cc27a01482b2fd 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_06.dump
@@ -1,20 +1,20 @@
 | +0&#ffffff0@3|@+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|(|)|;| |}| @3
->}| @73
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|4|,|1| @8|B|o|t| 
+|}| @73
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|C|4|$|A|l|i|a|s|<|T|>| @57
+|{| @73
+@4>f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |C|4|$|A|l|i|a|s|(|T| |n|a|m|e|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @18
+@75
+@1| +0#00e0003&@2|c|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @57
+@4|{| @69
+@8|f+0#00e0003&|i|n|a|l| +0#0000000&|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T|>| |b|u|i|l|d|e|r| |=| @16
+@12|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<|T|>|b|u|i|l|d|e|r|(|)|;| @25
+@75
+@8|C|4|$|A|l|i|a|s|<|T|>|.|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| @38
+@8|{| @65
+@12|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @44
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @50
+@8|}| @65
+@75
+@8|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T|>| |b|u|i|l|d|(|)| @32
+@57|1|0|8|,|5| @8|9|1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent4_signature_07.dump b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_07.dump
new file mode 100644 (file)
index 0000000..38310f1
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent4_signature_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@7|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T|>| |b|u|i|l|d|(|)| @32
+@8|{| @65
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<|T|>|b|u|i|l|d|(|)|;| @36
+@8|}| @65
+@4|}| @69
+> @74
+@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|A|>| |C|4|$|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b+0#00e0e07&|u|i|l|d|e|r|(|A+0#0000000&| |n|a|m|e|)+0#00e0e07&| +0#0000000&@24
+@4|{| @69
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|C|4|$|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @24
+@4|}| @69
+|}| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|2|6|,|0|-|1| @6|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
index 016bcd5a2fe41eb20ec4cf4b26b0c7b0878b3df6..1cb730a1db4cd4c0238a62d327cbdc002158ae57 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_01.dump
@@ -17,4 +17,4 @@
 @16|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @39
 @8|}| @65
 @75
-@57|1|9|,|0|-|1| @7|1|3|%| 
+@57|1|9|,|0|-|1| @7|1|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump
index 7eeb96539a834133967f7f00c8074f13f2999145..108e3406fbb76ee42db8d18c9374159a2731814b 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_02.dump
@@ -17,4 +17,4 @@
 @75
 @8|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@55
 | +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#00e0003&|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
-@57|3|7|,|9| @9|3@1|%| 
+@57|3|7|,|9| @9|2|5|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
index f43e30191b9fac66255fb9de30e9fef56946acd9..b3d2a950138bd2d8b855cedde5e99b5c2217eb3e 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_03.dump
@@ -17,4 +17,4 @@
 @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&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@5
 @8|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @50
-@57|5@1|,|9| @9|5|2|%| 
+@57|5@1|,|9| @9|4|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
index 212736b04747adb19df9aca3f4a60941ce874830..46a3521c43d1419361a366c07397ed3e5613add9 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_04.dump
@@ -17,4 +17,4 @@
 @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
 @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|%| 
+| +0#0000000&@56|7|3|,|9| @9|5|4|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
index 525f5838f085a1a68607d28509fcf4515847dff0..b0b40a17f21a734a0fcf63bf77cd2fba695127b7 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_05.dump
@@ -17,4 +17,4 @@
 @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
 @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|%| 
+@57|8|9|,|9| @9|6|9|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
index bc43e5f2f7946c5edce0f09f4727ab54fc3a6303..a8e1a18ef8ed9018ebc09a1b754b0d5103737042 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_06.dump
@@ -9,12 +9,12 @@
 @75
 | +0#00e0e07&@7|@+0#e000e06&|O|v|e|r@1|i|d|e| +0#00e0e07&|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&|n|a|m|e|(|)|.|t|o|U|p@1|e|r|C|a|s|e|(|)|;| |}
 @1| @73
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|7|,|9| @8|B|o|t| 
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|C+0#00e0e07&|8|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&@58
+|{| @73
+@8|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |C|8|A|l|i|a|s|(|T| |n|a|m|e|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @15
+@75
+@1| +0#00e0003&@6|c|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @53
+@8|{| @65
+@16|f+0#00e0003&|i|n|a|l| +0#0000000&|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|e|r| |=| @8
+@57|1|0|7|,|9| @8|8|4|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_07.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_07.dump
new file mode 100644 (file)
index 0000000..a1facb6
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@15|f+0#00e0003&|i|n|a|l| +0#0000000&|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|e|r| |=| @8
+@24|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|e|r|(|)|;| @13
+@75
+@16|C+0#00e0e07&|8|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&|.+0#0000000&|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| @31
+@16|{| @57
+@24>b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @32
+@24|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @38
+@16|}| @57
+@75
+@16|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|(|)| @24
+@16|{| @57
+@24|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|(|)|;| @24
+@16|}| @57
+@8|}| @65
+@75
+| +0#00e0e07&@7|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#00e0003&|A+0#00e0e07&|>+0#00e0003&| +0#00e0e07&|C|8|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b|u|i|l|d|e|r|(|A| |n|a|m|e|)| +0#0000000&@21
+@8|{| @65
+@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|C|8|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @17
+@8|}| @65
+@57|1|2|5|,|2|5| @7|9@1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_08.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_08.dump
new file mode 100644 (file)
index 0000000..0ed04ac
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_08.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@7|}| @65
+>}| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|3|9|,|1| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.dump
index 405d699f43e0c68b7777f1377ae13cc9cd2a5849..aec5e2bbfb3666dd3fc7f34585a5f231794e8a63 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_01.dump
@@ -17,4 +17,4 @@
 @16|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;| @39
 @8|}| @65
 @75
-@57|1|9|,|0|-|1| @7|1|5|%| 
+@57|1|9|,|0|-|1| @7|1@1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.dump
index aa1634cd326e8d17245aff33b2c32393f37caded..bc806abeb5d3582ed173eb86cc4639adf6f9f00b 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_02.dump
@@ -17,4 +17,4 @@
 @75
 @8|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@55
 @8|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|a+0#00e0003&|b|s|t|r|a|c|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@7
-@57|3|7|,|9| @9|3|6|%| 
+@57|3|7|,|9| @9|2|7|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.dump
index a5edeb94121e7779e6a8d7a4bcc5dd4e5ae0934f..fe1c726be3214b87b65727836c53e7bcd0e28acf 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_03.dump
@@ -17,4 +17,4 @@
 @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&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|9@1|_|(|)| +0#0000000&@5
 @8|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @50
-@57|5@1|,|9| @9|5|7|%| 
+@57|5@1|,|9| @9|4|3|%| 

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 25d651bed3fa09d99d824ec3501a2e1ccd196f85..ae5279f504f81a4be779fb160ec90964fd56e5b9 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_04.dump
@@ -17,4 +17,4 @@
 |}| @73
 @75
 |e+0#00e0003&|n|u|m| +0#0000000&|E|8|$| @66
-@57|7|3|,|9| @9|7@1|%| 
+@57|7|3|,|9| @9|5|8|%| 

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 97f2ea2f016adc8f8406bf1c990e2a8eb6109492..edae5c09e004761dc87d8958d00ffb0c906ad14e 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_05.dump
@@ -17,4 +17,4 @@
 @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
 @75
-@57|8|9|,|9| @9|9|7|%| 
+@57|8|9|,|9| @9|7|4|%| 

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 860cc4041a331cb9fdbad73c0313324b41bbdf88..c1a60c9b966b76b222255e360fcc6d6d3b6847ea 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_06.dump
@@ -1,20 +1,20 @@
 | +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
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|1|0|4|,|1| @8|B|o|t| 
+@1| @73
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|C|8|$|A|l|i|a|s|<|T|>| @57
+>{| @73
+@8|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |C|8|$|A|l|i|a|s|(|T| |n|a|m|e|)| |{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @14
+@75
+@1| +0#00e0003&@6|c|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @53
+@8|{| @65
+@16|f+0#00e0003&|i|n|a|l| +0#0000000&|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T|>| |b|u|i|l|d|e|r| |=| @8
+@24|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<|T|>|b|u|i|l|d|e|r|(|)|;| @13
+@75
+@16|C|8|$|A|l|i|a|s|<|T|>|.|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| @30
+@16|{| @57
+@24|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @32
+@24|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @38
+@16|}| @57
+@75
+@57|1|0|7|,|1| @8|9|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_indent8_signature_07.dump b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_07.dump
new file mode 100644 (file)
index 0000000..c4f82d6
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_indent8_signature_07.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+@16|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T|>| |b|u|i|l|d|(|)| @24
+@16|{| @57
+@24|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<|T|>|b|u|i|l|d|(|)|;| @24
+@16|}| @57
+@8>}| @65
+@75
+@8|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|A|>| |C|8|$|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b+0#00e0e07&|u|i|l|d|e|r|(|A+0#0000000&| |n|a|m|e|)+0#00e0e07&| +0#0000000&@20
+@8|{| @65
+@16|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|C|8|$|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @16
+@8|}| @65
+|}| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|2|5|,|9| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_01.dump b/runtime/syntax/testdir/dumps/java_methods_style_01.dump
index 0e350382fc9d4f89719c7c3e7e95df4baacb63d0..6ac54c6274359d573d5169e3891cacddcf881d17 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_01.dump
@@ -17,4 +17,4 @@
 | +0#00e0e07&@7|T|ɐ|g@1|a|b|l|ɘ|[|]| |v|a|l|u|e|(|)|;+0#0000000&| @47
 @4|}| @69
 @75
-@57|1|9|,|0|-|1| @7|1|8|%| 
+@57|1|9|,|0|-|1| @7|1|3|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_02.dump b/runtime/syntax/testdir/dumps/java_methods_style_02.dump
index bcbd5b5c2e0ae976e8746b6369878c59000a247f..6bbadee20dba607c2d0eb8eab17cc41601a4faf6 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_02.dump
@@ -17,4 +17,4 @@
 @75
 @4|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@59
 | +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#00e0003&|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
-@57|3|7|,|2|-|5| @7|4|3|%| 
+@57|3|7|,|2|-|5| @7|3|1|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_03.dump b/runtime/syntax/testdir/dumps/java_methods_style_03.dump
index c47f958a9378999a80eee564ee559f6d0b360e09..3b37c80959b26ea0d44c81bffb6551583c399e3b 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_03.dump
@@ -17,4 +17,4 @@
 @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&|v+0#00e0003&|o|i|d| +0#00e0e07&|a|s|c|i@1|$|9@1|_|(|)| +0#0000000&@9
 @4|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
-@57|5@1|,|2|-|5| @7|6|9|%| 
+@57|5@1|,|2|-|5| @7|5|0|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_04.dump b/runtime/syntax/testdir/dumps/java_methods_style_04.dump
index e291225a797af746e4d2ebf1a284ebd66d0defd2..f0567896fb85f1c86eacb3a675c4e3847da3300e 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_04.dump
@@ -17,4 +17,4 @@
 @8|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|)| @33
 @12|.|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|;| @3
 @4|}| @69
-@57|7|3|,|2|-|5| @7|9|4|%| 
+@57|7|3|,|2|-|5| @7|6|8|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_05.dump b/runtime/syntax/testdir/dumps/java_methods_style_05.dump
index 09242dcfa3302cb5d16cb9daa27ccd86d36e7dcb..84944f5bbbd63a30814a036e8595a4cffbb081d5 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_05.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_05.dump
@@ -2,19 +2,19 @@
 @75
 @4|@+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&@35
 | +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&|{| |r+0#af5f00255&|e|t|u|r|n| +0#0000000&|(|S|t|r|i|n|g|)| |"+0#e000002&|S|t|y|l|e|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @5
->}| @73
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|9|0|,|1| @9|B|o|t| 
+|}| @73
+> @74
+|c+0#00e0003&|l|a|s@1| +0#0000000&|S+0#00e0e07&|t|y|l|e|A|l|i|a|s|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&@55
+|{| @73
+@4|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |S|t|y|l|e|A|l|i|a|s|(|T| |n|a|m|e|)| @3|{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @13
+@75
+@4|c+0#00e0003&|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @57
+@4|{| @69
+@8|f+0#00e0003&|i|n|a|l| +0#0000000&|j+0#00e0e07&|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T+0#0000000&|>+0#00e0e07&| +0#0000000&|b|u|i|l|d|e|r| |=| @16
+@12|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|e|r|(|)|;| @25
+@75
+| +0#00e0e07&@7|S|t|y|l|e|A|l|i|a|s|<|T|>|.|B|u|i|l|d|e|r| |a|d@1|(|T| |x|)| +0#0000000&@36
+@8|{| @65
+@12|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @44
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @50
+@57|9|1|,|0|-|1| @7|8|6|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_06.dump b/runtime/syntax/testdir/dumps/java_methods_style_06.dump
new file mode 100644 (file)
index 0000000..283d16a
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_style_06.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@11|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @50
+@8|}| @65
+@75
+| +0#00e0e07&@7|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T|>| |b|u|i|l|d|(|)| +0#0000000&@32
+@8|{| @65
+@12>r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<+0#00e0003&|T+0#0000000&|>+0#00e0003&|b+0#0000000&|u|i|l|d|(|)|;| @36
+@8|}| @65
+@4|}| @69
+@75
+| +0#00e0e07&@3|s+0#00e0003&|t|a|t|i|c| +0#00e0e07&|<+0#00e0003&|A+0#00e0e07&|>+0#00e0003&| +0#00e0e07&|S|t|y|l|e|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b|u|i|l|d|e|r|(|A| |n|a|m|e|)| +0#0000000&@22
+@4|{| @69
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|S|t|y|l|e|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @22
+@4|}| @69
+|}| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|0|9|,|4|-|1|3| @5|B|o|t| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_01.dump b/runtime/syntax/testdir/dumps/java_methods_style_signature_01.dump
index c7f3e3c0869e4f3bd3a91671c2efc33818b7abe4..dd23dd03edade691cbc1f59bc37fe41792b43bef 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_signature_01.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_01.dump
@@ -17,4 +17,4 @@
 @8|T|ɐ|g@1|a|b|l|ɘ|[|]| |v+0#00e0e07&|a|l|u|e|(|)|;+0#0000000&| @47
 @4|}| @69
 @75
-@57|1|9|,|0|-|1| @7|2|0|%| 
+@57|1|9|,|0|-|1| @7|1|4|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_02.dump b/runtime/syntax/testdir/dumps/java_methods_style_signature_02.dump
index a610f40286d7cdd2009d7b7064febb18709b7de1..525bbee230ee84ade5ccb6804884b7853e545652 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_signature_02.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_02.dump
@@ -17,4 +17,4 @@
 @75
 @4|/+0#0000e05&@1| |M|E|T|H|O|D|S|.| +0#0000000&@59
 @4|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|@+0#e000e06&|T|ɐ|g@1|a|b|l|ɘ| +0#0000000&|a+0#00e0003&|b|s|t|r|a|c|t| +0#0000000&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|0|_|(|/+0#0000e05&@15| +0#0000000&@11
-@57|3|7|,|2|-|5| @7|4|9|%| 
+@57|3|7|,|2|-|5| @7|3|4|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_03.dump b/runtime/syntax/testdir/dumps/java_methods_style_signature_03.dump
index 3b0853cb4409d9f05564a839b45b584f76b6f566..cdc29e0dfeebe9769b66beaf0cdd052e8c947e74 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_signature_03.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_03.dump
@@ -17,4 +17,4 @@
 @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&|v+0#00e0003&|o|i|d| +0#0000000&|a+0#00e0e07&|s|c|i@1|$|9@1|_|(|)| +0#0000000&@9
 @4|{| |a|s|c|i@1|$|9|8|_|(|)|;| |}| @54
-@57|5@1|,|2|-|5| @7|7@1|%| 
+@57|5@1|,|2|-|5| @7|5|4|%| 

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 63ed52e2174765e9c1920384ab4978e0deb92d0b..853524cfaeaaa69ec87d7f683de73bb98ef2b3ca 100644 (file)
--- a/runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_04.dump
@@ -13,8 +13,8 @@
 @4|@+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&@35
 @4|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&|(|S|t|r|i|n|g|)| |"+0#e000002&|S|t|y|l|e|$|M|e|t|h|o|d|s|T|e|s|t|s|"|;+0#0000000&| |}| @4
 |}| @73
-|~+0#4040ff13&| @73
-|~| @73
-|~| @73
-|~| @73
-| +0#0000000&@56|7|3|,|2|-|5| @7|B|o|t| 
+@75
+|c+0#00e0003&|l|a|s@1| +0#0000000&|S|t|y|l|e|$|A|l|i|a|s|<|T|>| @54
+|{| @73
+@4|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |S|t|y|l|e|$|A|l|i|a|s|(|T| |n|a|m|e|)| @2|{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @13
+@57|7|3|,|2|-|5| @7|7|4|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_05.dump b/runtime/syntax/testdir/dumps/java_methods_style_signature_05.dump
new file mode 100644 (file)
index 0000000..59fd037
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_05.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@3|f+0#00e0003&|i|n|a|l| +0#0000000&|T| |n|a|m|e|;| |S|t|y|l|e|$|A|l|i|a|s|(|T| |n|a|m|e|)| @2|{| |t+0#00e0003&|h|i|s|.+0#0000000&|n|a|m|e| |=| |n|a|m|e|;| |}| @13
+@75
+@4|c+0#00e0003&|l|a|s@1| +0#0000000&|B|u|i|l|d|e|r| @57
+@4|{| @69
+@8|f+0#00e0003&|i|n|a|l| +0#0000000&|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|B|u|i|l|d|e|r|<|T|>| |b|u|i|l|d|e|r| |=| @16
+@12>j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|.|<|T|>|b|u|i|l|d|e|r|(|)|;| @25
+@75
+@8|S|t|y|l|e|$|A|l|i|a|s|<|T|>|.|B|u|i|l|d|e|r| |a+0#00e0e07&|d@1|(|T+0#0000000&| |x|)+0#00e0e07&| +0#0000000&@35
+@8|{| @65
+@12|b|u|i|l|d|e|r|.|a|c@1|e|p|t|(|x|)|;| @44
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|t+0#00e0003&|h|i|s|;+0#0000000&| @50
+@8|}| @65
+@75
+@8|j|a|v|a|.|u|t|i|l|.|s|t|r|e|a|m|.|S|t|r|e|a|m|<|T|>| |b+0#00e0e07&|u|i|l|d|(|)| +0#0000000&@32
+@8|{| @65
+@12|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|b|u|i|l|d|e|r|.|<|T|>|b|u|i|l|d|(|)|;| @36
+@8|}| @65
+@4|}| @69
+@75
+@57|9|1|,|4|-|1|3| @6|9|4|%| 

diff --git a/runtime/syntax/testdir/dumps/java_methods_style_signature_06.dump b/runtime/syntax/testdir/dumps/java_methods_style_signature_06.dump
new file mode 100644 (file)
index 0000000..c0eedad
--- /dev/null
+++ b/runtime/syntax/testdir/dumps/java_methods_style_signature_06.dump
@@ -0,0 +1,20 @@
+| +0&#ffffff0@74
+@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|<|A|>| |S|t|y|l|e|$|A|l|i|a|s|<|A|>|.|B|u|i|l|d|e|r| |b+0#00e0e07&|u|i|l|d|e|r|(|A+0#0000000&| |n|a|m|e|)+0#00e0e07&| +0#0000000&@21
+@4|{| @69
+@8|r+0#af5f00255&|e|t|u|r|n| +0#0000000&|n+0#af5f00255&|e|w| +0#0000000&|S|t|y|l|e|$|A|l|i|a|s|<|>|(|n|a|m|e|)|.|n+0#af5f00255&|e|w| +0#0000000&|B|u|i|l|d|e|r|(|)|;| @21
+@4|}| @69
+>}| @73
+|~+0#4040ff13&| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+|~| @73
+| +0#0000000&@56|1|0|9|,|1| @8|B|o|t| 

diff --git a/runtime/syntax/testdir/input/java_methods_indent2.java b/runtime/syntax/testdir/input/java_methods_indent2.java
index 1b2e8632f621af1cd273688e194f245cddb3742d..507bc7333cdb433812c91a7514bf6a08e69ef290 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_indent2.java
+++ b/runtime/syntax/testdir/input/java_methods_indent2.java
@@ -110,3 +110,30 @@ enum E2
 
   @Override public String toString() { return name().toUpperCase(); }
 }
+
+class C2Alias<T>
+{
+  final T name; C2Alias(T name) { this.name = name; }
+
+  class Builder
+  {
+    final java.util.stream.Stream.Builder<T> builder =
+      java.util.stream.Stream.<T>builder();
+
+    C2Alias<T>.Builder add(T x)
+    {
+      builder.accept(x);
+      return this;
+    }
+
+    java.util.stream.Stream<T> build()
+    {
+      return builder.<T>build();
+    }
+  }
+
+  static <A> C2Alias<A>.Builder builder(A name)
+  {
+    return new C2Alias<>(name).new Builder();
+  }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_indent2_signature.java b/runtime/syntax/testdir/input/java_methods_indent2_signature.java
index 8303e23542674e147ab4e679f58cb84f8354868b..2fdc5c294cad9eeb452ba618fa2f01de978f352a 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_indent2_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_indent2_signature.java
@@ -102,3 +102,30 @@ enum E2$
 
   @Override public String toString() { return name().toUpperCase(); }
 }
+
+class C2$Alias<T>
+{
+  final T name; C2$Alias(T name) { this.name = name; }
+
+  class Builder
+  {
+    final java.util.stream.Stream.Builder<T> builder =
+      java.util.stream.Stream.<T>builder();
+
+    C2$Alias<T>.Builder add(T x)
+    {
+      builder.accept(x);
+      return this;
+    }
+
+    java.util.stream.Stream<T> build()
+    {
+      return builder.<T>build();
+    }
+  }
+
+  static <A> C2$Alias<A>.Builder builder(A name)
+  {
+    return new C2$Alias<>(name).new Builder();
+  }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_indent4.java b/runtime/syntax/testdir/input/java_methods_indent4.java
index cc3314976aa68373d2d083f0efd7f08e4590159a..48f13f8f58c1376df3c6f159354d8e73380f40d1 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_indent4.java
+++ b/runtime/syntax/testdir/input/java_methods_indent4.java
@@ -110,3 +110,30 @@ enum E4
 
     @Override public String toString() { return name().toUpperCase(); }
 }
+
+class C4Alias<T>
+{
+    final T name; C4Alias(T name) { this.name = name; }
+
+    class Builder
+    {
+        final java.util.stream.Stream.Builder<T> builder =
+            java.util.stream.Stream.<T>builder();
+
+        C4Alias<T>.Builder add(T x)
+        {
+            builder.accept(x);
+            return this;
+        }
+
+        java.util.stream.Stream<T> build()
+        {
+            return builder.<T>build();
+        }
+    }
+
+    static <A> C4Alias<A>.Builder builder(A name)
+    {
+        return new C4Alias<>(name).new Builder();
+    }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_indent4_signature.java b/runtime/syntax/testdir/input/java_methods_indent4_signature.java
index eace2683d73e4c361947172ca96f9ba3432a963f..ee101d2a37810c5389c372ad3bc29cd459a412a1 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_indent4_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_indent4_signature.java
@@ -102,3 +102,30 @@ enum E4$
 
     @Override public String toString() { return name().toUpperCase(); }
 }
+
+class C4$Alias<T>
+{
+    final T name; C4$Alias(T name) { this.name = name; }
+
+    class Builder
+    {
+        final java.util.stream.Stream.Builder<T> builder =
+            java.util.stream.Stream.<T>builder();
+
+        C4$Alias<T>.Builder add(T x)
+        {
+            builder.accept(x);
+            return this;
+        }
+
+        java.util.stream.Stream<T> build()
+        {
+            return builder.<T>build();
+        }
+    }
+
+    static <A> C4$Alias<A>.Builder builder(A name)
+    {
+        return new C4$Alias<>(name).new Builder();
+    }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_indent8.java b/runtime/syntax/testdir/input/java_methods_indent8.java
index aadf9759e8a6b548e2c11ee0d60362f29aa7de5e..0c672a89482f27e067003e3609f4509a4a1dfbca 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_indent8.java
+++ b/runtime/syntax/testdir/input/java_methods_indent8.java
@@ -110,3 +110,30 @@ enum E8
 
         @Override public String toString() { return name().toUpperCase(); }
 }
+
+class C8Alias<T>
+{
+        final T name; C8Alias(T name) { this.name = name; }
+
+        class Builder
+        {
+                final java.util.stream.Stream.Builder<T> builder =
+                        java.util.stream.Stream.<T>builder();
+
+                C8Alias<T>.Builder add(T x)
+                {
+                        builder.accept(x);
+                        return this;
+                }
+
+                java.util.stream.Stream<T> build()
+                {
+                        return builder.<T>build();
+                }
+        }
+
+        static <A> C8Alias<A>.Builder builder(A name)
+        {
+                return new C8Alias<>(name).new Builder();
+        }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_indent8_signature.java b/runtime/syntax/testdir/input/java_methods_indent8_signature.java
index 677ce5a032bb5c092dda5edd0244fee14be934e5..57c02a42cf93c0e5233ae0522cc223f056e26fc0 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_indent8_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_indent8_signature.java
@@ -102,3 +102,30 @@ enum E8$
 
         @Override public String toString() { return name().toUpperCase(); }
 }
+
+class C8$Alias<T>
+{
+        final T name; C8$Alias(T name) { this.name = name; }
+
+        class Builder
+        {
+                final java.util.stream.Stream.Builder<T> builder =
+                        java.util.stream.Stream.<T>builder();
+
+                C8$Alias<T>.Builder add(T x)
+                {
+                        builder.accept(x);
+                        return this;
+                }
+
+                java.util.stream.Stream<T> build()
+                {
+                        return builder.<T>build();
+                }
+        }
+
+        static <A> C8$Alias<A>.Builder builder(A name)
+        {
+                return new C8$Alias<>(name).new Builder();
+        }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_style.java b/runtime/syntax/testdir/input/java_methods_style.java
index f9a6f5771db7a3b3f83ab6c50c5bc7141ddd46cc..50bfa96ba5d7762f0932ccf4531b8b38e57fc89a 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_style.java
+++ b/runtime/syntax/testdir/input/java_methods_style.java
@@ -88,3 +88,30 @@ abstract class StyleMethodsTests
        @Override @SuppressWarnings("cast")
        public String toString() { return (String) "StyleMethodsTests"; }
 }
+
+class StyleAlias<T>
+{
+       final T name; StyleAlias(T name)        { this.name = name; }
+
+       class Builder
+       {
+               final java.util.stream.Stream.Builder<T> builder =
+                       java.util.stream.Stream.<T>builder();
+
+               StyleAlias<T>.Builder add(T x)
+               {
+                       builder.accept(x);
+                       return this;
+               }
+
+               java.util.stream.Stream<T> build()
+               {
+                       return builder.<T>build();
+               }
+       }
+
+       static <A> StyleAlias<A>.Builder builder(A name)
+       {
+               return new StyleAlias<>(name).new Builder();
+       }
+}

diff --git a/runtime/syntax/testdir/input/java_methods_style_signature.java b/runtime/syntax/testdir/input/java_methods_style_signature.java
index 28a2f8887ca0dd14e54ea9b48b2d3b7c6dfa221e..a0a3d18befe89eb310caa666d894c553369ce084 100644 (file)
--- a/runtime/syntax/testdir/input/java_methods_style_signature.java
+++ b/runtime/syntax/testdir/input/java_methods_style_signature.java
@@ -80,3 +80,30 @@ abstract class Style$MethodsTests
        @Override @SuppressWarnings("cast")
        public String toString() { return (String) "Style$MethodsTests"; }
 }
+
+class Style$Alias<T>
+{
+       final T name; Style$Alias(T name)       { this.name = name; }
+
+       class Builder
+       {
+               final java.util.stream.Stream.Builder<T> builder =
+                       java.util.stream.Stream.<T>builder();
+
+               Style$Alias<T>.Builder add(T x)
+               {
+                       builder.accept(x);
+                       return this;
+               }
+
+               java.util.stream.Stream<T> build()
+               {
+                       return builder.<T>build();
+               }
+       }
+
+       static <A> Style$Alias<A>.Builder builder(A name)
+       {
+               return new Style$Alias<>(name).new Builder();
+       }
+}