From 38ddc731ea8c1eeeb0a800fb7fbc1e9c0c65c0c4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 19 Sep 2017 12:37:38 +0300 Subject: [PATCH] Do not check 'isArrayOfMethod' using BuiltInsPackageFragment So #KT-18631 Fixed --- idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt index c7dce33ac45..854e1cbf5c6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.KtNodeTypes import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.core.replaced @@ -283,5 +284,6 @@ private val ARRAY_OF_METHODS = setOf(CollectionLiteralResolver.ARRAY_OF_FUNCTION fun KtCallExpression.isArrayOfMethod(): Boolean { val resolvedCall = getResolvedCall(analyze()) ?: return false val descriptor = resolvedCall.candidateDescriptor - return descriptor.containingDeclaration is BuiltInsPackageFragment && ARRAY_OF_METHODS.contains(descriptor.name) + return (descriptor.containingDeclaration as? PackageFragmentDescriptor)?.fqName == KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME && + ARRAY_OF_METHODS.contains(descriptor.name) }