From 31ce992ff226781bdff963da266c2173abb16011 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Thu, 21 Jun 2018 11:44:53 +0300 Subject: [PATCH] Take DataFlowValueFactoryImpl from DI container instead of constructing directly --- .../org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java | 2 +- .../tests/org/jetbrains/kotlin/tests/di/injection.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java index a4f602f4119..257b5cebd96 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java @@ -156,7 +156,7 @@ public class ExpectedResolveDataUtil { LanguageVersionSettings languageVersionSettings = CommonConfigurationKeysKt.getLanguageVersionSettings(environment.getConfiguration()); ExpressionTypingContext context = ExpressionTypingContext.newContext( new BindingTraceContext(), lexicalScope, - DataFlowInfoFactory.EMPTY, TypeUtils.NO_EXPECTED_TYPE, languageVersionSettings, new DataFlowValueFactoryImpl()); + DataFlowInfoFactory.EMPTY, TypeUtils.NO_EXPECTED_TYPE, languageVersionSettings, container.getDataFlowValueFactory()); KtExpression callElement = KtPsiFactory(project).createExpression(name); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt index 5fbb1c378bc..4279077e785 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.context.ModuleContext import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.frontend.di.configureModule import org.jetbrains.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices import org.jetbrains.kotlin.types.expressions.FakeCallResolver @@ -46,4 +47,5 @@ class ContainerForTests(container: StorageComponentContainer) { val typeResolver: TypeResolver by container val fakeCallResolver: FakeCallResolver by container val expressionTypingServices: ExpressionTypingServices by container + val dataFlowValueFactory: DataFlowValueFactory by container }