From 33bd1b23a228da5a2169093774793e0f03a6ce9b Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Tue, 10 Jul 2018 13:09:38 +0300 Subject: [PATCH] Don't assign single elements to varargs as it's deprecated See #KT-20171 --- .../kotlin/idea/quickfix/SurroundWithNullCheckFix.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt index 34cfc4c1b4e..d06251ef3d1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SurroundWithNullCheckFix.kt @@ -74,7 +74,9 @@ class SurroundWithNullCheckFix( if (!nullableExpression.isStableSimpleExpression(context)) return null - val expressionTarget = expressionParent.getParentOfTypesAndPredicate(strict = false, parentClasses = KtExpression::class.java) { + val expressionTarget = expressionParent.getParentOfTypesAndPredicate( + strict = false, parentClasses = *arrayOf(KtExpression::class.java) + ) { !it.isUsedAsExpression(context) && it.hasAcceptableParent() } ?: return null // Surround declaration (even of local variable) with null check is generally a bad idea