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

UsageCollector -> LookupTracker

Browse Source
This commit is contained in:
Zalim Bashorov
2015-08-04 21:53:36 +03:00
parent 7125989c69
commit 96696c6846
12 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/di/injection.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.container.*
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.frontend.di.configureModule
import org.jetbrains.kotlin.frontend.java.di.configureJavaTopDownAnalysis
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver
import org.jetbrains.kotlin.resolve.BindingTrace
@@ -40,7 +40,7 @@ public fun createContainerForReplWithJava(
moduleContentScope: GlobalSearchScope, additionalFileScopeProvider: FileScopeProvider.AdditionalScopes
): ContainerForReplWithJava = createContainer("ReplWithJava") {
configureModule(moduleContext, JvmPlatform, bindingTrace)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, UsageCollector.DO_NOTHING)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, LookupTracker.DO_NOTHING)
useInstance(additionalFileScopeProvider)
useInstance(declarationProviderFactory)
compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt
+6 -6
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.container.*
import org.jetbrains.kotlin.context.LazyResolveToken
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.frontend.di.configureModule
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider
import org.jetbrains.kotlin.load.java.components.*
@@ -45,9 +45,9 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
import org.jetbrains.kotlin.synthetic.AdditionalScopesWithJavaSyntheticExtensions
public fun StorageComponentContainer.configureJavaTopDownAnalysis(moduleContentScope: GlobalSearchScope, project: Project, usageCollector: UsageCollector) {
public fun StorageComponentContainer.configureJavaTopDownAnalysis(moduleContentScope: GlobalSearchScope, project: Project, lookupTracker: LookupTracker) {
useInstance(moduleContentScope)
useInstance(usageCollector)
useInstance(lookupTracker)
useImpl<ResolveSession>()
useImpl<LazyTopDownAnalyzer>()
@@ -75,7 +75,7 @@ public fun createContainerForLazyResolveWithJava(
moduleContentScope: GlobalSearchScope, moduleClassResolver: ModuleClassResolver
): Pair<ResolveSession, JavaDescriptorResolver> = createContainer("LazyResolveWithJava") {
configureModule(moduleContext, JvmPlatform, bindingTrace)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, UsageCollector.DO_NOTHING)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, LookupTracker.DO_NOTHING)
useInstance(moduleClassResolver)
@@ -95,10 +95,10 @@ public fun createContainerForTopDownAnalyzerForJvm(
bindingTrace: BindingTrace,
declarationProviderFactory: DeclarationProviderFactory,
moduleContentScope: GlobalSearchScope,
usageCollector: UsageCollector
lookupTracker: LookupTracker
): ContainerForTopDownAnalyzerForJvm = createContainer("TopDownAnalyzerForJvm") {
configureModule(moduleContext, JvmPlatform, bindingTrace)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, usageCollector)
configureJavaTopDownAnalysis(moduleContentScope, moduleContext.project, lookupTracker)
useInstance(declarationProviderFactory)
useInstance(BodyResolveCache.ThrowException)
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/components/IncrementalCompilationComponents.kt
+2 -2
View File
@@ -16,9 +16,9 @@
package org.jetbrains.kotlin.load.kotlin.incremental.components
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
public interface IncrementalCompilationComponents {
public fun getIncrementalCache(moduleId: String): IncrementalCache
public fun getUsageCollector(): UsageCollector
public fun getLookupTracker(): LookupTracker
}
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
+4 -4
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.descriptors.ModuleParameters;
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
import org.jetbrains.kotlin.frontend.java.di.ContainerForTopDownAnalyzerForJvm;
import org.jetbrains.kotlin.frontend.java.di.DiPackage;
import org.jetbrains.kotlin.incremental.components.UsageCollector;
import org.jetbrains.kotlin.incremental.components.LookupTracker;
import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider;
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache;
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents;
@@ -124,15 +124,15 @@ public enum TopDownAnalyzerFacadeForJVM {
FileBasedDeclarationProviderFactory providerFactory =
new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(), allFiles);
UsageCollector usageCollector =
incrementalCompilationComponents != null ? incrementalCompilationComponents.getUsageCollector() : UsageCollector.DO_NOTHING;
LookupTracker lookupTracker =
incrementalCompilationComponents != null ? incrementalCompilationComponents.getLookupTracker() : LookupTracker.DO_NOTHING;
ContainerForTopDownAnalyzerForJvm container = DiPackage.createContainerForTopDownAnalyzerForJvm(
moduleContext,
trace,
providerFactory,
GlobalSearchScope.allScope(project),
usageCollector
lookupTracker
);
List<PackageFragmentProvider> additionalProviders = new ArrayList<PackageFragmentProvider>();
compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt
+2 -3
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.container.*
import org.jetbrains.kotlin.context.LazyResolveToken
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.calls.CallResolver
import org.jetbrains.kotlin.resolve.lazy.FileScopeProvider
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
import org.jetbrains.kotlin.resolve.lazy.NoTopLevelDescriptorProvider
import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
import org.jetbrains.kotlin.types.DynamicTypesSettings
import org.jetbrains.kotlin.types.expressions.*
public fun StorageComponentContainer.configureModule(
@@ -107,7 +106,7 @@ private fun createContainerForLazyResolve(
configureModule(moduleContext, platform, bindingTrace)
useInstance(declarationProviderFactory)
useInstance(UsageCollector.DO_NOTHING)
useInstance(LookupTracker.DO_NOTHING)
useImpl<LazyResolveToken>()
useImpl<ResolveSession>()
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyClassContext.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.resolve.lazy
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.resolve.*
import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
import org.jetbrains.kotlin.storage.StorageManager
@@ -33,5 +33,5 @@ public interface LazyClassContext {
val typeResolver: TypeResolver
val declarationProviderFactory: DeclarationProviderFactory
val annotationResolver: AnnotationResolver
val usageCollector: UsageCollector
val lookupTracker: LookupTracker
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
+6 -6
View File
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.kotlin.context.GlobalContext;
import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.descriptors.annotations.Annotations;
import org.jetbrains.kotlin.incremental.components.UsageCollector;
import org.jetbrains.kotlin.incremental.components.LookupTracker;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.psi.*;
@@ -76,7 +76,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
private LazyDeclarationResolver lazyDeclarationResolver;
private FileScopeProvider fileScopeProvider;
private DeclarationScopeProvider declarationScopeProvider;
private UsageCollector usageCollector;
private LookupTracker lookupTracker;
@Inject
public void setJetImportFactory(JetImportsFactory jetImportFactory) {
@@ -129,8 +129,8 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
}
@Inject
public void setUsageCollector(@NotNull UsageCollector usageCollector) {
this.usageCollector = usageCollector;
public void setLookupTracker(@NotNull LookupTracker lookupTracker) {
this.lookupTracker = lookupTracker;
}
// Only calls from injectors expected
@@ -411,7 +411,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext {
@NotNull
@Override
public UsageCollector getUsageCollector() {
return usageCollector;
public LookupTracker getLookupTracker() {
return lookupTracker;
}
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.kt
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.frontend.di.createContainerForLazyLocalClassifierAnalyzer
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetClassOrObject
import org.jetbrains.kotlin.psi.debugText.getDebugText
@@ -130,7 +130,7 @@ class LocalClassDescriptorHolder(
}
override val annotationResolver = this@LocalClassDescriptorHolder.annotationResolver
override val usageCollector: UsageCollector = UsageCollector.DO_NOTHING
override val lookupTracker: LookupTracker = LookupTracker.DO_NOTHING
}
,
containingDeclaration,
compiler/tests/org/jetbrains/kotlin/serialization/AbstractLocalClassProtoTest.kt
+2 -2
View File
@@ -22,10 +22,10 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime
import org.jetbrains.kotlin.frontend.java.di.createContainerForTopDownAnalyzerForJvm
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.load.java.structure.reflect.classId
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM
import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
import org.jetbrains.kotlin.test.*
@@ -58,7 +58,7 @@ public abstract class AbstractLocalClassProtoTest : TestCaseWithTmpdir() {
val container = createContainerForTopDownAnalyzerForJvm(
moduleContext, CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(),
providerFactory, GlobalSearchScope.allScope(environment.project), UsageCollector.DO_NOTHING
providerFactory, GlobalSearchScope.allScope(environment.project), LookupTracker.DO_NOTHING
)
moduleContext.initializeModuleContents(container.javaDescriptorResolver.packageFragmentProvider)
core/descriptors/src/org/jetbrains/kotlin/incremental/components/UsageCollector.kt → core/descriptors/src/org/jetbrains/kotlin/incremental/components/LookupTracker.kt
+2 -2
View File
@@ -16,8 +16,8 @@
package org.jetbrains.kotlin.incremental.components
public interface UsageCollector {
public interface LookupTracker {
companion object {
val DO_NOTHING = object : UsageCollector {}
val DO_NOTHING = object : LookupTracker {}
}
}
jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt
+2 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.jps.incremental
import org.jetbrains.jps.incremental.ModuleBuildTarget
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents
@@ -28,5 +28,5 @@ public class IncrementalCompilationComponentsImpl(caches: Map<ModuleBuildTarget,
return idToCache[moduleId]!!
}
override fun getUsageCollector(): UsageCollector = UsageCollector.DO_NOTHING
override fun getLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING
}
js/js.frontend/src/org/jetbrains/kotlin/frontend/js/di/injection.kt
+2 -2
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.container.useImpl
import org.jetbrains.kotlin.container.useInstance
import org.jetbrains.kotlin.context.ModuleContext
import org.jetbrains.kotlin.frontend.di.configureModule
import org.jetbrains.kotlin.incremental.components.UsageCollector
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.js.resolve.JsPlatform
import org.jetbrains.kotlin.resolve.BindingTrace
import org.jetbrains.kotlin.resolve.BodyResolveCache
@@ -43,7 +43,7 @@ public fun createTopDownAnalyzerForJs(
useInstance(declarationProviderFactory)
useImpl<FileScopeProviderImpl>()
useInstance(BodyResolveCache.ThrowException)
useInstance(UsageCollector.DO_NOTHING)
useInstance(LookupTracker.DO_NOTHING)
useImpl<ResolveSession>()
useImpl<LazyTopDownAnalyzerForTopLevel>()
}