Minor, pass CliSealedClassInheritorsProvider explicitly in some places
Do not use default parameter value for functions with only 1 or 2 call sites, since it doesn't add much value but provides a dangerous possibility to forget to pass the real implementation.
This commit is contained in:
@@ -33,10 +33,8 @@ import org.jetbrains.kotlin.platform.TargetPlatform
|
|||||||
import org.jetbrains.kotlin.platform.TargetPlatformVersion
|
import org.jetbrains.kotlin.platform.TargetPlatformVersion
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.resolve.SealedClassInheritorsProvider
|
import org.jetbrains.kotlin.resolve.SealedClassInheritorsProvider
|
||||||
import org.jetbrains.kotlin.resolve.CliSealedClassInheritorsProvider
|
|
||||||
import org.jetbrains.kotlin.storage.StorageManager
|
import org.jetbrains.kotlin.storage.StorageManager
|
||||||
import org.jetbrains.kotlin.storage.getValue
|
import org.jetbrains.kotlin.storage.getValue
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
class ResolverForModule(
|
class ResolverForModule(
|
||||||
val packageFragmentProvider: PackageFragmentProvider,
|
val packageFragmentProvider: PackageFragmentProvider,
|
||||||
@@ -122,7 +120,7 @@ abstract class ResolverForModuleFactory {
|
|||||||
moduleContent: ModuleContent<M>,
|
moduleContent: ModuleContent<M>,
|
||||||
resolverForProject: ResolverForProject<M>,
|
resolverForProject: ResolverForProject<M>,
|
||||||
languageVersionSettings: LanguageVersionSettings,
|
languageVersionSettings: LanguageVersionSettings,
|
||||||
sealedInheritorsProvider: SealedClassInheritorsProvider = CliSealedClassInheritorsProvider
|
sealedInheritorsProvider: SealedClassInheritorsProvider,
|
||||||
): ResolverForModule
|
): ResolverForModule
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-2
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.context.withModule
|
|||||||
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
|
||||||
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
|
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
|
import org.jetbrains.kotlin.resolve.CliSealedClassInheritorsProvider
|
||||||
|
|
||||||
class ResolverForSingleModuleProject<M : ModuleInfo>(
|
class ResolverForSingleModuleProject<M : ModuleInfo>(
|
||||||
debugName: String,
|
debugName: String,
|
||||||
@@ -59,6 +60,7 @@ class ResolverForSingleModuleProject<M : ModuleInfo>(
|
|||||||
projectContext.withModule(descriptor),
|
projectContext.withModule(descriptor),
|
||||||
modulesContent(moduleInfo),
|
modulesContent(moduleInfo),
|
||||||
this,
|
this,
|
||||||
languageVersionSettings
|
languageVersionSettings,
|
||||||
|
CliSealedClassInheritorsProvider,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ fun createContainerForBodyResolve(
|
|||||||
analyzerServices: PlatformDependentAnalyzerServices,
|
analyzerServices: PlatformDependentAnalyzerServices,
|
||||||
languageVersionSettings: LanguageVersionSettings,
|
languageVersionSettings: LanguageVersionSettings,
|
||||||
moduleStructureOracle: ModuleStructureOracle,
|
moduleStructureOracle: ModuleStructureOracle,
|
||||||
sealedProvider: SealedClassInheritorsProvider = CliSealedClassInheritorsProvider
|
sealedProvider: SealedClassInheritorsProvider,
|
||||||
): StorageComponentContainer = createContainer("BodyResolve", analyzerServices) {
|
): StorageComponentContainer = createContainer("BodyResolve", analyzerServices) {
|
||||||
configureModule(moduleContext, platform, analyzerServices, bindingTrace, languageVersionSettings, sealedProvider)
|
configureModule(moduleContext, platform, analyzerServices, bindingTrace, languageVersionSettings, sealedProvider)
|
||||||
|
|
||||||
@@ -158,7 +158,7 @@ fun createContainerForLazyBodyResolve(
|
|||||||
languageVersionSettings: LanguageVersionSettings,
|
languageVersionSettings: LanguageVersionSettings,
|
||||||
moduleStructureOracle: ModuleStructureOracle,
|
moduleStructureOracle: ModuleStructureOracle,
|
||||||
mainFunctionDetectorFactory: MainFunctionDetector.Factory,
|
mainFunctionDetectorFactory: MainFunctionDetector.Factory,
|
||||||
sealedProvider: SealedClassInheritorsProvider = CliSealedClassInheritorsProvider
|
sealedProvider: SealedClassInheritorsProvider,
|
||||||
): StorageComponentContainer = createContainer("LazyBodyResolve", analyzerServices) {
|
): StorageComponentContainer = createContainer("LazyBodyResolve", analyzerServices) {
|
||||||
configureModule(moduleContext, platform, analyzerServices, bindingTrace, languageVersionSettings, sealedProvider)
|
configureModule(moduleContext, platform, analyzerServices, bindingTrace, languageVersionSettings, sealedProvider)
|
||||||
useInstance(mainFunctionDetectorFactory)
|
useInstance(mainFunctionDetectorFactory)
|
||||||
|
|||||||
+4
-3
@@ -41,8 +41,9 @@ import org.jetbrains.kotlin.name.Name
|
|||||||
import org.jetbrains.kotlin.platform.TargetPlatform
|
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
|
import org.jetbrains.kotlin.resolve.CliSealedClassInheritorsProvider
|
||||||
import org.jetbrains.kotlin.resolve.CompilerEnvironment
|
import org.jetbrains.kotlin.resolve.CompilerEnvironment
|
||||||
|
import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
|
||||||
import org.jetbrains.kotlin.resolve.constants.EnumValue
|
import org.jetbrains.kotlin.resolve.constants.EnumValue
|
||||||
import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
|
import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
|
||||||
import org.jetbrains.kotlin.resolve.descriptorUtil.module
|
import org.jetbrains.kotlin.resolve.descriptorUtil.module
|
||||||
@@ -56,7 +57,6 @@ import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
|||||||
import org.jetbrains.kotlin.types.ErrorUtils
|
import org.jetbrains.kotlin.types.ErrorUtils
|
||||||
import org.junit.Assert
|
import org.junit.Assert
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.util.*
|
|
||||||
|
|
||||||
class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
|
class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
|
||||||
|
|
||||||
@@ -114,7 +114,8 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
|
|||||||
projectContext.withModule(descriptor),
|
projectContext.withModule(descriptor),
|
||||||
modulesContent(moduleInfo),
|
modulesContent(moduleInfo),
|
||||||
this,
|
this,
|
||||||
LanguageVersionSettingsImpl.DEFAULT
|
LanguageVersionSettingsImpl.DEFAULT,
|
||||||
|
CliSealedClassInheritorsProvider,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ class IdeaResolverForProject(
|
|||||||
moduleContent,
|
moduleContent,
|
||||||
this,
|
this,
|
||||||
languageVersionSettings,
|
languageVersionSettings,
|
||||||
sealedInheritorsProvider = IdeSealedClassInheritorsProvider
|
IdeSealedClassInheritorsProvider,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user