LookupTracker.DO_NOTHING is the default implementation of LookupTracker
This commit is contained in:
@@ -85,7 +85,6 @@ fun createContainerForBodyResolve(
|
||||
|
||||
useInstance(statementFilter)
|
||||
|
||||
useInstance(LookupTracker.DO_NOTHING)
|
||||
useInstance(BodyResolveCache.ThrowException)
|
||||
useInstance(languageVersionSettings)
|
||||
useImpl<AnnotationResolverImpl>()
|
||||
@@ -104,7 +103,6 @@ fun createContainerForLazyBodyResolve(
|
||||
): StorageComponentContainer = createContainer("LazyBodyResolve", platform) {
|
||||
configureModule(moduleContext, platform, targetPlatformVersion, bindingTrace)
|
||||
|
||||
useInstance(LookupTracker.DO_NOTHING)
|
||||
useInstance(kotlinCodeAnalyzer)
|
||||
useInstance(kotlinCodeAnalyzer.fileScopeProvider)
|
||||
useInstance(bodyResolveCache)
|
||||
@@ -157,7 +155,6 @@ fun createContainerForLazyResolve(
|
||||
configureModule(moduleContext, platform, targetPlatformVersion, bindingTrace)
|
||||
|
||||
useInstance(declarationProviderFactory)
|
||||
useInstance(LookupTracker.DO_NOTHING)
|
||||
useInstance(languageVersionSettings)
|
||||
|
||||
useImpl<AnnotationResolverImpl>()
|
||||
|
||||
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.container.useInstance
|
||||
import org.jetbrains.kotlin.context.ModuleContext
|
||||
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||
import org.jetbrains.kotlin.frontend.di.configureModule
|
||||
import org.jetbrains.kotlin.incremental.components.LookupTracker
|
||||
import org.jetbrains.kotlin.resolve.*
|
||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
||||
import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices
|
||||
@@ -35,7 +34,6 @@ import org.jetbrains.kotlin.types.expressions.FakeCallResolver
|
||||
fun createContainerForTests(project: Project, module: ModuleDescriptor): ContainerForTests {
|
||||
return ContainerForTests(createContainer("Tests", JvmPlatform) {
|
||||
configureModule(ModuleContext(module, project), JvmPlatform, JvmTarget.JVM_1_6)
|
||||
useInstance(LookupTracker.DO_NOTHING)
|
||||
useInstance(LanguageVersionSettingsImpl.DEFAULT)
|
||||
useImpl<AnnotationResolverImpl>()
|
||||
useImpl<ExpressionTypingServices>()
|
||||
|
||||
@@ -16,8 +16,10 @@
|
||||
|
||||
package org.jetbrains.kotlin.incremental.components
|
||||
|
||||
import org.jetbrains.kotlin.container.DefaultImplementation
|
||||
import java.io.Serializable
|
||||
|
||||
@DefaultImplementation(LookupTracker.DO_NOTHING::class)
|
||||
interface LookupTracker {
|
||||
// used in tests for more accurate checks
|
||||
val requiresPosition: Boolean
|
||||
@@ -30,13 +32,11 @@ interface LookupTracker {
|
||||
name: String
|
||||
)
|
||||
|
||||
companion object {
|
||||
val DO_NOTHING: LookupTracker = object : LookupTracker {
|
||||
override val requiresPosition: Boolean
|
||||
get() = false
|
||||
object DO_NOTHING : LookupTracker {
|
||||
override val requiresPosition: Boolean
|
||||
get() = false
|
||||
|
||||
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
|
||||
}
|
||||
override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ class MetadataPackageFragmentProvider(
|
||||
this,
|
||||
LocalClassifierTypeSettings.Default,
|
||||
ErrorReporter.DO_NOTHING,
|
||||
LookupTracker.Companion.DO_NOTHING,
|
||||
LookupTracker.DO_NOTHING,
|
||||
FlexibleTypeDeserializer.ThrowException,
|
||||
emptyList(),
|
||||
notFoundClasses, AdditionalClassPartsProvider.None, PlatformDependentDeclarationFilter.All
|
||||
|
||||
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.container.useInstance
|
||||
import org.jetbrains.kotlin.context.ModuleContext
|
||||
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
|
||||
import org.jetbrains.kotlin.frontend.di.configureModule
|
||||
import org.jetbrains.kotlin.incremental.components.LookupTracker
|
||||
import org.jetbrains.kotlin.js.resolve.JsPlatform
|
||||
import org.jetbrains.kotlin.resolve.*
|
||||
import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer
|
||||
@@ -45,7 +44,6 @@ fun createTopDownAnalyzerForJs(
|
||||
|
||||
CompilerEnvironment.configure(this)
|
||||
|
||||
useInstance(LookupTracker.DO_NOTHING)
|
||||
useInstance(languageVersionSettings)
|
||||
useImpl<ResolveSession>()
|
||||
useImpl<LazyTopDownAnalyzer>()
|
||||
|
||||
Reference in New Issue
Block a user