diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java index 9d0bd2f5d98..6eb8fefd1dd 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -60,7 +60,7 @@ import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; @@ -136,7 +136,7 @@ public class InjectorForReplWithJava { private final DelegatedPropertyResolver delegatedPropertyResolver; private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final StatementFilter statementFilter; @@ -217,8 +217,8 @@ public class InjectorForReplWithJava { this.forLoopConventionsChecker = new ForLoopConventionsChecker(); this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), javaFlexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), javaFlexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(getModule()); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java index ab4a917ad5b..654e41e0d25 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; @@ -135,7 +135,7 @@ public class InjectorForTopDownAnalyzerForJvm { private final DelegatedPropertyResolver delegatedPropertyResolver; private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final StatementFilter statementFilter; @@ -215,8 +215,8 @@ public class InjectorForTopDownAnalyzerForJvm { this.forLoopConventionsChecker = new ForLoopConventionsChecker(); this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), javaFlexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), javaFlexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(getModule()); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt index dc67d74b2d0..6bbc6fd760a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt @@ -43,13 +43,13 @@ public fun GlobalContext(): GlobalContextImpl { } deprecated("Used temporarily while we are in transition from to lazy resolve") -public open class LazinessToken { +public open class TypeLazinessToken { deprecated("Used temporarily while we are in transition from to lazy resolve") public open fun isLazy(): Boolean = false } deprecated("Used temporarily while we are in transition from to lazy resolve") -public class LazyResolveToken : LazinessToken() { +public class LazyResolveToken : TypeLazinessToken() { deprecated("Used temporarily while we are in transition from to lazy resolve") override fun isLazy() = true } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index 8f170709a5e..780af11a8ca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.CallCompleter; @@ -84,7 +84,7 @@ public class InjectorForBodyResolve { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final CallCompleter callCompleter; @@ -126,8 +126,8 @@ public class InjectorForBodyResolve { this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(moduleDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 45ea667df9c..16e58a9b036 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; @@ -101,7 +101,7 @@ public class InjectorForLazyBodyResolve { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final StatementFilter statementFilter; @@ -154,8 +154,8 @@ public class InjectorForLazyBodyResolve { this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(moduleDescriptor); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java index 0fc6d155bca..1370bd7c64e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; @@ -99,7 +99,7 @@ public class InjectorForLazyLocalClassifierAnalyzer { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final StatementFilter statementFilter; @@ -152,8 +152,8 @@ public class InjectorForLazyLocalClassifierAnalyzer { this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(module); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 76cef999acc..e154b06ee3c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; @@ -99,7 +99,7 @@ public class InjectorForLazyTopDownAnalyzerBasic { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final StatementFilter statementFilter; @@ -153,8 +153,8 @@ public class InjectorForLazyTopDownAnalyzerBasic { this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(getModule()); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index e42576466d0..06eb2bf9d42 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -80,7 +80,7 @@ public class InjectorForMacros { private final TaskPrioritizer taskPrioritizer; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; public InjectorForMacros( @NotNull Project project, @@ -98,9 +98,9 @@ public class InjectorForMacros { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.globalContext = org.jetbrains.kotlin.context.ContextPackage.GlobalContext(); this.storageManager = globalContext.getStorageManager(); - this.lazinessToken = new LazinessToken(); + this.typeLazinessToken = new TypeLazinessToken(); this.dynamicTypesSettings = new DynamicTypesSettings(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.defaultProvider = DefaultProvider.INSTANCE$; this.callExpressionResolver = new CallExpressionResolver(); this.descriptorResolver = new DescriptorResolver(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java index 003d3ae58e1..8db8abb73b8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java @@ -20,14 +20,14 @@ import com.google.common.base.Predicate; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.context.GlobalContext; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; /** * Various junk that cannot be placed into context (yet). */ -public class TopDownAnalysisParameters extends LazinessToken implements GlobalContext { +public class TopDownAnalysisParameters extends TypeLazinessToken implements GlobalContext { @NotNull public static TopDownAnalysisParameters create( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 82139a7934c..7c30329da55 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import kotlin.platform.platformStatic import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.kotlin.context.LazinessToken +import org.jetbrains.kotlin.context.TypeLazinessToken import org.jetbrains.kotlin.resolve.lazy.LazyEntity import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull @@ -44,7 +44,7 @@ public class TypeResolver( private val moduleDescriptor: ModuleDescriptor, private val flexibleTypeCapabilitiesProvider: FlexibleTypeCapabilitiesProvider, private val storageManager: StorageManager, - private val lazinessToken: LazinessToken, + private val lazinessToken: TypeLazinessToken, private val dynamicTypesSettings: DynamicTypesSettings ) { diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 7817e368411..ad643793b32 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -80,7 +80,7 @@ public class InjectorForTests { private final StatementFilter statementFilter; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; public InjectorForTests( @NotNull Project project, @@ -100,9 +100,9 @@ public class InjectorForTests { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.globalContext = org.jetbrains.kotlin.context.ContextPackage.GlobalContext(); this.storageManager = globalContext.getStorageManager(); - this.lazinessToken = new LazinessToken(); + this.typeLazinessToken = new TypeLazinessToken(); this.dynamicTypesSettings = new DynamicTypesSettings(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesSettings); this.kotlinJvmCheckerProvider = KotlinJvmCheckerProvider.INSTANCE$; this.argumentTypeResolver = new ArgumentTypeResolver(); this.candidateResolver = new CandidateResolver(); diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index 3bd58674e27..d6108895c98 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.context.LazinessToken; +import org.jetbrains.kotlin.context.TypeLazinessToken; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.StatementFilter; @@ -99,7 +99,7 @@ public class InjectorForTopDownAnalyzerForJs { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final LazinessToken lazinessToken; + private final TypeLazinessToken typeLazinessToken; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; private final StatementFilter statementFilter; @@ -153,8 +153,8 @@ public class InjectorForTopDownAnalyzerForJs { this.descriptorResolver = new DescriptorResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); - this.lazinessToken = new LazinessToken(); - this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesAllowed); + this.typeLazinessToken = new TypeLazinessToken(); + this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModule(), flexibleTypeCapabilitiesProvider, storageManager, typeLazinessToken, dynamicTypesAllowed); this.localClassifierAnalyzer = new LocalClassifierAnalyzer(descriptorResolver, typeResolver, annotationResolver); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.reflectionTypes = new ReflectionTypes(getModule());