From ddbf4c18d3ca5b1493563246dfbf7af3801ea809 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 30 Jul 2015 15:18:37 +0300 Subject: [PATCH] Minor: inject targetPlatform into ResolveElementCache --- .../jetbrains/kotlin/idea/project/ResolveElementCache.kt | 7 +++---- .../AbstractAdditionalResolveDescriptorRendererTest.java | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt index 33a1e1b11e3..c5e3971c2f5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt @@ -52,7 +52,8 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull public class ResolveElementCache( private val resolveSession: ResolveSession, - private val project: Project + private val project: Project, + private val targetPlatform: TargetPlatform ) : BodyResolveCache { private class CachedFullResolve(val bindingContext: BindingContext, resolveElement: JetElement) { private val modificationStamp: Long? = modificationStamp(resolveElement) @@ -105,8 +106,6 @@ public class ResolveElementCache( false) - private fun getTargetPlatform(file: JetFile): TargetPlatform = TargetPlatformDetector.getPlatform(file) - private fun probablyNothingCallableNames(): ProbablyNothingCallableNames { return object : ProbablyNothingCallableNames { override fun functionNames() = JetProbablyNothingFunctionShortNameIndex.getInstance().getAllKeys(project) @@ -520,7 +519,7 @@ public class ResolveElementCache( return createContainerForBodyResolve( globalContext.withProject(file.getProject()).withModule(module), trace, - getTargetPlatform(file), + targetPlatform, statementFilter ).get() } diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java index 742910c689b..642a2b6aac6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractAdditionalResolveDescriptorRendererTest.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; @@ -32,7 +33,7 @@ public abstract class AbstractAdditionalResolveDescriptorRendererTest extends Ab @Override protected DeclarationDescriptor getDescriptor(@NotNull JetDeclaration declaration, @NotNull ResolveSession resolveSession) { if (declaration instanceof JetClassInitializer || JetPsiUtil.isLocal(declaration)) { - ResolveElementCache resolveElementCache = new ResolveElementCache(resolveSession, getProject()); + ResolveElementCache resolveElementCache = new ResolveElementCache(resolveSession, getProject(), JvmPlatform.INSTANCE$); //noinspection ConstantConditions return resolveElementCache.resolveToElement(declaration, BodyResolveMode.FULL).get(BindingContext.DECLARATION_TO_DESCRIPTOR, declaration); }