Minor: don't trim file content in KotlinTestUtils#doLoadFile

This commit is contained in:
Zalim Bashorov
2015-11-10 15:43:42 +03:00
parent 28366a0bf4
commit 2944e998f7
63 changed files with 60 additions and 6 deletions
@@ -4,6 +4,7 @@ class A<T> {
}
Resolved call:
Candidate descriptor: constructor A<T>(x: T) defined in A
@@ -5,6 +5,7 @@ class A<T1, T2> {
}
Resolved call:
Candidate descriptor: constructor A<T1, T2>(x: T1, y: Int) defined in A
@@ -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) {}
}
@@ -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
@@ -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
@@ -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
@@ -7,6 +7,7 @@ class A : B<Int> {
}
Resolved call:
Candidate descriptor: constructor B<T>(x: T = ...) defined in B
@@ -5,6 +5,7 @@ class A {
}
Resolved call:
Resulting descriptor: constructor B(arg: String) defined in A.B
@@ -6,6 +6,7 @@ class A {
}
Resolved call:
Resulting descriptor: constructor B(x: String) defined in A.B
@@ -3,6 +3,7 @@ class A {
}
Resolved call:
Resulting descriptor: constructor Any() defined in kotlin.Any
@@ -3,6 +3,7 @@ class A {
}
Resolved call:
Resulting descriptor: constructor Any() defined in kotlin.Any
@@ -5,6 +5,7 @@ class A : B, C {
}
Resolved call:
Resulting descriptor: constructor B(x: Int) defined in B
@@ -5,6 +5,7 @@ class A : B, C {
}
Resolved call:
Resulting descriptor: constructor B() defined in B
@@ -5,6 +5,7 @@ class A : B, C {
}
Resolved call:
Resulting descriptor: constructor B() defined in B
@@ -7,6 +7,7 @@ class A : B, C {
}
Resolved call:
Resulting descriptor: constructor B(x: Int) defined in B
@@ -7,6 +7,7 @@ class A : B, C {
}
Resolved call:
Resulting descriptor: constructor B() defined in B
@@ -8,6 +8,7 @@ class A : B, C {
}
Resolved call:
Resulting descriptor: constructor B(x: String) defined in B
@@ -3,6 +3,7 @@ class A(x: Int) {
}
Resolved call:
Resulting descriptor: constructor A(x: Int) defined in A
@@ -3,4 +3,5 @@ class A() {
}
null
@@ -4,6 +4,7 @@ class A {
}
Resolved call:
Resulting descriptor: constructor A(x: Int) defined in A
@@ -5,6 +5,7 @@ class A(x: Double) {
}
Resolved call:
Resulting descriptor: constructor A(x: String) defined in A
@@ -7,6 +7,7 @@ class A : B {
}
Resolved call:
Resulting descriptor: constructor B(vararg x: Int) defined in B
@@ -3,6 +3,7 @@ fun bar(a: dynamic ) {
}
Resolved call:
Resulting descriptor: fun foo(): dynamic defined in bar
@@ -5,6 +5,7 @@ fun bar(a: dynamic) {
}
Resolved call:
Resulting descriptor: fun dynamic.foo(): Unit defined in root package
@@ -9,6 +9,7 @@ fun bar(a: A, b: dynamic) {
}
Resolved call:
Resulting descriptor: fun dynamic.foo(): Unit defined in A
@@ -11,6 +11,7 @@ fun bar(a: A, b: dynamic) {
}
Resolved call:
Resulting descriptor: fun dynamic.foo(): Unit defined in A
@@ -3,6 +3,7 @@ fun dynamic.bar() {
}
Resolved call:
Resulting descriptor: fun foo(): dynamic defined in bar
@@ -5,6 +5,7 @@ fun dynamic.bar() {
}
Resolved call:
Resulting descriptor: fun dynamic.foo(): Unit defined in root package
@@ -7,6 +7,7 @@ fun bar(a: A) {
}
Resolved call:
Resulting descriptor: fun foo(): Unit defined in A
@@ -7,6 +7,7 @@ fun bar(a: A) {
}
Resolved call:
Resulting descriptor: fun A.foo(): Unit defined in root package
@@ -3,6 +3,7 @@ fun bar(f: Int.()->Unit) {
}
Resolved call:
Resulting descriptor: operator fun Int.invoke(): Unit defined in kotlin.Function1
@@ -3,6 +3,7 @@ fun bar(f: ()->Unit) {
}
Resolved call:
Resulting descriptor: operator fun invoke(): Unit defined in kotlin.Function0
@@ -7,6 +7,7 @@ interface A {
}
Resolved call:
Resulting descriptor: val foo: Int.() -> Unit defined in A
@@ -7,6 +7,7 @@ interface A {
}
Resolved call:
Resulting descriptor: operator fun Int.invoke(): Unit defined in kotlin.Function1
@@ -11,6 +11,7 @@ fun bar(a: A, b: B) {
}
Resolved call:
Resulting descriptor: fun B.foo(): Unit defined in A
@@ -13,6 +13,7 @@ fun bar(a: A, b: B) {
}
Resolved call:
Resulting descriptor: fun B.foo(): Unit defined in A
@@ -7,6 +7,7 @@ fun A.bar() {
}
Resolved call:
Resulting descriptor: fun foo(): Unit defined in A
@@ -7,6 +7,7 @@ fun A.bar() {
}
Resolved call:
Resulting descriptor: fun A.foo(): Unit defined in root package
@@ -7,6 +7,7 @@ fun bar(f: Foo) {
}
Resolved call:
Resulting descriptor: fun Int.invoke(): Unit defined in Foo
@@ -7,6 +7,7 @@ fun bar(f: Foo) {
}
Resolved call:
Resulting descriptor: fun invoke(): Unit defined in Foo
@@ -6,6 +6,7 @@ fun bar(f: Foo) {
}
Resolved call:
Resulting descriptor: fun Foo.invoke(): Unit defined in root package
@@ -5,6 +5,7 @@ fun bar(f: Int.() -> Unit, i: Int) {
}
Resolved call:
Resulting descriptor: operator fun Int.invoke(): Unit defined in kotlin.Function1
@@ -7,5 +7,3 @@ class Foo {
fun test() {
Foo.<caret>baz
}
@@ -9,6 +9,7 @@ fun test() {
}
Resolved call:
Resulting descriptor: val baz: Foo defined in Foo.Companion
@@ -5,5 +5,3 @@ object Foo {
fun test() {
Foo.<caret>baz
}
@@ -7,6 +7,7 @@ fun test() {
}
Resolved call:
Resulting descriptor: val baz: Int defined in Foo
@@ -39,6 +39,7 @@ fun result() =
val fail: Nothing get() = throw Exception()
Resolved call:
Resulting descriptor: fun String.plus(): Unit defined in Title
@@ -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
@@ -5,6 +5,7 @@ class A<T> {
val y = <caret>A(1)
Resolved call:
Candidate descriptor: constructor A<T>(x: T) defined in A
@@ -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
@@ -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
@@ -10,6 +10,7 @@ class A(x: Double) {
val v = <caret>A("abc")
Resolved call:
Resulting descriptor: constructor A(x: String) defined in A
@@ -10,6 +10,7 @@ class A() {
val v = <caret>A()
Resolved call:
Resulting descriptor: constructor A() defined in A
@@ -3,6 +3,7 @@ class A
val v = <caret>A()
Resolved call:
Resulting descriptor: constructor A() defined in A
@@ -10,6 +10,7 @@ class A {
val v = <caret>A("abc")
Resolved call:
Resulting descriptor: constructor A(x: String) defined in A
@@ -10,6 +10,7 @@ class A {
val v = <caret>A(1)
Resolved call:
Resulting descriptor: constructor A(x: Int) defined in A
@@ -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
@@ -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
@@ -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
@@ -7,6 +7,7 @@ class A {
val v = <caret>A(1)
Resolved call:
Resulting descriptor: constructor A(x: Int) defined in A
+1
View File
@@ -5,6 +5,7 @@ fun bar() {
}
Resolved call:
Resulting descriptor: fun foo(): Unit defined in root package
@@ -9,6 +9,7 @@ class B: A() {
}
Resolved call:
Resulting descriptor: Class{B}::this
@@ -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) {