From 36fee381c3e738443060f7b2eba392093a09a43c Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 22 Sep 2015 15:26:14 +0300 Subject: [PATCH] BuiltInsReferenceResolver: drop usage of KotlinBuiltIns.getInstance() --- .../kotlin/idea/references/BuiltInsReferenceResolver.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt index f3491dfc68c..4fe27c518d0 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.descriptorUtil.classId +import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies @@ -140,7 +141,8 @@ public class BuiltInsReferenceResolver(val project: Project, val startupManager: private fun isFromBuiltinModule(originalDescriptor: DeclarationDescriptor): Boolean { // TODO This is optimization only // It should be rewritten by checking declarationDescriptor.getSource(), when the latter returns something non-trivial for builtins. - return KotlinBuiltIns.getInstance().getBuiltInsModule() == DescriptorUtils.getContainingModule(originalDescriptor) + val containingModule = originalDescriptor.module + return containingModule.builtIns.builtInsModule == containingModule } public fun resolveBuiltInSymbol(project: Project, declarationDescriptor: DeclarationDescriptor): PsiElement? {