From 2944e998f76fd1d5180103f1aa20f312e4dd079b Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 10 Nov 2015 15:43:42 +0300
Subject: [PATCH] Minor: don't trim file content in KotlinTestUtils#doLoadFile

---
 .../resolveConstructorDelegationCalls/classWithGenerics.txt     | 1 +
 .../testData/resolveConstructorDelegationCalls/generics2.txt    | 1 +
 .../testData/resolveConstructorDelegationCalls/generics3.kt     | 1 -
 .../testData/resolveConstructorDelegationCalls/generics3.txt    | 1 +
 .../testData/resolveConstructorDelegationCalls/generics4.txt    | 1 +
 .../testData/resolveConstructorDelegationCalls/generics5.txt    | 1 +
 .../inheritanceWithGeneric.txt                                  | 1 +
 .../innerClassDelegatingPrimary.txt                             | 1 +
 .../innerClassDelegatingSecondary.txt                           | 1 +
 .../resolveConstructorDelegationCalls/superAnyEmpty.txt         | 1 +
 .../resolveConstructorDelegationCalls/superAnyImplicit.txt      | 1 +
 .../testData/resolveConstructorDelegationCalls/superPrimary.txt | 1 +
 .../resolveConstructorDelegationCalls/superPrimaryEmpty.txt     | 1 +
 .../resolveConstructorDelegationCalls/superPrimaryImplicit.txt  | 1 +
 .../resolveConstructorDelegationCalls/superSecondary.txt        | 1 +
 .../superSecondaryImplicit.txt                                  | 1 +
 .../superSecondaryOverload.txt                                  | 1 +
 .../testData/resolveConstructorDelegationCalls/thisPrimary.txt  | 1 +
 .../resolveConstructorDelegationCalls/thisPrimaryEmpty.txt      | 1 +
 .../resolveConstructorDelegationCalls/thisSecondary.txt         | 1 +
 .../resolveConstructorDelegationCalls/thisSecondaryOverload.txt | 1 +
 compiler/testData/resolveConstructorDelegationCalls/varargs.txt | 1 +
 .../dynamic/explicitReceiverIsDispatchReceiver.txt              | 1 +
 .../dynamic/explicitReceiverIsExtensionReceiver.txt             | 1 +
 .../dynamic/hasBothDispatchAndExtensionReceivers.txt            | 1 +
 ...BothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt | 1 +
 .../dynamic/implicitReceiverIsDispatchReceiver.txt              | 1 +
 .../dynamic/implicitReceiverIsExtensionReceiver.txt             | 1 +
 .../resolvedCalls/explicitReceiverIsDispatchReceiver.txt        | 1 +
 .../resolvedCalls/explicitReceiverIsExtensionReceiver.txt       | 1 +
 .../functionTypes/invokeForExtensionFunctionType.txt            | 1 +
 .../resolvedCalls/functionTypes/invokeForFunctionType.txt       | 1 +
 .../resolvedCalls/functionTypes/valOfExtensionFunctionType.txt  | 1 +
 .../functionTypes/valOfExtensionFunctionTypeInvoke.txt          | 1 +
 .../resolvedCalls/hasBothDispatchAndExtensionReceivers.txt      | 1 +
 ...BothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt | 1 +
 .../resolvedCalls/implicitReceiverIsDispatchReceiver.txt        | 1 +
 .../resolvedCalls/implicitReceiverIsExtensionReceiver.txt       | 1 +
 compiler/testData/resolvedCalls/invoke/bothReceivers.txt        | 1 +
 .../invoke/dispatchReceiverAsReceiverForInvoke.txt              | 1 +
 .../invoke/extensionReceiverAsReceiverForInvoke.txt             | 1 +
 .../testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt | 1 +
 .../resolvedCalls/objectsAndClassObjects/classObject.kt         | 2 --
 .../resolvedCalls/objectsAndClassObjects/classObject.txt        | 1 +
 .../testData/resolvedCalls/objectsAndClassObjects/object.kt     | 2 --
 .../testData/resolvedCalls/objectsAndClassObjects/object.txt    | 1 +
 .../resolvedCalls/realExamples/stringPlusInBuilders.txt         | 1 +
 .../testData/resolvedCalls/resolve/mostSpecificWithLambda.txt   | 1 +
 .../resolvedCalls/secondaryConstructors/classWithGenerics.txt   | 1 +
 .../resolvedCalls/secondaryConstructors/classWithGenerics3.txt  | 1 +
 .../resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt | 1 +
 .../secondaryConstructors/explicitPrimaryCallSecondary.txt      | 1 +
 .../secondaryConstructors/explicitPrimaryNoArgs.txt             | 1 +
 .../resolvedCalls/secondaryConstructors/implicitPrimary.txt     | 1 +
 .../testData/resolvedCalls/secondaryConstructors/overload1.txt  | 1 +
 .../testData/resolvedCalls/secondaryConstructors/overload2.txt  | 1 +
 .../testData/resolvedCalls/secondaryConstructors/overload3.txt  | 1 +
 .../resolvedCalls/secondaryConstructors/overloadDefault.txt     | 1 +
 .../resolvedCalls/secondaryConstructors/overloadNamed.txt       | 1 +
 .../testData/resolvedCalls/secondaryConstructors/simple.txt     | 1 +
 compiler/testData/resolvedCalls/simpleCall.txt                  | 1 +
 compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt     | 1 +
 compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java   | 2 +-
 63 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/compiler/testData/resolveConstructorDelegationCalls/classWithGenerics.txt b/compiler/testData/resolveConstructorDelegationCalls/classWithGenerics.txt
