azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not check 'isArrayOfMethod' using BuiltInsPackageFragment

Browse Source 
So #KT-18631 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-09-19 12:37:38 +03:00
committed by Mikhail Glukhikh
parent bf739198aa
commit 38ddc731ea
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/intentions/Utils.kt
+3 -1
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment import org.jetbrains.kotlin.builtins.BuiltInsPackageFragment
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.core.replaced 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 { fun KtCallExpression.isArrayOfMethod(): Boolean {
val resolvedCall = getResolvedCall(analyze()) ?: return false val resolvedCall = getResolvedCall(analyze()) ?: return false
val descriptor = resolvedCall.candidateDescriptor 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)
} }