From 7f7cc02256627d54debb47b6031a6f41162087e0 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 15 Sep 2015 20:38:38 +0300 Subject: [PATCH] Fix deprecations in testData: partial body resolve tests. --- idea/testData/resolve/partialBodyResolve/As.completion | 6 +++--- idea/testData/resolve/partialBodyResolve/As.dump | 6 +++--- idea/testData/resolve/partialBodyResolve/As.kt | 6 +++--- .../testData/resolve/partialBodyResolve/BangBang.completion | 6 +++--- idea/testData/resolve/partialBodyResolve/BangBang.dump | 6 +++--- idea/testData/resolve/partialBodyResolve/BangBang.kt | 6 +++--- idea/testData/resolve/partialBodyResolve/For2.dump | 2 +- idea/testData/resolve/partialBodyResolve/For2.kt | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsError.dump | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsError.kt | 2 +- .../resolve/partialBodyResolve/IfNotIsErrorQualifier.dump | 2 +- .../resolve/partialBodyResolve/IfNotIsErrorQualifier.kt | 2 +- .../testData/resolve/partialBodyResolve/IfNotIsMyError.dump | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt | 2 +- .../resolve/partialBodyResolve/IfNotIsNothingProp.dump | 2 +- .../resolve/partialBodyResolve/IfNotIsNothingProp.kt | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt | 2 +- .../testData/resolve/partialBodyResolve/IfNotIsReturn2.dump | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump | 2 +- idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt | 2 +- idea/testData/resolve/partialBodyResolve/IfReturn.dump | 4 ++-- idea/testData/resolve/partialBodyResolve/IfReturn.kt | 2 +- .../resolve/partialBodyResolve/LambdaReturnsNothing2.dump | 2 +- .../resolve/partialBodyResolve/LambdaReturnsNothing2.kt | 2 +- .../resolve/partialBodyResolve/LocalNothingFun.completion | 2 +- .../resolve/partialBodyResolve/LocalNothingFun.dump | 2 +- idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt | 2 +- idea/testData/resolve/partialBodyResolve/ReturnLambda.dump | 2 +- idea/testData/resolve/partialBodyResolve/ReturnLambda.kt | 2 +- .../resolve/partialBodyResolve/ThisQualifiedAutoCast.dump | 2 +- .../resolve/partialBodyResolve/ThisQualifiedAutoCast.kt | 2 +- 33 files changed, 46 insertions(+), 46 deletions(-) diff --git a/idea/testData/resolve/partialBodyResolve/As.completion b/idea/testData/resolve/partialBodyResolve/As.completion index 42ef4d5d47b..46670d7c572 100644 --- a/idea/testData/resolve/partialBodyResolve/As.completion +++ b/idea/testData/resolve/partialBodyResolve/As.completion @@ -6,14 +6,14 @@ fun foo(p: Any, p1: Any?) { /* STATEMENT DELETED: z(f() as String) */ if (a) { - print((p as String).size) + print((p as String).length()) } else { - print((p as String).length) + print((p as String).get(1)) } if (y()) { - print(p.size) + print(p.charAt(1)) /* STATEMENT DELETED: p1 as String */ } diff --git a/idea/testData/resolve/partialBodyResolve/As.dump b/idea/testData/resolve/partialBodyResolve/As.dump index 024f59c27de..d058ba29737 100644 --- a/idea/testData/resolve/partialBodyResolve/As.dump +++ b/idea/testData/resolve/partialBodyResolve/As.dump @@ -6,14 +6,14 @@ fun foo(p: Any, p1: Any?) { /* STATEMENT DELETED: z(f() as String) */ if (a) { - print((p as String).size) + print((p as String).length()) } else { - print((p as String).length) + print((p as String).get(1)) } if (y()) { - print(p.size) + print(p.charAt(1)) /* STATEMENT DELETED: p1 as String */ } diff --git a/idea/testData/resolve/partialBodyResolve/As.kt b/idea/testData/resolve/partialBodyResolve/As.kt index ae648332743..79f96025b6c 100644 --- a/idea/testData/resolve/partialBodyResolve/As.kt +++ b/idea/testData/resolve/partialBodyResolve/As.kt @@ -4,14 +4,14 @@ fun foo(p: Any, p1: Any?) { z(f() as String) if (a) { - print((p as String).size) + print((p as String).length()) } else { - print((p as String).length) + print((p as String).get(1)) } if (y()) { - print(p.size) + print(p.charAt(1)) p1 as String } diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.completion b/idea/testData/resolve/partialBodyResolve/BangBang.completion index 0cb2ad517aa..6ed2f602fd2 100644 --- a/idea/testData/resolve/partialBodyResolve/BangBang.completion +++ b/idea/testData/resolve/partialBodyResolve/BangBang.completion @@ -5,14 +5,14 @@ fun foo(p: String?, p1: Any?) { /* STATEMENT DELETED: y(f()!!) */ if (a) { - print(p!!.size) + print(p!!.length()) } else { - print(p!!.length) + print(p!!.get(1)) } if (y()) { - print(p.size) + print(p.charAt(1)) /* STATEMENT DELETED: p1!! */ } diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.dump b/idea/testData/resolve/partialBodyResolve/BangBang.dump index f2f5d0e4b53..c09b141a4b5 100644 --- a/idea/testData/resolve/partialBodyResolve/BangBang.dump +++ b/idea/testData/resolve/partialBodyResolve/BangBang.dump @@ -5,14 +5,14 @@ fun foo(p: String?, p1: Any?) { /* STATEMENT DELETED: y(f()!!) */ if (a) { - print(p!!.size) + print(p!!.length()) } else { - print(p!!.length) + print(p!!.get(1)) } if (y()) { - print(p.size) + print(p.charAt(1)) /* STATEMENT DELETED: p1!! */ } diff --git a/idea/testData/resolve/partialBodyResolve/BangBang.kt b/idea/testData/resolve/partialBodyResolve/BangBang.kt index 3f0fa2007f1..26793f80d9d 100644 --- a/idea/testData/resolve/partialBodyResolve/BangBang.kt +++ b/idea/testData/resolve/partialBodyResolve/BangBang.kt @@ -3,14 +3,14 @@ fun foo(p: String?, p1: Any?) { y(f()!!) if (a) { - print(p!!.size) + print(p!!.length()) } else { - print(p!!.length) + print(p!!.get(1)) } if (y()) { - print(p.size) + print(p.charAt(1)) p1!! } diff --git a/idea/testData/resolve/partialBodyResolve/For2.dump b/idea/testData/resolve/partialBodyResolve/For2.dump index 88ea5c96107..81f421996f0 100644 --- a/idea/testData/resolve/partialBodyResolve/For2.dump +++ b/idea/testData/resolve/partialBodyResolve/For2.dump @@ -7,5 +7,5 @@ fun foo(p: Any?, p1: Any?) { /* STATEMENT DELETED: print(p1!!) */ } - p.size + p.length() } diff --git a/idea/testData/resolve/partialBodyResolve/For2.kt b/idea/testData/resolve/partialBodyResolve/For2.kt index 3081f321b11..7db0298a149 100644 --- a/idea/testData/resolve/partialBodyResolve/For2.kt +++ b/idea/testData/resolve/partialBodyResolve/For2.kt @@ -5,5 +5,5 @@ fun foo(p: Any?, p1: Any?) { print(p1!!) } - p.size + p.length() } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump index ba49c6647ef..8972637fe16 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsError.dump @@ -4,5 +4,5 @@ fun foo(p: Any) { if (p !is String) { error("Not String") } - println(p.size) + println(p.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsError.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsError.kt index b80a6440ae9..3382887df41 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsError.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsError.kt @@ -2,5 +2,5 @@ fun foo(p: Any) { if (p !is String) { error("Not String") } - println(p.size) + println(p.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump index a6a9b62ff92..89833056685 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.dump @@ -4,5 +4,5 @@ fun foo(p: Any) { if (p !is String) { kotlin.error("Not String") } - println(p.size) + println(p.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.kt index ad78bfaaeec..a7c61dc0836 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsErrorQualifier.kt @@ -2,5 +2,5 @@ fun foo(p: Any) { if (p !is String) { kotlin.error("Not String") } - println(p.size) + println(p.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump index 1ad1d46ed2a..6a079ce74c3 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.dump @@ -6,5 +6,5 @@ fun foo(p: Any) { if (p !is String) { myError() } - println(p.size) + println(p.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt index 03509069422..a3246742629 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsMyError.kt @@ -4,5 +4,5 @@ fun foo(p: Any) { if (p !is String) { myError() } - println(p.size) + println(p.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump index 3d985ae0dee..e10bff0a448 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.dump @@ -7,5 +7,5 @@ fun foo(p: Any) { if (p !is String) { prop } - println(p.size) + println(p.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.kt index 18ec7159436..f0bf8df8cb3 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsNothingProp.kt @@ -5,5 +5,5 @@ fun foo(p: Any) { if (p !is String) { prop } - println(p.size) + println(p.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump index fd764d75dca..236ec22e061 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.dump @@ -10,5 +10,5 @@ fun foo(p: Any?) { return } } - println(p.size) + println(p.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt index ff1f54345c7..3d00791c792 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn.kt @@ -8,5 +8,5 @@ fun foo(p: Any?) { return } } - println(p.size) + println(p.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.dump index b9a6f7fe8b1..281c65d7449 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.dump @@ -4,5 +4,5 @@ class C(public val v: Any) fun foo(c: C) { if (c.v !is String) return - println(c.v.size) + println(c.v.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt index 471d73f7d8e..381a729c0fb 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsReturn2.kt @@ -2,5 +2,5 @@ class C(public val v: Any) fun foo(c: C) { if (c.v !is String) return - println(c.v.size) + println(c.v.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump b/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump index da7718bb19c..b7687110f49 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.dump @@ -4,5 +4,5 @@ fun foo(p: Any) { if (p !is String) { throw IllegalArgumentException() } - println(p.size) + println(p.length()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt b/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt index aa10a20db1f..4f41cf02fe2 100644 --- a/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt +++ b/idea/testData/resolve/partialBodyResolve/IfNotIsThrow.kt @@ -2,5 +2,5 @@ fun foo(p: Any) { if (p !is String) { throw IllegalArgumentException() } - println(p.size) + println(p.length()) } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/IfReturn.dump b/idea/testData/resolve/partialBodyResolve/IfReturn.dump index efb48e5d5ef..64f0705e4c8 100644 --- a/idea/testData/resolve/partialBodyResolve/IfReturn.dump +++ b/idea/testData/resolve/partialBodyResolve/IfReturn.dump @@ -1,6 +1,6 @@ -Resolve target: val kotlin.String.size: kotlin.Int +Resolve target: fun kotlin.String.isNotEmpty(): kotlin.Boolean ---------------------------------------------- fun foo(p: String) { /* STATEMENT DELETED: if (x()) return */ - println(p.size) + println(p.isNotEmpty()) } diff --git a/idea/testData/resolve/partialBodyResolve/IfReturn.kt b/idea/testData/resolve/partialBodyResolve/IfReturn.kt index 545076e38e6..325281c1130 100644 --- a/idea/testData/resolve/partialBodyResolve/IfReturn.kt +++ b/idea/testData/resolve/partialBodyResolve/IfReturn.kt @@ -1,4 +1,4 @@ fun foo(p: String) { if (x()) return - println(p.size) + println(p.isNotEmpty()) } diff --git a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump index c000f52e38c..4b5f3c3b41f 100644 --- a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump +++ b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.dump @@ -5,5 +5,5 @@ fun foo(p: String?, errorHandler: () -> Nothing) { errorHandler() } - p.size + p.length() } diff --git a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.kt b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.kt index 6f65d861fa5..389f2e7cf4f 100644 --- a/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.kt +++ b/idea/testData/resolve/partialBodyResolve/LambdaReturnsNothing2.kt @@ -3,5 +3,5 @@ fun foo(p: String?, errorHandler: () -> Nothing) { errorHandler() } - p.size + p.length() } diff --git a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion index 6742455fe37..3c81731f088 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion +++ b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.completion @@ -8,5 +8,5 @@ fun foo(p: String?, p1: Any?) { if (p == null) { localError() } - p.size + p.length() } diff --git a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump index 3674a079033..8227a5d3622 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump +++ b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.dump @@ -8,5 +8,5 @@ fun foo(p: String?, p1: Any?) { if (p == null) { localError() } - p.size + p.length() } diff --git a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt index 60e8726ac37..8b3e62e5e4e 100644 --- a/idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt +++ b/idea/testData/resolve/partialBodyResolve/LocalNothingFun.kt @@ -6,5 +6,5 @@ fun foo(p: String?, p1: Any?) { if (p == null) { localError() } - p.size + p.length() } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump b/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump index 19ed2ce6dfa..c1bdf933fea 100644 --- a/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump +++ b/idea/testData/resolve/partialBodyResolve/ReturnLambda.dump @@ -7,5 +7,5 @@ fun foo(p: String?): () -> String { "a" } } - p.size + p.length() } diff --git a/idea/testData/resolve/partialBodyResolve/ReturnLambda.kt b/idea/testData/resolve/partialBodyResolve/ReturnLambda.kt index 7783bb1a6eb..eb586b56146 100644 --- a/idea/testData/resolve/partialBodyResolve/ReturnLambda.kt +++ b/idea/testData/resolve/partialBodyResolve/ReturnLambda.kt @@ -5,5 +5,5 @@ fun foo(p: String?): () -> String { "a" } } - p.size + p.length() } \ No newline at end of file diff --git a/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.dump b/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.dump index 407b656da39..6ca69ec2eba 100644 --- a/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.dump +++ b/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.dump @@ -9,6 +9,6 @@ class C(val s: String?) { print(this.s!!) } - s.size + s.length() } } diff --git a/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.kt b/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.kt index 685484f2f0e..bbe66c0d528 100644 --- a/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.kt +++ b/idea/testData/resolve/partialBodyResolve/ThisQualifiedAutoCast.kt @@ -7,6 +7,6 @@ class C(val s: String?) { print(this.s!!) } - s.size + s.length() } }