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

Take DataFlowValueFactoryImpl from DI container instead of constructing directly

Browse Source
This commit is contained in:
Dmitry Savvinov
2018-06-21 11:44:53 +03:00
parent fa72198505
commit 31ce992ff2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java
+1 -1
View File
@@ -156,7 +156,7 @@ public class ExpectedResolveDataUtil {
LanguageVersionSettings languageVersionSettings = CommonConfigurationKeysKt.getLanguageVersionSettings(environment.getConfiguration()); LanguageVersionSettings languageVersionSettings = CommonConfigurationKeysKt.getLanguageVersionSettings(environment.getConfiguration());
ExpressionTypingContext context = ExpressionTypingContext.newContext( ExpressionTypingContext context = ExpressionTypingContext.newContext(
new BindingTraceContext(), lexicalScope, 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); KtExpression callElement = KtPsiFactory(project).createExpression(name);
compiler/tests-common/tests/org/jetbrains/kotlin/tests/di/injection.kt
+2
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.frontend.di.configureModule import org.jetbrains.kotlin.frontend.di.configureModule
import org.jetbrains.kotlin.resolve.* 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.resolve.jvm.platform.JvmPlatform
import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
import org.jetbrains.kotlin.types.expressions.FakeCallResolver import org.jetbrains.kotlin.types.expressions.FakeCallResolver
@@ -46,4 +47,5 @@ class ContainerForTests(container: StorageComponentContainer) {
val typeResolver: TypeResolver by container val typeResolver: TypeResolver by container
val fakeCallResolver: FakeCallResolver by container val fakeCallResolver: FakeCallResolver by container
val expressionTypingServices: ExpressionTypingServices by container val expressionTypingServices: ExpressionTypingServices by container
val dataFlowValueFactory: DataFlowValueFactory by container
} }