Make the code compatible with IDE plugin
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index 87c0155..ddcf9af 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt
@@ -128,15 +128,48 @@ } abstract class ResolverForModuleFactory { - abstract fun <M : ModuleInfo> createResolverForModule( + open fun <M : ModuleInfo> createResolverForModule( moduleDescriptor: ModuleDescriptorImpl, moduleContext: ModuleContext, moduleContent: ModuleContent<M>, resolverForProject: ResolverForProject<M>, languageVersionSettings: LanguageVersionSettings, sealedInheritorsProvider: SealedClassInheritorsProvider, - resolveOptimizingOptions: OptimizingOptions? = null, - ): ResolverForModule + resolveOptimizingOptions: OptimizingOptions?, + ): ResolverForModule { + @Suppress("DEPRECATION") + return createResolverForModule( + moduleDescriptor, + moduleContext, + moduleContent, + resolverForProject, + languageVersionSettings, + sealedInheritorsProvider + ) + } + + @Deprecated( + "Left only for compatibility, please use full version", + ReplaceWith("createResolverForModule(moduleDescriptor, moduleContext, moduleContent, resolverForProject, languageVersionSettings, sealedInheritorsProvider, null)") + ) + open fun <M : ModuleInfo> createResolverForModule( + moduleDescriptor: ModuleDescriptorImpl, + moduleContext: ModuleContext, + moduleContent: ModuleContent<M>, + resolverForProject: ResolverForProject<M>, + languageVersionSettings: LanguageVersionSettings, + sealedInheritorsProvider: SealedClassInheritorsProvider + ): ResolverForModule { + return createResolverForModule( + moduleDescriptor, + moduleContext, + moduleContent, + resolverForProject, + languageVersionSettings, + sealedInheritorsProvider, + null + ) + } } class LazyModuleDependencies<M : ModuleInfo>(
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt index c092655..db221ec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/ResolverForSingleModuleProject.kt
@@ -62,5 +62,6 @@ this, languageVersionSettings, CliSealedClassInheritorsProvider, + null, ) }
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 43abf2a..ca11fcf 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt
@@ -116,6 +116,7 @@ this, LanguageVersionSettingsImpl.DEFAULT, CliSealedClassInheritorsProvider, + null, ) }