From ddcd2e7344a9a1636647f6acbba63bcb5a2e124f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 14 Jan 2015 17:40:15 +0300 Subject: [PATCH] Regenerated injectors --- .../kotlin/di/InjectorForLazyResolveWithJava.java | 12 ++++-------- .../kotlin/di/InjectorForReplWithJava.java | 14 +++++--------- .../di/InjectorForTopDownAnalyzerForJvm.java | 14 +++++--------- .../kotlin/di/InjectorForBodyResolve.java | 4 ---- .../kotlin/di/InjectorForLazyBodyResolve.java | 4 ---- .../kotlin/di/InjectorForLazyResolve.java | 4 ---- .../di/InjectorForLazyTopDownAnalyzerBasic.java | 14 +++++--------- .../org/jetbrains/kotlin/di/InjectorForMacros.java | 12 ++++-------- .../kotlin/di/InjectorForTopDownAnalyzerBasic.java | 4 ---- .../org/jetbrains/kotlin/di/InjectorForTests.java | 12 ++++-------- .../kotlin/di/InjectorForTopDownAnalyzerForJs.java | 14 +++++--------- 11 files changed, 32 insertions(+), 76 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java index e1855885cb2..096af671945 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.context.LazyResolveToken; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -57,7 +57,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -104,7 +103,7 @@ public class InjectorForLazyResolveWithJava { private final JavaFlexibleTypeCapabilitiesProvider javaFlexibleTypeCapabilitiesProvider; private final LazyResolveToken lazyResolveToken; private final JavaLazyAnalyzerPostConstruct javaLazyAnalyzerPostConstruct; - private final JavaDeclarationCheckerProvider javaDeclarationCheckerProvider; + private final KotlinJvmCheckerProvider kotlinJvmCheckerProvider; private final AnnotationResolver annotationResolver; private final CallResolver callResolver; private final ArgumentTypeResolver argumentTypeResolver; @@ -120,7 +119,6 @@ public class InjectorForLazyResolveWithJava { private final DelegatedPropertyResolver delegatedPropertyResolver; private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -173,7 +171,7 @@ public class InjectorForLazyResolveWithJava { this.javaFlexibleTypeCapabilitiesProvider = new JavaFlexibleTypeCapabilitiesProvider(); this.lazyResolveToken = new LazyResolveToken(); this.javaLazyAnalyzerPostConstruct = new JavaLazyAnalyzerPostConstruct(); - this.javaDeclarationCheckerProvider = JavaDeclarationCheckerProvider.INSTANCE$; + this.kotlinJvmCheckerProvider = KotlinJvmCheckerProvider.INSTANCE$; this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); this.argumentTypeResolver = new ArgumentTypeResolver(); @@ -189,7 +187,6 @@ public class InjectorForLazyResolveWithJava { this.delegatedPropertyResolver = new DelegatedPropertyResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, javaFlexibleTypeCapabilitiesProvider, storageManager, lazyResolveToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -249,12 +246,11 @@ public class InjectorForLazyResolveWithJava { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); - expressionTypingComponents.setAdditionalCheckerProvider(javaDeclarationCheckerProvider); + expressionTypingComponents.setAdditionalCheckerProvider(kotlinJvmCheckerProvider); expressionTypingComponents.setBuiltIns(kotlinBuiltIns); expressionTypingComponents.setCallResolver(callResolver); expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils); 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 cc3e5d29bf4..3ad340ee829 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; @@ -61,7 +61,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -121,7 +120,7 @@ public class InjectorForReplWithJava { private final SingleModuleClassResolver singleModuleClassResolver; private final JavaLazyAnalyzerPostConstruct javaLazyAnalyzerPostConstruct; private final JavaFlexibleTypeCapabilitiesProvider javaFlexibleTypeCapabilitiesProvider; - private final JavaDeclarationCheckerProvider javaDeclarationCheckerProvider; + private final KotlinJvmCheckerProvider kotlinJvmCheckerProvider; private final AdditionalFileScopeProvider additionalFileScopeProvider; private final AnnotationResolver annotationResolver; private final CallResolver callResolver; @@ -139,7 +138,6 @@ public class InjectorForReplWithJava { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -207,7 +205,7 @@ public class InjectorForReplWithJava { this.mutablePackageFragmentProvider = new MutablePackageFragmentProvider(module); this.javaLazyAnalyzerPostConstruct = new JavaLazyAnalyzerPostConstruct(); this.javaFlexibleTypeCapabilitiesProvider = new JavaFlexibleTypeCapabilitiesProvider(); - this.javaDeclarationCheckerProvider = JavaDeclarationCheckerProvider.INSTANCE$; + this.kotlinJvmCheckerProvider = KotlinJvmCheckerProvider.INSTANCE$; this.additionalFileScopeProvider = additionalFileScopeProvider; this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); @@ -225,7 +223,6 @@ public class InjectorForReplWithJava { this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, javaFlexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -236,7 +233,7 @@ public class InjectorForReplWithJava { this.bodyResolver = new BodyResolver(); this.controlFlowAnalyzer = new ControlFlowAnalyzer(); this.declarationsChecker = new DeclarationsChecker(); - this.modifiersChecker = new ModifiersChecker(bindingTrace, javaDeclarationCheckerProvider); + this.modifiersChecker = new ModifiersChecker(bindingTrace, kotlinJvmCheckerProvider); this.functionAnalyzerExtension = new FunctionAnalyzerExtension(); this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); @@ -306,12 +303,11 @@ public class InjectorForReplWithJava { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); - expressionTypingComponents.setAdditionalCheckerProvider(javaDeclarationCheckerProvider); + expressionTypingComponents.setAdditionalCheckerProvider(kotlinJvmCheckerProvider); expressionTypingComponents.setBuiltIns(kotlinBuiltIns); expressionTypingComponents.setCallResolver(callResolver); expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils); 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 dbcad59102b..616d231f312 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -60,7 +60,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -121,7 +120,7 @@ public class InjectorForTopDownAnalyzerForJvm { private final SingleModuleClassResolver singleModuleClassResolver; private final JavaLazyAnalyzerPostConstruct javaLazyAnalyzerPostConstruct; private final JavaFlexibleTypeCapabilitiesProvider javaFlexibleTypeCapabilitiesProvider; - private final JavaDeclarationCheckerProvider javaDeclarationCheckerProvider; + private final KotlinJvmCheckerProvider kotlinJvmCheckerProvider; private final AnnotationResolver annotationResolver; private final CallResolver callResolver; private final ArgumentTypeResolver argumentTypeResolver; @@ -138,7 +137,6 @@ public class InjectorForTopDownAnalyzerForJvm { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -206,7 +204,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.mutablePackageFragmentProvider = new MutablePackageFragmentProvider(module); this.javaLazyAnalyzerPostConstruct = new JavaLazyAnalyzerPostConstruct(); this.javaFlexibleTypeCapabilitiesProvider = new JavaFlexibleTypeCapabilitiesProvider(); - this.javaDeclarationCheckerProvider = JavaDeclarationCheckerProvider.INSTANCE$; + this.kotlinJvmCheckerProvider = KotlinJvmCheckerProvider.INSTANCE$; this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); this.argumentTypeResolver = new ArgumentTypeResolver(); @@ -223,7 +221,6 @@ public class InjectorForTopDownAnalyzerForJvm { this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, javaFlexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -235,7 +232,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.bodyResolver = new BodyResolver(); this.controlFlowAnalyzer = new ControlFlowAnalyzer(); this.declarationsChecker = new DeclarationsChecker(); - this.modifiersChecker = new ModifiersChecker(bindingTrace, javaDeclarationCheckerProvider); + this.modifiersChecker = new ModifiersChecker(bindingTrace, kotlinJvmCheckerProvider); this.functionAnalyzerExtension = new FunctionAnalyzerExtension(); this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); @@ -305,12 +302,11 @@ public class InjectorForTopDownAnalyzerForJvm { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); - expressionTypingComponents.setAdditionalCheckerProvider(javaDeclarationCheckerProvider); + expressionTypingComponents.setAdditionalCheckerProvider(kotlinJvmCheckerProvider); expressionTypingComponents.setBuiltIns(kotlinBuiltIns); expressionTypingComponents.setCallResolver(callResolver); expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index 4273b32989c..131b6f67aa8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -43,7 +43,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; @@ -86,7 +85,6 @@ public class InjectorForBodyResolve { private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; private final TaskPrioritizer taskPrioritizer; @@ -131,7 +129,6 @@ public class InjectorForBodyResolve { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); this.taskPrioritizer = new TaskPrioritizer(storageManager); @@ -171,7 +168,6 @@ public class InjectorForBodyResolve { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index f49307d9792..59f3acdda2f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -44,7 +44,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -99,7 +98,6 @@ public class InjectorForLazyBodyResolve { private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -156,7 +154,6 @@ public class InjectorForLazyBodyResolve { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -217,7 +214,6 @@ public class InjectorForLazyBodyResolve { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index 7ced8c0b7c0..0a9b862e4dc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -43,7 +43,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -86,7 +85,6 @@ public class InjectorForLazyResolve { private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -132,7 +130,6 @@ public class InjectorForLazyResolve { this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazyResolveToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -170,7 +167,6 @@ public class InjectorForLazyResolve { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index a19f827ddcd..5ee62d3d4e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; -import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider.Empty; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider.DefaultProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -44,7 +44,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -84,7 +83,7 @@ public class InjectorForLazyTopDownAnalyzerBasic { private final DeclarationProviderFactory declarationProviderFactory; private final ResolveSession resolveSession; private final LazyTopDownAnalyzer lazyTopDownAnalyzer; - private final Empty empty; + private final DefaultProvider defaultProvider; private final AnnotationResolver annotationResolver; private final CallResolver callResolver; private final ArgumentTypeResolver argumentTypeResolver; @@ -102,7 +101,6 @@ public class InjectorForLazyTopDownAnalyzerBasic { private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -143,7 +141,7 @@ public class InjectorForLazyTopDownAnalyzerBasic { this.declarationProviderFactory = declarationProviderFactory; this.resolveSession = new ResolveSession(project, globalContext, module, declarationProviderFactory, bindingTrace); this.lazyTopDownAnalyzer = new LazyTopDownAnalyzer(); - this.empty = Empty.INSTANCE$; + this.defaultProvider = DefaultProvider.INSTANCE$; this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); this.argumentTypeResolver = new ArgumentTypeResolver(); @@ -161,7 +159,6 @@ public class InjectorForLazyTopDownAnalyzerBasic { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -173,7 +170,7 @@ public class InjectorForLazyTopDownAnalyzerBasic { this.bodyResolver = new BodyResolver(); this.controlFlowAnalyzer = new ControlFlowAnalyzer(); this.declarationsChecker = new DeclarationsChecker(); - this.modifiersChecker = new ModifiersChecker(bindingTrace, empty); + this.modifiersChecker = new ModifiersChecker(bindingTrace, defaultProvider); this.functionAnalyzerExtension = new FunctionAnalyzerExtension(); this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); @@ -223,12 +220,11 @@ public class InjectorForLazyTopDownAnalyzerBasic { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); - expressionTypingComponents.setAdditionalCheckerProvider(empty); + expressionTypingComponents.setAdditionalCheckerProvider(defaultProvider); expressionTypingComponents.setBuiltIns(kotlinBuiltIns); expressionTypingComponents.setCallResolver(callResolver); expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index 135f55eaf32..f7d2e2cfd6a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; -import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider.Empty; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider.DefaultProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; @@ -35,7 +35,6 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; -import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; @@ -61,7 +60,7 @@ public class InjectorForMacros { private final CallResolver callResolver; private final GlobalContext globalContext; private final StorageManager storageManager; - private final Empty empty; + private final DefaultProvider defaultProvider; private final AnnotationResolver annotationResolver; private final TypeResolver typeResolver; private final QualifiedExpressionResolver qualifiedExpressionResolver; @@ -71,7 +70,6 @@ public class InjectorForMacros { private final CallExpressionResolver callExpressionResolver; private final DescriptorResolver descriptorResolver; private final DelegatedPropertyResolver delegatedPropertyResolver; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final ControlStructureTypingUtils controlStructureTypingUtils; private final ExpressionTypingUtils expressionTypingUtils; @@ -95,7 +93,7 @@ public class InjectorForMacros { this.callResolver = new CallResolver(); this.globalContext = org.jetbrains.kotlin.context.ContextPackage.GlobalContext(); this.storageManager = globalContext.getStorageManager(); - this.empty = Empty.INSTANCE$; + this.defaultProvider = DefaultProvider.INSTANCE$; this.annotationResolver = new AnnotationResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); @@ -105,7 +103,6 @@ public class InjectorForMacros { this.callExpressionResolver = new CallExpressionResolver(); this.descriptorResolver = new DescriptorResolver(); this.delegatedPropertyResolver = new DelegatedPropertyResolver(); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.controlStructureTypingUtils = new ControlStructureTypingUtils(getExpressionTypingServices()); this.expressionTypingUtils = new ExpressionTypingUtils(getExpressionTypingServices(), getCallResolver(), kotlinBuiltIns); @@ -121,12 +118,11 @@ public class InjectorForMacros { this.expressionTypingServices.setCallExpressionResolver(callExpressionResolver); this.expressionTypingServices.setCallResolver(callResolver); this.expressionTypingServices.setDescriptorResolver(descriptorResolver); - this.expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); this.expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); this.expressionTypingServices.setProject(project); this.expressionTypingServices.setTypeResolver(typeResolver); - this.expressionTypingComponents.setAdditionalCheckerProvider(empty); + this.expressionTypingComponents.setAdditionalCheckerProvider(defaultProvider); this.expressionTypingComponents.setBuiltIns(kotlinBuiltIns); this.expressionTypingComponents.setCallResolver(callResolver); this.expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index 425f37f53b2..688680c17c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -44,7 +44,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -97,7 +96,6 @@ public class InjectorForTopDownAnalyzerBasic { private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -152,7 +150,6 @@ public class InjectorForTopDownAnalyzerBasic { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, getModuleDescriptor(), flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -210,7 +207,6 @@ public class InjectorForTopDownAnalyzerBasic { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 041c1227a27..bef9064efb9 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; -import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmCheckerProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -40,7 +40,6 @@ import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; @@ -62,7 +61,7 @@ public class InjectorForTests { private final TypeResolver typeResolver; private final GlobalContext globalContext; private final StorageManager storageManager; - private final JavaDeclarationCheckerProvider javaDeclarationCheckerProvider; + private final KotlinJvmCheckerProvider kotlinJvmCheckerProvider; private final AnnotationResolver annotationResolver; private final CallResolver callResolver; private final ArgumentTypeResolver argumentTypeResolver; @@ -76,7 +75,6 @@ public class InjectorForTests { private final ForLoopConventionsChecker forLoopConventionsChecker; private final ReflectionTypes reflectionTypes; private final CallExpressionResolver callExpressionResolver; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; @@ -103,7 +101,7 @@ public class InjectorForTests { this.lazinessToken = new LazinessToken(); this.dynamicTypesSettings = new DynamicTypesSettings(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, moduleDescriptor, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesSettings); - this.javaDeclarationCheckerProvider = JavaDeclarationCheckerProvider.INSTANCE$; + this.kotlinJvmCheckerProvider = KotlinJvmCheckerProvider.INSTANCE$; this.argumentTypeResolver = new ArgumentTypeResolver(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -113,7 +111,6 @@ public class InjectorForTests { this.forLoopConventionsChecker = new ForLoopConventionsChecker(); this.reflectionTypes = new ReflectionTypes(moduleDescriptor); this.callExpressionResolver = new CallExpressionResolver(); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.descriptorResolver.setAnnotationResolver(annotationResolver); @@ -128,7 +125,6 @@ public class InjectorForTests { this.expressionTypingServices.setCallExpressionResolver(callExpressionResolver); this.expressionTypingServices.setCallResolver(callResolver); this.expressionTypingServices.setDescriptorResolver(descriptorResolver); - this.expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); this.expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); this.expressionTypingServices.setProject(project); this.expressionTypingServices.setTypeResolver(typeResolver); @@ -154,7 +150,7 @@ public class InjectorForTests { delegatedPropertyResolver.setCallResolver(callResolver); delegatedPropertyResolver.setExpressionTypingServices(expressionTypingServices); - expressionTypingComponents.setAdditionalCheckerProvider(javaDeclarationCheckerProvider); + expressionTypingComponents.setAdditionalCheckerProvider(kotlinJvmCheckerProvider); expressionTypingComponents.setBuiltIns(kotlinBuiltIns); expressionTypingComponents.setCallResolver(callResolver); expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils); 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 37eb269b741..edc8dc61ac6 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; -import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; +import org.jetbrains.kotlin.js.resolve.KotlinJsCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; @@ -45,7 +45,6 @@ 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.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -85,7 +84,7 @@ public class InjectorForTopDownAnalyzerForJs { private final ResolveSession resolveSession; private final LazyTopDownAnalyzer lazyTopDownAnalyzer; private final MutablePackageFragmentProvider mutablePackageFragmentProvider; - private final KotlinJsDeclarationCheckerProvider kotlinJsDeclarationCheckerProvider; + private final KotlinJsCheckerProvider kotlinJsCheckerProvider; private final DynamicTypesAllowed dynamicTypesAllowed; private final AnnotationResolver annotationResolver; private final CallResolver callResolver; @@ -103,7 +102,6 @@ public class InjectorForTopDownAnalyzerForJs { private final QualifiedExpressionResolver qualifiedExpressionResolver; private final FlexibleTypeCapabilitiesProvider flexibleTypeCapabilitiesProvider; private final LazinessToken lazinessToken; - private final CallResolverExtensionProvider callResolverExtensionProvider; private final PartialBodyResolveProvider partialBodyResolveProvider; private final CallCompleter callCompleter; private final CandidateResolver candidateResolver; @@ -144,7 +142,7 @@ public class InjectorForTopDownAnalyzerForJs { this.resolveSession = new ResolveSession(project, globalContext, module, declarationProviderFactory, bindingTrace); this.lazyTopDownAnalyzer = new LazyTopDownAnalyzer(); this.mutablePackageFragmentProvider = new MutablePackageFragmentProvider(module); - this.kotlinJsDeclarationCheckerProvider = KotlinJsDeclarationCheckerProvider.INSTANCE$; + this.kotlinJsCheckerProvider = KotlinJsCheckerProvider.INSTANCE$; this.dynamicTypesAllowed = new DynamicTypesAllowed(); this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); @@ -162,7 +160,6 @@ public class InjectorForTopDownAnalyzerForJs { this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); this.lazinessToken = new LazinessToken(); this.typeResolver = new TypeResolver(annotationResolver, qualifiedExpressionResolver, module, flexibleTypeCapabilitiesProvider, storageManager, lazinessToken, dynamicTypesAllowed); - this.callResolverExtensionProvider = new CallResolverExtensionProvider(); this.partialBodyResolveProvider = new PartialBodyResolveProvider(); this.candidateResolver = new CandidateResolver(); this.callCompleter = new CallCompleter(argumentTypeResolver, candidateResolver); @@ -174,7 +171,7 @@ public class InjectorForTopDownAnalyzerForJs { this.bodyResolver = new BodyResolver(); this.controlFlowAnalyzer = new ControlFlowAnalyzer(); this.declarationsChecker = new DeclarationsChecker(); - this.modifiersChecker = new ModifiersChecker(bindingTrace, kotlinJsDeclarationCheckerProvider); + this.modifiersChecker = new ModifiersChecker(bindingTrace, kotlinJsCheckerProvider); this.functionAnalyzerExtension = new FunctionAnalyzerExtension(); this.declarationResolver = new DeclarationResolver(); this.importsResolver = new ImportsResolver(); @@ -223,12 +220,11 @@ public class InjectorForTopDownAnalyzerForJs { expressionTypingServices.setCallExpressionResolver(callExpressionResolver); expressionTypingServices.setCallResolver(callResolver); expressionTypingServices.setDescriptorResolver(descriptorResolver); - expressionTypingServices.setExtensionProvider(callResolverExtensionProvider); expressionTypingServices.setPartialBodyResolveProvider(partialBodyResolveProvider); expressionTypingServices.setProject(project); expressionTypingServices.setTypeResolver(typeResolver); - expressionTypingComponents.setAdditionalCheckerProvider(kotlinJsDeclarationCheckerProvider); + expressionTypingComponents.setAdditionalCheckerProvider(kotlinJsCheckerProvider); expressionTypingComponents.setBuiltIns(kotlinBuiltIns); expressionTypingComponents.setCallResolver(callResolver); expressionTypingComponents.setControlStructureTypingUtils(controlStructureTypingUtils);