From 3c8e24907d730318ae5dd6e8d9427ffabb7226bd Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Thu, 14 Dec 2023 12:43:13 +0200 Subject: [PATCH] KT-64205 [kotlin] Adjust test data for changed defaults in reference shortener GitOrigin-RevId: c53f125d1c1bbd77c656677c4f4a41f335668afc --- .../testData/expansion/try/javaException.after.kt | 3 +-- .../testData/expansion/try/mixedExceptions.after.kt | 3 +-- .../AddPropertyReceiverWithComplexDefaultValueAfter.k2.kt | 8 ++++---- .../AddPropertyReceiverWithDefaultValue2After.k2.kt | 6 +++--- .../AddPropertyReceiverWithDefaultValueAfter.k2.kt | 6 +++--- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/javaException.after.kt b/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/javaException.after.kt index 1fd620d1041f..9caf5393de1e 100644 --- a/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/javaException.after.kt +++ b/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/javaException.after.kt @@ -1,9 +1,8 @@ -import java.lang.Integer.parseInt import java.lang.NumberFormatException fun test() { try { - parseInt("5") + Integer.parseInt("5") } catch (e: NumberFormatException) { throw e } diff --git a/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/mixedExceptions.after.kt b/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/mixedExceptions.after.kt index 23f3ec90a3ac..91316c68331a 100644 --- a/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/mixedExceptions.after.kt +++ b/plugins/kotlin/code-insight/postfix-templates/testData/expansion/try/mixedExceptions.after.kt @@ -1,9 +1,8 @@ -import java.lang.Integer.parseInt import java.lang.NumberFormatException fun test() { try { - call(1, 2, parseInt("5")) + call(1, 2, Integer.parseInt("5")) } catch (e: java.lang.IllegalStateException) { throw e } catch (e: java.lang.IllegalArgumentException) { diff --git a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithComplexDefaultValueAfter.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithComplexDefaultValueAfter.k2.kt index f3e85c255d78..8e91d93e04ea 100644 --- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithComplexDefaultValueAfter.k2.kt +++ b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithComplexDefaultValueAfter.k2.kt @@ -1,11 +1,11 @@ package usages -import a.b.Dep2.Companion.NUMBER -import a.b.c.Dep.Companion.MY_CONSTANT_FROM_DEP +import a.b.Dep2 +import a.b.c.Dep val Int.foo: String get() = "hello" -fun callFoo() = Dep2().eval(MY_CONSTANT_FROM_DEP + NUMBER).foo +fun callFoo() = Dep2().eval(Dep.Companion.MY_CONSTANT_FROM_DEP + Dep2.Companion.NUMBER).foo fun t() { - val s = Dep2().eval(MY_CONSTANT_FROM_DEP + NUMBER).foo + " world" + val s = Dep2().eval(Dep.Companion.MY_CONSTANT_FROM_DEP + Dep2.Companion.NUMBER).foo + " world" } diff --git a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValue2After.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValue2After.k2.kt index 26b122175cfd..a5ec86142532 100644 --- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValue2After.k2.kt +++ b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValue2After.k2.kt @@ -1,10 +1,10 @@ package usages -import a.b.c.Dep.Companion.MY_CONSTANT_FROM_DEP +import a.b.c.Dep val Int.foo: String get() = "hello" -fun callFoo() = MY_CONSTANT_FROM_DEP.foo +fun callFoo() = Dep.Companion.MY_CONSTANT_FROM_DEP.foo fun t() { - val s = MY_CONSTANT_FROM_DEP.foo + " world" + val s = Dep.Companion.MY_CONSTANT_FROM_DEP.foo + " world" } diff --git a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValueAfter.k2.kt b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValueAfter.k2.kt index 26b122175cfd..a5ec86142532 100644 --- a/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValueAfter.k2.kt +++ b/plugins/kotlin/idea/tests/testData/refactoring/changeSignature/AddPropertyReceiverWithDefaultValueAfter.k2.kt @@ -1,10 +1,10 @@ package usages -import a.b.c.Dep.Companion.MY_CONSTANT_FROM_DEP +import a.b.c.Dep val Int.foo: String get() = "hello" -fun callFoo() = MY_CONSTANT_FROM_DEP.foo +fun callFoo() = Dep.Companion.MY_CONSTANT_FROM_DEP.foo fun t() { - val s = MY_CONSTANT_FROM_DEP.foo + " world" + val s = Dep.Companion.MY_CONSTANT_FROM_DEP.foo + " world" }