From 55bd83c0d17a725af80fe666bf7dc04b317e49f5 Mon Sep 17 00:00:00 2001 From: Roman Golyshev Date: Sun, 24 Mar 2024 12:42:48 +0100 Subject: [PATCH] KTI-1665 [kotlin] Adjust testdata for `KtDataFlowInspectionTest` Some missing `USELESS_IS_CHECK` diagnostics are now reported in K2 Corresponding issue: KT-58203 Corresponding commit from kotlin: 88ff93df GitOrigin-RevId: 6dd50eaebdb1929ad260963a63fc20f3e77792d6 --- .../tests/testData/inspections/dfa/ReifiedGenericK2.kt | 3 +-- .../idea/tests/testData/inspections/dfa/TypeTestK2.kt | 7 +++---- .../kotlin/idea/tests/testData/inspections/dfa/WhenK2.kt | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/plugins/kotlin/idea/tests/testData/inspections/dfa/ReifiedGenericK2.kt b/plugins/kotlin/idea/tests/testData/inspections/dfa/ReifiedGenericK2.kt index 4ce926a359d8..9716324ce0ec 100644 --- a/plugins/kotlin/idea/tests/testData/inspections/dfa/ReifiedGenericK2.kt +++ b/plugins/kotlin/idea/tests/testData/inspections/dfa/ReifiedGenericK2.kt @@ -13,8 +13,7 @@ inline fun number(t: T) { // Cannot say anything if (x is T) {} x = "hello" - // TODO: support 'always false' here - if (x is T) {} + if (x is T) {} } // Non-reified diff --git a/plugins/kotlin/idea/tests/testData/inspections/dfa/TypeTestK2.kt b/plugins/kotlin/idea/tests/testData/inspections/dfa/TypeTestK2.kt index 93d2866af433..76a73217e673 100644 --- a/plugins/kotlin/idea/tests/testData/inspections/dfa/TypeTestK2.kt +++ b/plugins/kotlin/idea/tests/testData/inspections/dfa/TypeTestK2.kt @@ -1,14 +1,13 @@ // WITH_STDLIB fun unrelatedTypes(obj : Any) { if (obj is X) { - // Difference with K1: no 'USELESS_IS_CHECK' warning, hence we report it, as it's useful - if (obj is Y) { } - if (obj !is Y) { } + if (obj is Y) { } + if (obj !is Y) { } } } fun nullableTypes(obj : Any?) { if (obj is X?) { - if (obj is Y?) { + if (obj is Y?) { if (obj == null) { } } } diff --git a/plugins/kotlin/idea/tests/testData/inspections/dfa/WhenK2.kt b/plugins/kotlin/idea/tests/testData/inspections/dfa/WhenK2.kt index 8044d6998b1b..47d976b988ce 100644 --- a/plugins/kotlin/idea/tests/testData/inspections/dfa/WhenK2.kt +++ b/plugins/kotlin/idea/tests/testData/inspections/dfa/WhenK2.kt @@ -47,8 +47,7 @@ fun whenIs(obj : Any?) { } if (obj is X) { when(obj) { - // Difference with K1: no 'USELESS_IS_CHECK' warning, hence we report DFA warning, as it's useful - is Y -> {} + is Y -> {} } } }