From da942eb388e31398a238c9cce6d907aaf3df40e9 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 25 Mar 2024 13:08:20 +0100 Subject: [PATCH] [kotlin] k2: additional testdata for extract function ^KTIJ-26744 fixed GitOrigin-RevId: f60c64bb1e011d075bb875f8d20c78820f6a192d --- .../introduce/ExtractionTestGenerated.java | 5 +++++ .../controlFlow/outputValues/runExpression.kt | 9 +++++++++ .../controlFlow/outputValues/runExpression.kt.after | 11 +++++++++++ .../K2IntroduceFunctionTestGenerated.java | 5 +++++ 4 files changed, 30 insertions(+) create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt create mode 100644 plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt.after diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java index b72a2bf6d04c..4abc77c337df 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java @@ -1494,6 +1494,11 @@ public abstract class ExtractionTestGenerated extends AbstractExtractionTest { runTest("testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt"); } + @TestMetadata("runExpression.kt") + public void testRunExpression() throws Exception { + runTest("testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt"); + } + @TestMetadata("singleOutputValue.kt") public void testSingleOutputValue() throws Exception { runTest("testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt"); diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt new file mode 100644 index 000000000000..eb591eaf7b0a --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt @@ -0,0 +1,9 @@ +fun test () { + val nullable: String? = "1" + val result = nullable.run { + this!! + toInt() + } + val int: Int = result +} +// IGNORE_K1 \ No newline at end of file diff --git a/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt.after b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt.after new file mode 100644 index 000000000000..bd2ca7d0ecdb --- /dev/null +++ b/plugins/kotlin/idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt.after @@ -0,0 +1,11 @@ +fun test () { + val nullable: String? = "1" + val result = i(nullable) + val int: Int = result +} + +private fun String.i(nullable: String?): Int = nullable.run { + this!! + toInt() +} +// IGNORE_K1 \ No newline at end of file diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java index fb97081976f8..3f685c62cf84 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java +++ b/plugins/kotlin/refactorings/kotlin.refactorings.tests.k2/test/org/jetbrains/kotlin/idea/k2/refactoring/introduceFunction/K2IntroduceFunctionTestGenerated.java @@ -715,6 +715,11 @@ public abstract class K2IntroduceFunctionTestGenerated extends AbstractK2Introdu runTest("../../idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/pairWithWhen.kt"); } + @TestMetadata("runExpression.kt") + public void testRunExpression() throws Exception { + runTest("../../idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/runExpression.kt"); + } + @TestMetadata("singleOutputValue.kt") public void testSingleOutputValue() throws Exception { runTest("../../idea/tests/testData/refactoring/extractFunction/controlFlow/outputValues/singleOutputValue.kt");