Updated lazy log tests

compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log

@@ -46,93 +46,96 @@ LazyJavaPackageFragment@10['lang'] {
 
 ResolutionTaskHolder@31 {
     <name not found> = ArrayList@32[1] { ResolutionCandidate@33 }
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@33 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@35 {
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
-    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
-    <name not found> = EmptyList@23[empty]
-    <name not found> = EmptyList@23[empty]
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
     <name not found> = EmptyList@23[empty]
     <name not found> = EmptyList@23[empty]
 }
 
-ResolutionTaskHolder@39 {
-    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
-    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
 }
 
 ResolutionTaskHolder@43 {
     <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
-    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
 
-ResolutionTaskHolder@47 {
-    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
-    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+ResolutionTaskHolder@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
 }
 
-ResolutionTaskHolder@51 {
-    <name not found> = ArrayList@52[1] { ResolutionCandidate@53 }
-    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+ResolutionTaskHolder@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
 }
 
 ResolutionTaskHolder@55 {
     <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
-    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
 
-ResolutionTaskHolder@59 {
-    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
-    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
 }
 
-ResolutionTaskHolder@63 {
-    <name not found> = ArrayList@64[1] { ResolutionCandidate@65 }
-    <name not found> = ArrayList@66[1] { ResolutionCandidate@65 }
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
 }
 
 ResolutionTaskHolder@67 {
     <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
-    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-ResolutionTaskHolder@71 {
-    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
-    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+ResolutionTaskHolder@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
 }
 
-ResolutionTaskHolder@75 {
-    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
-    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+}
+
+ResolutionTaskHolder@76 {
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@78 }
 }
 
 ResolutionTaskHolder@79 {
     <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
-    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
 }
 
-ResolutionTaskHolder@83 {
-    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
-    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
-}
-
-ResolutionTaskHolder@87 {
-    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
-    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
-}
-
-ResolutionTaskHolder@91 {
-    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
-    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
-}
-
-ResolutionTaskHolder@95 {
-    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
-    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+null {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@33 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }

compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log

@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log

@@ -23,20 +23,23 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
 }
 
-ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
+}
+
+null {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@38[7] { ResolutionCandidate@32, ResolutionCandidate@33, ResolutionCandidate@34, ... }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log

@@ -31,5 +31,8 @@ LazyJavaPackageFragment@11['java'] {
 
 ResolutionTaskHolder@27 {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+null {
     <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log

@@ -21,20 +21,23 @@ LazyJavaPackageFragment@7['java'] {
 
 ResolutionTaskHolder@19 {
     <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
-    <name not found> = ArrayList@22[1] { ResolutionCandidate@21 }
 }
 
-ResolutionTaskHolder@23 {
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@25 }
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
 }
 
-ResolutionTaskHolder@27 {
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
 }
 
-ResolutionTaskHolder@31 {
-    <name not found> = ArrayList@32[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
-    <name not found> = ArrayList@36[7] { ResolutionCandidate@33, ResolutionCandidate@34, ResolutionCandidate@35, ... }
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
+}
+
+null {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@27 }
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@21 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@24 }
+    <name not found> = ArrayList@36[7] { ResolutionCandidate@30, ResolutionCandidate@31, ResolutionCandidate@32, ... }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log

@@ -28,5 +28,8 @@ LazyJavaPackageFragment@8['java'] {
 
 ResolutionTaskHolder@24 {
     <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
     <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log

@@ -23,25 +23,28 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
 }
 
-ResolutionTaskHolder@29 {
-    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
-    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
 }
 
 ResolutionTaskHolder@33 {
-    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
-    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@34[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
 }
 
-ResolutionTaskHolder@37 {
-    <name not found> = ArrayList@38[7] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
-    <name not found> = ArrayList@42[7] { ResolutionCandidate@39, ResolutionCandidate@40, ResolutionCandidate@41, ... }
+null {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@23 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@42[7] { ResolutionCandidate@35, ResolutionCandidate@36, ResolutionCandidate@37, ... }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log

@@ -23,5 +23,8 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+}
+
+null {
     <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log

@@ -27,5 +27,8 @@ LazyJavaPackageFragment@6['java'] {
 
 ResolutionTaskHolder@25 {
     <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+}
+
+null {
     <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
 }

compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log

@@ -23,10 +23,13 @@ LazyJavaPackageFragment@5['java'] {
 
 ResolutionTaskHolder@21 {
     <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
-    <name not found> = ArrayList@24[1] { ResolutionCandidate@23 }
 }
 
-ResolutionTaskHolder@25 {
-    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
-    <name not found> = ArrayList@28[1] { ResolutionCandidate@27 }
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+}
+
+null {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@23 }
 }