From 494322104e41b96dc0fc06b898c41d850d2a3017 Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Fri, 25 Aug 2023 15:44:16 +0200 Subject: [PATCH] [kotlin] Drop wrongly added FIR_IDENTICAL and add explicit IGNORE_K2 directive for HighLevelWeigherTestGenerated GitOrigin-RevId: 8f8a437783d3a989d4970cc9c97dfd1825c352fc --- .../basic/contextualReturn/withReturnType/InElvisInReturn.kt | 2 +- .../withReturnType/InWhenAsReturnedExpression.kt | 2 +- .../withReturnType/InWhenWithBodyAsReturnedExpression.kt | 2 +- .../testData/weighers/basic/expectedInfo/ExpectedType2.kt | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InElvisInReturn.kt b/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InElvisInReturn.kt index 395871e3b943..ce808995424d 100644 --- a/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InElvisInReturn.kt +++ b/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InElvisInReturn.kt @@ -1,9 +1,9 @@ -// FIR_IDENTICAL fun reportError(): Nothing fun usage(a: Int?): Int { return a ?: a ?: a ?: re } +// IGNORE_K2 // ORDER: reportError // ORDER: return diff --git a/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenAsReturnedExpression.kt b/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenAsReturnedExpression.kt index af751010710b..badedc5441b9 100644 --- a/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenAsReturnedExpression.kt +++ b/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenAsReturnedExpression.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL fun reportError(): Nothing fun usage(a: Int?): Int { @@ -8,5 +7,6 @@ fun usage(a: Int?): Int { } } +// IGNORE_K2 // ORDER: reportError // ORDER: return diff --git a/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenWithBodyAsReturnedExpression.kt b/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenWithBodyAsReturnedExpression.kt index af751010710b..badedc5441b9 100644 --- a/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenWithBodyAsReturnedExpression.kt +++ b/plugins/kotlin/completion/testData/weighers/basic/contextualReturn/withReturnType/InWhenWithBodyAsReturnedExpression.kt @@ -1,4 +1,3 @@ -// FIR_IDENTICAL fun reportError(): Nothing fun usage(a: Int?): Int { @@ -8,5 +7,6 @@ fun usage(a: Int?): Int { } } +// IGNORE_K2 // ORDER: reportError // ORDER: return diff --git a/plugins/kotlin/completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt b/plugins/kotlin/completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt index 66f15a96a083..25602be8a2d7 100644 --- a/plugins/kotlin/completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt +++ b/plugins/kotlin/completion/testData/weighers/basic/expectedInfo/ExpectedType2.kt @@ -1,5 +1,3 @@ -// FIR_IDENTICAL - interface I { fun takeXxx(): Int = 0 fun takeYyy(): String = "" @@ -10,6 +8,7 @@ fun foo(i: I): String { return i.take } +// IGNORE_K2 // ORDER: takeYyy // ORDER: takeXxx // ORDER: takeZzz