Rename. LocalClassDescriptorManager -> LocalClassDescriptorHolder

compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyLocalClassifierAnalyzer.java

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
 import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider;
 import org.jetbrains.kotlin.types.DynamicTypesSettings;
-import org.jetbrains.kotlin.types.expressions.LocalClassDescriptorManager;
+import org.jetbrains.kotlin.types.expressions.LocalClassDescriptorHolder;
 import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer;
 import org.jetbrains.kotlin.resolve.lazy.NoTopLevelDescriptorProvider;
 import org.jetbrains.kotlin.resolve.lazy.NoFileScopeProvider;
@@ -78,7 +78,7 @@ public class InjectorForLazyLocalClassifierAnalyzer {
     private final PlatformToKotlinClassMap platformToKotlinClassMap;
     private final AdditionalCheckerProvider additionalCheckerProvider;
     private final DynamicTypesSettings dynamicTypesSettings;
-    private final LocalClassDescriptorManager localClassDescriptorManager;
+    private final LocalClassDescriptorHolder localClassDescriptorHolder;
     private final LazyTopDownAnalyzer lazyTopDownAnalyzer;
     private final NoTopLevelDescriptorProvider noTopLevelDescriptorProvider;
     private final NoFileScopeProvider noFileScopeProvider;
@@ -123,7 +123,7 @@ public class InjectorForLazyLocalClassifierAnalyzer {
         @NotNull ModuleDescriptor module,
         @NotNull AdditionalCheckerProvider additionalCheckerProvider,
         @NotNull DynamicTypesSettings dynamicTypesSettings,
-        @NotNull LocalClassDescriptorManager localClassDescriptorManager
+        @NotNull LocalClassDescriptorHolder localClassDescriptorHolder
     ) {
         this.project = project;
         this.globalContext = globalContext;
@@ -134,12 +134,12 @@ public class InjectorForLazyLocalClassifierAnalyzer {
         this.platformToKotlinClassMap = module.getPlatformToKotlinClassMap();
         this.additionalCheckerProvider = additionalCheckerProvider;
         this.dynamicTypesSettings = dynamicTypesSettings;
-        this.localClassDescriptorManager = localClassDescriptorManager;
+        this.localClassDescriptorHolder = localClassDescriptorHolder;
         this.lazyTopDownAnalyzer = new LazyTopDownAnalyzer();
         this.noTopLevelDescriptorProvider = NoTopLevelDescriptorProvider.INSTANCE$;
         this.noFileScopeProvider = NoFileScopeProvider.INSTANCE$;
-        this.localLazyDeclarationResolver = new LocalLazyDeclarationResolver(globalContext, bindingTrace, localClassDescriptorManager);
-        this.declarationScopeProviderForLocalClassifierAnalyzer = new DeclarationScopeProviderForLocalClassifierAnalyzer(localLazyDeclarationResolver, localClassDescriptorManager);
+        this.localLazyDeclarationResolver = new LocalLazyDeclarationResolver(globalContext, bindingTrace, localClassDescriptorHolder);
+        this.declarationScopeProviderForLocalClassifierAnalyzer = new DeclarationScopeProviderForLocalClassifierAnalyzer(localLazyDeclarationResolver, localClassDescriptorHolder);
         this.bodyResolver = new BodyResolver();
         this.annotationResolver = new AnnotationResolver();
         this.callResolver = new CallResolver();

compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt

@@ -80,7 +80,7 @@ public class LocalClassifierAnalyzer(
                 moduleDescriptor,
                 additionalCheckerProvider,
                 dynamicTypesSettings,
-                LocalClassDescriptorManager(
+                LocalClassDescriptorHolder(
                         scope,
                         classOrObject,
                         containingDeclaration,
@@ -101,7 +101,7 @@ public class LocalClassifierAnalyzer(
     }
 }
 
-class LocalClassDescriptorManager(
+class LocalClassDescriptorHolder(
         val writableScope: WritableScope?,
         val myClass: JetClassOrObject,
         val containingDeclaration: DeclarationDescriptor,
@@ -124,11 +124,11 @@ class LocalClassDescriptorManager(
             classDescriptor = LazyClassDescriptor(
                     object : LazyClassContext {
                         override val scopeProvider = declarationScopeProvider
-                        override val storageManager = this@LocalClassDescriptorManager.storageManager
+                        override val storageManager = this@LocalClassDescriptorHolder.storageManager
                         override val trace = expressionTypingContext.trace
-                        override val moduleDescriptor = this@LocalClassDescriptorManager.moduleDescriptor
-                        override val descriptorResolver = this@LocalClassDescriptorManager.descriptorResolver
-                        override val typeResolver = this@LocalClassDescriptorManager.typeResolver
+                        override val moduleDescriptor = this@LocalClassDescriptorHolder.moduleDescriptor
+                        override val descriptorResolver = this@LocalClassDescriptorHolder.descriptorResolver
+                        override val typeResolver = this@LocalClassDescriptorHolder.typeResolver
                         override val declarationProviderFactory = object : DeclarationProviderFactory {
                             override fun getClassMemberDeclarationProvider(classLikeInfo: JetClassLikeInfo): ClassMemberDeclarationProvider {
                                 return PsiBasedClassMemberDeclarationProvider(storageManager, classLikeInfo)
@@ -139,7 +139,7 @@ class LocalClassDescriptorManager(
                             }
 
                         }
-                        override val annotationResolver = this@LocalClassDescriptorManager.annotationResolver
+                        override val annotationResolver = this@LocalClassDescriptorHolder.annotationResolver
                     }
                     ,
                     containingDeclaration,
@@ -161,7 +161,7 @@ class LocalClassDescriptorManager(
 class LocalLazyDeclarationResolver(
         globalContext: GlobalContext,
         trace: BindingTrace,
-        val localClassDescriptorManager: LocalClassDescriptorManager
+        val localClassDescriptorManager: LocalClassDescriptorHolder
 ) : LazyDeclarationResolver(globalContext, trace) {
 
     override fun getClassDescriptor(classOrObject: JetClassOrObject): ClassDescriptor {
@@ -175,7 +175,7 @@ class LocalLazyDeclarationResolver(
 
 class DeclarationScopeProviderForLocalClassifierAnalyzer(
         lazyDeclarationResolver: LazyDeclarationResolver,
-        val localClassDescriptorManager: LocalClassDescriptorManager
+        val localClassDescriptorManager: LocalClassDescriptorHolder
 ) : DeclarationScopeProviderImpl(lazyDeclarationResolver) {
     override fun getResolutionScopeForDeclaration(elementOfDeclaration: PsiElement): JetScope {
         if (localClassDescriptorManager.isMyClass(elementOfDeclaration)) {

generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt

@@ -50,7 +50,8 @@ import org.jetbrains.kotlin.types.DynamicTypesAllowed
 import org.jetbrains.kotlin.types.DynamicTypesSettings
 import org.jetbrains.kotlin.resolve.lazy.NoTopLevelDescriptorProvider
 import org.jetbrains.kotlin.resolve.lazy.NoFileScopeProvider
-import org.jetbrains.kotlin.types.expressions.LocalClassDescriptorManager
+import org.jetbrains.kotlin.types.expressions.LocalClassifierAnalyzer
+import org.jetbrains.kotlin.types.expressions.LocalClassDescriptorHolder
 import org.jetbrains.kotlin.types.expressions.DeclarationScopeProviderForLocalClassifierAnalyzer
 import org.jetbrains.kotlin.types.expressions.LocalLazyDeclarationResolver
 
@@ -102,7 +103,7 @@ private fun generatorForLazyLocalClassifierAnalyzer() =
             parameter<ModuleDescriptor>(name = "module", useAsContext = true)
             parameter<AdditionalCheckerProvider>()
             parameter<DynamicTypesSettings>()
-            parameter<LocalClassDescriptorManager>()
+            parameter<LocalClassDescriptorHolder>()
 
             publicField<LazyTopDownAnalyzer>()