From 2517f9319b0d3c9de2187bdaca88fffccc48d4f4 Mon Sep 17 00:00:00 2001 From: "Vladislav.Koshkin" Date: Mon, 13 Nov 2023 17:04:12 +0100 Subject: [PATCH] [kotlin] apply .k2.kt.after postfix for inspection tests GitOrigin-RevId: 12097426763100bef908255bbc2cde2794c99857 --- .../tests/AbstractK2LocalInspectionTest.kt | 11 +++++++++ .../AbstractLocalInspectionTest.kt | 24 +++++++------------ ...kt.after.k2 => CommentInBlock.k2.kt.after} | 1 - .../CommentInBlock.kt | 1 - .../CommentInBlock.kt.after | 1 - ...nts2.kt.after.k2 => Comments2.k2.kt.after} | 1 - .../foldInitializerAndIfToElvis/Comments2.kt | 1 - .../Comments2.kt.after | 1 - ...gName.kt.after.k2 => LongName.k2.kt.after} | 1 - .../foldInitializerAndIfToElvis/LongName.kt | 1 - .../LongName.kt.after | 1 - ...ame2.kt.after.k2 => LongName2.k2.kt.after} | 1 - .../foldInitializerAndIfToElvis/LongName2.kt | 1 - .../LongName2.kt.after | 1 - ...after.k2 => VarUsedAsNullable.k2.kt.after} | 1 - .../VarUsedAsNullable.kt | 1 - .../VarUsedAsNullable.kt.after | 1 - ...fter.k2 => VarUsedAsNullable2.k2.kt.after} | 1 - .../VarUsedAsNullable2.kt | 1 - .../VarUsedAsNullable2.kt.after | 1 - 20 files changed, 20 insertions(+), 33 deletions(-) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/{CommentInBlock.kt.after.k2 => CommentInBlock.k2.kt.after} (78%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/{Comments2.kt.after.k2 => Comments2.k2.kt.after} (85%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/{LongName.kt.after.k2 => LongName.k2.kt.after} (88%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/{LongName2.kt.after.k2 => LongName2.k2.kt.after} (88%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/{VarUsedAsNullable.kt.after.k2 => VarUsedAsNullable.k2.kt.after} (78%) rename plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/{VarUsedAsNullable2.kt.after.k2 => VarUsedAsNullable2.k2.kt.after} (82%) diff --git a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt index 777b31d4f06a..994fdddd4159 100644 --- a/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt +++ b/plugins/kotlin/code-insight/inspections-k2/tests/test/org/jetbrains/kotlin/idea/k2/inspections/tests/AbstractK2LocalInspectionTest.kt @@ -10,6 +10,9 @@ import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.utils.IgnoreTests import java.io.File +import java.nio.file.Path +import kotlin.io.path.div +import kotlin.io.path.exists abstract class AbstractK2LocalInspectionTest : AbstractLocalInspectionTest() { override fun isFirPlugin() = true @@ -29,6 +32,14 @@ abstract class AbstractK2LocalInspectionTest : AbstractLocalInspectionTest() { ) } + override fun getAfterTestDataAbsolutePath(mainFileName: String): Path { + val k2FileName = mainFileName.removeSuffix(".kt") + ".k2.kt.after" + val k2FilePath = testDataDirectory.toPath() / k2FileName + if (k2FilePath.exists()) return k2FilePath + + return super.getAfterTestDataAbsolutePath(mainFileName) + } + override fun doTestFor(mainFile: File, inspection: LocalInspectionTool, fileText: String) { IgnoreTests.runTestIfNotDisabledByFileDirective(mainFile.toPath(), IgnoreTests.DIRECTIVES.IGNORE_K2, "after") { doTestForInternal(mainFile, inspection, fileText) diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt index 26bfc77f2df6..f6d463d77c14 100644 --- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt +++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/inspections/AbstractLocalInspectionTest.kt @@ -38,6 +38,8 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa protected open val inspectionFileName: String get() = ".inspection" + private val afterFileNameSuffix: String = ".after" + private val expectedProblemDirectiveName: String = "PROBLEM" protected val expectedProblemHighlightType: String = "HIGHLIGHT" @@ -265,6 +267,9 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa } } + protected open fun getAfterTestDataAbsolutePath(mainFileName: String) = + testDataDirectory.toPath() / (mainFileName + afterFileNameSuffix) + protected fun doTestForInternal(mainFile: File, inspection: LocalInspectionTool, fileText: String) { val mainFileName = mainFile.name val expectedProblemString = InTextDirectivesUtils.findStringWithPrefixes( @@ -278,9 +283,7 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa ) val inspectionSettings = loadInspectionSettings(mainFile) - val afterFileName = mainFileName + - if (isDifferentExpectedDataForK2(inspection, fileText)) ".after.k2" else ".after" - val afterFileAbsolutePath = testDataDirectory.toPath() / afterFileName + val afterFileAbsolutePath = getAfterTestDataAbsolutePath(mainFileName) if (!runInspectionWithFixesAndCheck( inspection, @@ -290,17 +293,17 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa inspectionSettings ) ) { - assertFalse("$afterFileName should not exist as no action could be applied", Files.exists(afterFileAbsolutePath)) + assertFalse("${afterFileAbsolutePath.fileName} should not exist as no action could be applied", Files.exists(afterFileAbsolutePath)) return } createAfterFileIfItDoesNotExist(afterFileAbsolutePath) dispatchAllEventsInIdeEventQueue() try { - myFixture.checkResultByFile(afterFileName) + myFixture.checkResultByFile("${afterFileAbsolutePath.fileName}") } catch (e: ComparisonFailure) { KotlinTestUtils.assertEqualsToFile( - File(testDataDirectory, afterFileName), + File(testDataDirectory, "${afterFileAbsolutePath.fileName}"), editor.document.text ) } @@ -308,15 +311,6 @@ abstract class AbstractLocalInspectionTest : KotlinLightCodeInsightFixtureTestCa checkForUnexpectedErrors() } - private fun isDifferentExpectedDataForK2(inspection: LocalInspectionTool, fileText: String): Boolean { - val withK2Data = InTextDirectivesUtils.isDirectiveDefined( - fileText, "// WITH_DIFFERENT_DATA_FOR_K2" - ) - - return inspection.javaClass.`package`.name == "org.jetbrains.kotlin.idea.k2.codeinsight.inspections" - && withK2Data - } - private fun createAfterFileIfItDoesNotExist(path: Path) { if (!Files.exists(path)) { path.createFile().write(editor.document.text) diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after.k2 b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.k2.kt.after similarity index 78% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after.k2 rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.k2.kt.after index 685826bb6e37..d32ac0536c69 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after.k2 +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.k2.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(p: List): Int { val v = p[0] ?: // return -1 if null return -1 diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt index a5ad96a20a4d..c0913e52198a 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(p: List): Int { val v = p[0] if (v == null) { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after index c4ccf3703886..4adb1284548f 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/CommentInBlock.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(p: List): Int { val v = p[0] ?: // return -1 if null diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after.k2 b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.k2.kt.after similarity index 85% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after.k2 rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.k2.kt.after index 073aecb830e9..1e0a99828757 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after.k2 +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.k2.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(p: List): Int { val v = p[0] ?: // v is null // we should do something with it diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt index addff128a9f1..9d73c0f3df0c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(p: List): Int { val v = p[0] if (v == null) { // v is null diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after index 6f26e9821cfc..984a8f8b4e47 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/Comments2.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(p: List): Int { val v = p[0] ?: // v is null diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after.k2 b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.k2.kt.after similarity index 88% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after.k2 rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.k2.kt.after index c20b7a219ef9..96c9dbc06fe9 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after.k2 +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.k2.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(): Any { val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7 val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt index 0ce5970d9070..62776cdd7a4c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(): Any { val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7 val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 24 diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after index 75670735e7e4..93c744ec5dfe 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(): Any { val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7 val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = 24 diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after.k2 b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.k2.kt.after similarity index 88% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after.k2 rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.k2.kt.after index c20b7a219ef9..96c9dbc06fe9 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after.k2 +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.k2.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(): Any { val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7 val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx = diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt index b367c98435ac..6970b1c0a981 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(): Any { val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7 val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after index 2d95dba735ec..ae37e2ebebd1 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/LongName2.kt.after @@ -1,4 +1,3 @@ -// WITH_DIFFERENT_DATA_FOR_K2 fun foo(): Any { val yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy = 7 val xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after.k2 b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.k2.kt.after similarity index 78% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after.k2 rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.k2.kt.after index d402fde56316..73856f5281ab 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after.k2 +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.k2.kt.after @@ -1,5 +1,4 @@ // IGNORE_FE10_BINDING_BY_FIR -// WITH_DIFFERENT_DATA_FOR_K2 fun test(foo: Int?, bar: Int): Int? { var i = foo ?: return bar return i diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt index 65e86f4ccf72..e6d9b8cef11c 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt @@ -1,5 +1,4 @@ // IGNORE_FE10_BINDING_BY_FIR -// WITH_DIFFERENT_DATA_FOR_K2 fun test(foo: Int?, bar: Int): Int? { var i = foo if (i == null) { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after index ce2a0cb31784..ef8f76acb83b 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable.kt.after @@ -1,5 +1,4 @@ // IGNORE_FE10_BINDING_BY_FIR -// WITH_DIFFERENT_DATA_FOR_K2 fun test(foo: Int?, bar: Int): Int? { var i: Int? = foo ?: return bar return i diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after.k2 b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.k2.kt.after similarity index 82% rename from plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after.k2 rename to plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.k2.kt.after index 64f2ae566dd0..2bc5782193b4 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after.k2 +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.k2.kt.after @@ -1,5 +1,4 @@ // IGNORE_FE10_BINDING_BY_FIR -// WITH_DIFFERENT_DATA_FOR_K2 fun test(foo: Int?, bar: Int): Int { var i = foo ?: return bar return baz(i) diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt index f1ebcd0d448d..9c51b1312ed6 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt @@ -1,5 +1,4 @@ // IGNORE_FE10_BINDING_BY_FIR -// WITH_DIFFERENT_DATA_FOR_K2 fun test(foo: Int?, bar: Int): Int { var i = foo if (i == null) { diff --git a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after index 1bdf5c7298a6..c9fa1a1866f0 100644 --- a/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after +++ b/plugins/kotlin/idea/tests/testData/inspectionsLocal/foldInitializerAndIfToElvis/VarUsedAsNullable2.kt.after @@ -1,5 +1,4 @@ // IGNORE_FE10_BINDING_BY_FIR -// WITH_DIFFERENT_DATA_FOR_K2 fun test(foo: Int?, bar: Int): Int { var i: Int? = foo ?: return bar return baz(i)