index 129973684b5..2e4aa09c4c0 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/classWithGenerics.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/classWithGenerics.txt
@@ -4,6 +4,7 @@ class A<T> {
 }
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor A<T>(x: T) defined in A
diff --git a/compiler/testData/resolveConstructorDelegationCalls/generics2.txt b/compiler/testData/resolveConstructorDelegationCalls/generics2.txt
index bd26e196909..bc3926bacc4 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/generics2.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/generics2.txt
@@ -5,6 +5,7 @@ class A<T1, T2> {
 }
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor A<T1, T2>(x: T1, y: Int) defined in A
diff --git a/compiler/testData/resolveConstructorDelegationCalls/generics3.kt b/compiler/testData/resolveConstructorDelegationCalls/generics3.kt
index 8f55effa83b..0f99fcf33c0 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/generics3.kt
+++ b/compiler/testData/resolveConstructorDelegationCalls/generics3.kt
@@ -3,4 +3,3 @@ open class B<R1, R2>(x: R1, y: R2)
 class A<T1, T2> : B<T1, Int> {
     <caret>constructor(x: T1, y: Int): super(x, y) {}
 }
-
diff --git a/compiler/testData/resolveConstructorDelegationCalls/generics3.txt b/compiler/testData/resolveConstructorDelegationCalls/generics3.txt
index 37a05dd794e..9c830a0f7fb 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/generics3.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/generics3.txt
@@ -5,6 +5,7 @@ class A<T1, T2> : B<T1, Int> {
 }
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor B<R1, R2>(x: R1, y: R2) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/generics4.txt b/compiler/testData/resolveConstructorDelegationCalls/generics4.txt
index 2876d081ba6..a4cf7456098 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/generics4.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/generics4.txt
@@ -9,6 +9,7 @@ class A<T1, T2 : T1> : B<T1, T2> {
 }
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor B<X, Y : X>(x: X, y: Y) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/generics5.txt b/compiler/testData/resolveConstructorDelegationCalls/generics5.txt
index 5fd1ed1d7ec..28d32d003a4 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/generics5.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/generics5.txt
@@ -9,6 +9,7 @@ class A<T1, T2 : T1> : B<T1, T2> {
 }
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor B<X, Y : X>(x: X, s: String) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/inheritanceWithGeneric.txt b/compiler/testData/resolveConstructorDelegationCalls/inheritanceWithGeneric.txt
index ec94411618b..b1a623ef323 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/inheritanceWithGeneric.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/inheritanceWithGeneric.txt
@@ -7,6 +7,7 @@ class A : B<Int> {
 }
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor B<T>(x: T = ...) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingPrimary.txt b/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingPrimary.txt
index df805361ac2..6c6c2045e38 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingPrimary.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingPrimary.txt
@@ -5,6 +5,7 @@ class A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B(arg: String) defined in A.B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingSecondary.txt b/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingSecondary.txt
index 2619d2012b1..96be52748d7 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingSecondary.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/innerClassDelegatingSecondary.txt
@@ -6,6 +6,7 @@ class A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B(x: String) defined in A.B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superAnyEmpty.txt b/compiler/testData/resolveConstructorDelegationCalls/superAnyEmpty.txt
index 5f5218f1681..28e91156394 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superAnyEmpty.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superAnyEmpty.txt
@@ -3,6 +3,7 @@ class A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor Any() defined in kotlin.Any
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superAnyImplicit.txt b/compiler/testData/resolveConstructorDelegationCalls/superAnyImplicit.txt
index 438c9402bde..2bab01db56e 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superAnyImplicit.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superAnyImplicit.txt
@@ -3,6 +3,7 @@ class A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor Any() defined in kotlin.Any
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superPrimary.txt b/compiler/testData/resolveConstructorDelegationCalls/superPrimary.txt
index 1ffdf1c42c5..a008529c07a 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superPrimary.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superPrimary.txt
@@ -5,6 +5,7 @@ class A : B, C {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B(x: Int) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superPrimaryEmpty.txt b/compiler/testData/resolveConstructorDelegationCalls/superPrimaryEmpty.txt
index 388b9244457..86cc1a85c7c 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superPrimaryEmpty.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superPrimaryEmpty.txt
@@ -5,6 +5,7 @@ class A : B, C {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B() defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superPrimaryImplicit.txt b/compiler/testData/resolveConstructorDelegationCalls/superPrimaryImplicit.txt
index cbda5bb38ad..d7650ef3c3b 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superPrimaryImplicit.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superPrimaryImplicit.txt
@@ -5,6 +5,7 @@ class A : B, C {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B() defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superSecondary.txt b/compiler/testData/resolveConstructorDelegationCalls/superSecondary.txt
index 1aeba0d9b4c..8a35c5944b5 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superSecondary.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superSecondary.txt
@@ -7,6 +7,7 @@ class A : B, C {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B(x: Int) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superSecondaryImplicit.txt b/compiler/testData/resolveConstructorDelegationCalls/superSecondaryImplicit.txt
index 5b0fd6f3236..f7ba775f737 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superSecondaryImplicit.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superSecondaryImplicit.txt
@@ -7,6 +7,7 @@ class A : B, C {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B() defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/superSecondaryOverload.txt b/compiler/testData/resolveConstructorDelegationCalls/superSecondaryOverload.txt
index 0bea777662f..e570d0ae324 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/superSecondaryOverload.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/superSecondaryOverload.txt
@@ -8,6 +8,7 @@ class A : B, C {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B(x: String) defined in B
diff --git a/compiler/testData/resolveConstructorDelegationCalls/thisPrimary.txt b/compiler/testData/resolveConstructorDelegationCalls/thisPrimary.txt
index aa973281902..a3d222e270e 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/thisPrimary.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/thisPrimary.txt
@@ -3,6 +3,7 @@ class A(x: Int) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Int) defined in A
diff --git a/compiler/testData/resolveConstructorDelegationCalls/thisPrimaryEmpty.txt b/compiler/testData/resolveConstructorDelegationCalls/thisPrimaryEmpty.txt
index d7f16da2a34..4c34b25f25a 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/thisPrimaryEmpty.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/thisPrimaryEmpty.txt
@@ -3,4 +3,5 @@ class A() {
 }
 
 
+
 null
diff --git a/compiler/testData/resolveConstructorDelegationCalls/thisSecondary.txt b/compiler/testData/resolveConstructorDelegationCalls/thisSecondary.txt
index 2d1f9f4bb99..d55d121b32f 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/thisSecondary.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/thisSecondary.txt
@@ -4,6 +4,7 @@ class A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Int) defined in A
diff --git a/compiler/testData/resolveConstructorDelegationCalls/thisSecondaryOverload.txt b/compiler/testData/resolveConstructorDelegationCalls/thisSecondaryOverload.txt
index 9fc228c15a4..53d5f29b0bb 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/thisSecondaryOverload.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/thisSecondaryOverload.txt
@@ -5,6 +5,7 @@ class A(x: Double) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: String) defined in A
diff --git a/compiler/testData/resolveConstructorDelegationCalls/varargs.txt b/compiler/testData/resolveConstructorDelegationCalls/varargs.txt
index c8c322dde0a..c382ed98f08 100644
--- a/compiler/testData/resolveConstructorDelegationCalls/varargs.txt
+++ b/compiler/testData/resolveConstructorDelegationCalls/varargs.txt
@@ -7,6 +7,7 @@ class A : B {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor B(vararg x: Int) defined in B
diff --git a/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsDispatchReceiver.txt b/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsDispatchReceiver.txt
index 6cac7721f52..0910e990c41 100644
--- a/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsDispatchReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsDispatchReceiver.txt
@@ -3,6 +3,7 @@ fun bar(a: dynamic ) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun foo(): dynamic defined in bar
diff --git a/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt b/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt
index 0b4869bf6a4..17e222edc57 100644
--- a/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/explicitReceiverIsExtensionReceiver.txt
@@ -5,6 +5,7 @@ fun bar(a: dynamic) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun dynamic.foo(): Unit defined in root package
diff --git a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt
index 14a46df61dd..780095acccb 100644
--- a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt
+++ b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceivers.txt
@@ -9,6 +9,7 @@ fun bar(a: A, b: dynamic) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun dynamic.foo(): Unit defined in A
diff --git a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
index 6894c7bf701..d7d24928d83 100644
--- a/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
@@ -11,6 +11,7 @@ fun bar(a: A, b: dynamic) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun dynamic.foo(): Unit defined in A
diff --git a/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsDispatchReceiver.txt b/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsDispatchReceiver.txt
index 105c378ab38..578d82819e2 100644
--- a/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsDispatchReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsDispatchReceiver.txt
@@ -3,6 +3,7 @@ fun dynamic.bar() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun foo(): dynamic defined in bar
diff --git a/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt b/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt
index 458f974a8a6..2114195c710 100644
--- a/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt
+++ b/compiler/testData/resolvedCalls/dynamic/implicitReceiverIsExtensionReceiver.txt
@@ -5,6 +5,7 @@ fun dynamic.bar() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun dynamic.foo(): Unit defined in root package
diff --git a/compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.txt b/compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.txt
index a9a8477c6e4..076b9c05354 100644
--- a/compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.txt
+++ b/compiler/testData/resolvedCalls/explicitReceiverIsDispatchReceiver.txt
@@ -7,6 +7,7 @@ fun bar(a: A) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun foo(): Unit defined in A
diff --git a/compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.txt b/compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.txt
index 6f31e6e3a57..f153938862e 100644
--- a/compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.txt
+++ b/compiler/testData/resolvedCalls/explicitReceiverIsExtensionReceiver.txt
@@ -7,6 +7,7 @@ fun bar(a: A) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun A.foo(): Unit defined in root package
diff --git a/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt
index 7e674b88d4f..a95394fb538 100644
--- a/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt
+++ b/compiler/testData/resolvedCalls/functionTypes/invokeForExtensionFunctionType.txt
@@ -3,6 +3,7 @@ fun bar(f: Int.()->Unit) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: operator fun Int.invoke(): Unit defined in kotlin.Function1
diff --git a/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt
index dc8aed5fbba..23b128ef4fa 100644
--- a/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt
+++ b/compiler/testData/resolvedCalls/functionTypes/invokeForFunctionType.txt
@@ -3,6 +3,7 @@ fun bar(f: ()->Unit) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: operator fun invoke(): Unit defined in kotlin.Function0
diff --git a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt
index 596c3e9269d..410907fd29c 100644
--- a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt
+++ b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionType.txt
@@ -7,6 +7,7 @@ interface A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: val foo: Int.() -> Unit defined in A
diff --git a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt
index 4a69489b320..37cb35e51f2 100644
--- a/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt
+++ b/compiler/testData/resolvedCalls/functionTypes/valOfExtensionFunctionTypeInvoke.txt
@@ -7,6 +7,7 @@ interface A {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: operator fun Int.invoke(): Unit defined in kotlin.Function1
diff --git a/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.txt b/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.txt
index 7284936dd93..6a0c2709af3 100644
--- a/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.txt
+++ b/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceivers.txt
@@ -11,6 +11,7 @@ fun bar(a: A, b: B) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun B.foo(): Unit defined in A
diff --git a/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt b/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
index 120feb28091..a86b6dc7293 100644
--- a/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
+++ b/compiler/testData/resolvedCalls/hasBothDispatchAndExtensionReceiversWithoutExplicitReceiver.txt
@@ -13,6 +13,7 @@ fun bar(a: A, b: B) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun B.foo(): Unit defined in A
diff --git a/compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.txt b/compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.txt
index 011f0359a29..68aa1d6f604 100644
--- a/compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.txt
+++ b/compiler/testData/resolvedCalls/implicitReceiverIsDispatchReceiver.txt
@@ -7,6 +7,7 @@ fun A.bar() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun foo(): Unit defined in A
diff --git a/compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.txt b/compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.txt
index 122b90fd02d..6f8638777be 100644
--- a/compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.txt
+++ b/compiler/testData/resolvedCalls/implicitReceiverIsExtensionReceiver.txt
@@ -7,6 +7,7 @@ fun A.bar() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun A.foo(): Unit defined in root package
diff --git a/compiler/testData/resolvedCalls/invoke/bothReceivers.txt b/compiler/testData/resolvedCalls/invoke/bothReceivers.txt
index ca3bc7ba62b..08ffec68176 100644
--- a/compiler/testData/resolvedCalls/invoke/bothReceivers.txt
+++ b/compiler/testData/resolvedCalls/invoke/bothReceivers.txt
@@ -7,6 +7,7 @@ fun bar(f: Foo) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun Int.invoke(): Unit defined in Foo
diff --git a/compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.txt
index 93ae01e0d9b..291147201d8 100644
--- a/compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.txt
+++ b/compiler/testData/resolvedCalls/invoke/dispatchReceiverAsReceiverForInvoke.txt
@@ -7,6 +7,7 @@ fun bar(f: Foo) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun invoke(): Unit defined in Foo
diff --git a/compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.txt
index 6ced1d44ff3..f82600d02b1 100644
--- a/compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.txt
+++ b/compiler/testData/resolvedCalls/invoke/extensionReceiverAsReceiverForInvoke.txt
@@ -6,6 +6,7 @@ fun bar(f: Foo) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun Foo.invoke(): Unit defined in root package
diff --git a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt
index 323a7c3e023..93fe2fb97fe 100644
--- a/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt
+++ b/compiler/testData/resolvedCalls/invoke/implicitReceiverForInvoke.txt
@@ -5,6 +5,7 @@ fun bar(f: Int.() -> Unit, i: Int) {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: operator fun Int.invoke(): Unit defined in kotlin.Function1
diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt
index 2e3dfd511f0..f790a3ad3d8 100644
--- a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt
+++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.kt
@@ -7,5 +7,3 @@ class Foo {
 fun test() {
     Foo.<caret>baz
 }
-
-
diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt
index 6e14e89573c..dc8e8a8523f 100644
--- a/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt
+++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/classObject.txt
@@ -9,6 +9,7 @@ fun test() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: val baz: Foo defined in Foo.Companion
diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt b/compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt
index fbae155c49c..fe0ed22e3cd 100644
--- a/compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt
+++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/object.kt
@@ -5,5 +5,3 @@ object Foo {
 fun test() {
     Foo.<caret>baz
 }
-
-
diff --git a/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt b/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt
index ca658c4872a..e1e51d47078 100644
--- a/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt
+++ b/compiler/testData/resolvedCalls/objectsAndClassObjects/object.txt
@@ -7,6 +7,7 @@ fun test() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: val baz: Int defined in Foo
diff --git a/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt b/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt
index e72bd4bf941..bdfc870eb63 100644
--- a/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt
+++ b/compiler/testData/resolvedCalls/realExamples/stringPlusInBuilders.txt
@@ -39,6 +39,7 @@ fun result() =
 val fail: Nothing get() = throw Exception()
 
 
+
 Resolved call:
 
 Resulting descriptor: fun String.plus(): Unit defined in Title
diff --git a/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt b/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt
index ed5cca2c111..a4e5bcafb41 100644
--- a/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt
+++ b/compiler/testData/resolvedCalls/resolve/mostSpecificWithLambda.txt
@@ -6,6 +6,7 @@ fun bar(a: Any) = a
 fun <T> bar(f: () -> T): T = f()
 
 
+
 Resolved call:
 
 Candidate descriptor: fun <T> bar(f: () -> T): T defined in root package
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics.txt b/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics.txt
index b57d7c631a5..f6370113028 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics.txt
@@ -5,6 +5,7 @@ class A<T> {
 val y = <caret>A(1)
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor A<T>(x: T) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics3.txt b/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics3.txt
index 4ef699d24d7..6054eef13dd 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics3.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/classWithGenerics3.txt
@@ -6,6 +6,7 @@ class B<R> {
 val y8: B<String> = <caret>B("")
 
 
+
 Resolved call:
 
 Candidate descriptor: constructor B<R>(x: String) defined in B
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt
index b6acc3b6866..f4612a65a4e 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryArgs.txt
@@ -10,6 +10,7 @@ class A(x: Double) {
 val v = <caret>A(1.0)
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Double) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt
index c358618204d..1f47c4cd725 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryCallSecondary.txt
@@ -10,6 +10,7 @@ class A(x: Double) {
 val v = <caret>A("abc")
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: String) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt
index 2c642dc93fc..8f221199297 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/explicitPrimaryNoArgs.txt
@@ -10,6 +10,7 @@ class A() {
 val v = <caret>A()
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A() defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt b/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt
index e74736878be..9627d353aa7 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/implicitPrimary.txt
@@ -3,6 +3,7 @@ class A
 val v = <caret>A()
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A() defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt
index 163b727f931..c7c12146e5f 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload1.txt
@@ -10,6 +10,7 @@ class A {
 val v = <caret>A("abc")
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: String) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt
index 3fbbe42311b..b00037f6b24 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload2.txt
@@ -10,6 +10,7 @@ class A {
 val v = <caret>A(1)
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Int) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt
index ed35b5327c1..c4e17b2ce1a 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overload3.txt
@@ -10,6 +10,7 @@ class A {
 val v = <caret>A(1, "abc")
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Int, y: String) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt
index a4d6ff4517a..fc620eb7f6f 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overloadDefault.txt
@@ -10,6 +10,7 @@ class A {
 val v = <caret>A(1.0)
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Double, y: String = ...) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt b/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt
index 96b9457a86d..47b09b2b388 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/overloadNamed.txt
@@ -10,6 +10,7 @@ class A {
 val v = <caret>A(x=1.0)
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Double, y: String = ...) defined in A
diff --git a/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt b/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt
index 43e62d9f828..ff225591491 100644
--- a/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt
+++ b/compiler/testData/resolvedCalls/secondaryConstructors/simple.txt
@@ -7,6 +7,7 @@ class A {
 val v = <caret>A(1)
 
 
+
 Resolved call:
 
 Resulting descriptor: constructor A(x: Int) defined in A
diff --git a/compiler/testData/resolvedCalls/simpleCall.txt b/compiler/testData/resolvedCalls/simpleCall.txt
index e84726a7f90..fb88000c15c 100644
--- a/compiler/testData/resolvedCalls/simpleCall.txt
+++ b/compiler/testData/resolvedCalls/simpleCall.txt
@@ -5,6 +5,7 @@ fun bar() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: fun foo(): Unit defined in root package
diff --git a/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt b/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt
index 34d05a81475..608c7940153 100644
--- a/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt
+++ b/compiler/testData/resolvedCalls/thisOrSuper/simpleSuper.txt
@@ -9,6 +9,7 @@ class B: A() {
 }
 
 
+
 Resolved call:
 
 Resulting descriptor: Class{B}::this
diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
index 72d87d852c5..68b11c97bc4 100644
--- a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
@@ -409,7 +409,7 @@ public class KotlinTestUtils {
     }
 
     public static String doLoadFile(@NotNull File file) throws IOException {
-        return FileUtil.loadFile(file, CharsetToolkit.UTF8, true).trim();
+        return FileUtil.loadFile(file, CharsetToolkit.UTF8, true);
     }
 
     public static String getFilePath(File file) {