diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 4cc0509f7c5..19dd3cf6d63 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt @@ -33,10 +33,8 @@ import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatformVersion import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.SealedClassInheritorsProvider -import org.jetbrains.kotlin.resolve.CliSealedClassInheritorsProvider import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.getValue -import java.util.* class ResolverForModule( val packageFragmentProvider: PackageFragmentProvider, @@ -122,7 +120,7 @@ abstract class ResolverForModuleFactory { moduleContent: ModuleContent, resolverForProject: ResolverForProject, languageVersionSettings: LanguageVersionSettings, - sealedInheritorsProvider: SealedClassInheritorsProvider = CliSealedClassInheritorsProvider + sealedInheritorsProvider: SealedClassInheritorsProvider, ): ResolverForModule } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt index e2c36115eb4..c09265578c7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.context.withModule import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.resolve.CliSealedClassInheritorsProvider class ResolverForSingleModuleProject( debugName: String, @@ -59,6 +60,7 @@ class ResolverForSingleModuleProject( projectContext.withModule(descriptor), modulesContent(moduleInfo), this, - languageVersionSettings + languageVersionSettings, + CliSealedClassInheritorsProvider, ) -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt index bd8f6c7b890..17ddfc664f4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/frontend/di/injection.kt @@ -135,7 +135,7 @@ fun createContainerForBodyResolve( analyzerServices: PlatformDependentAnalyzerServices, languageVersionSettings: LanguageVersionSettings, moduleStructureOracle: ModuleStructureOracle, - sealedProvider: SealedClassInheritorsProvider = CliSealedClassInheritorsProvider + sealedProvider: SealedClassInheritorsProvider, ): StorageComponentContainer = createContainer("BodyResolve", analyzerServices) { configureModule(moduleContext, platform, analyzerServices, bindingTrace, languageVersionSettings, sealedProvider) @@ -158,7 +158,7 @@ fun createContainerForLazyBodyResolve( languageVersionSettings: LanguageVersionSettings, moduleStructureOracle: ModuleStructureOracle, mainFunctionDetectorFactory: MainFunctionDetector.Factory, - sealedProvider: SealedClassInheritorsProvider = CliSealedClassInheritorsProvider + sealedProvider: SealedClassInheritorsProvider, ): StorageComponentContainer = createContainer("LazyBodyResolve", analyzerServices) { configureModule(moduleContext, platform, analyzerServices, bindingTrace, languageVersionSettings, sealedProvider) useInstance(mainFunctionDetectorFactory) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 9d5e6eb84f7..30876891191 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -41,8 +41,9 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatforms 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.PlatformDependentAnalyzerServices import org.jetbrains.kotlin.resolve.constants.EnumValue import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass 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.junit.Assert import java.io.File -import java.util.* class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() { @@ -114,7 +114,8 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() { projectContext.withModule(descriptor), modulesContent(moduleInfo), this, - LanguageVersionSettingsImpl.DEFAULT + LanguageVersionSettingsImpl.DEFAULT, + CliSealedClassInheritorsProvider, ) } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt index 056d108b458..a9e07b5b3d4 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaResolverForProject.kt @@ -82,7 +82,7 @@ class IdeaResolverForProject( moduleContent, this, languageVersionSettings, - sealedInheritorsProvider = IdeSealedClassInheritorsProvider + IdeSealedClassInheritorsProvider, ) }