Refactor KotlinCoreEnvironment, fix warnings

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

@@ -120,14 +120,18 @@ class KotlinCoreEnvironment private constructor(
     initialConfiguration: CompilerConfiguration,
     configFiles: EnvironmentConfigFiles
 ) {
-    private val projectEnvironment: JavaCoreProjectEnvironment = object : KotlinCoreProjectEnvironment(parentDisposable, applicationEnvironment) {
+    private val projectEnvironment: JavaCoreProjectEnvironment =
+        object : KotlinCoreProjectEnvironment(parentDisposable, applicationEnvironment) {
             override fun preregisterServices() {
                 registerProjectExtensionPoints(Extensions.getArea(project))
             }
 
             override fun registerJavaPsiFacade() {
                 with(project) {
-                registerService(CoreJavaFileManager::class.java, ServiceManager.getService(this, JavaFileManager::class.java) as CoreJavaFileManager)
+                    registerService(
+                        CoreJavaFileManager::class.java,
+                        ServiceManager.getService(this, JavaFileManager::class.java) as CoreJavaFileManager
+                    )
 
                     val traceHolder = CliTraceHolder()
                     val cliLightClassGenerationSupport = CliLightClassGenerationSupport(traceHolder)
@@ -144,7 +148,8 @@ class KotlinCoreEnvironment private constructor(
 
                     area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(JavaElementFinder(this, kotlinAsJavaSupport))
                     area.getExtensionPoint(PsiElementFinder.EP_NAME).registerExtension(
-                        PsiElementFinderImpl(this, ServiceManager.getService(this, JavaFileManager::class.java)))
+                        PsiElementFinderImpl(this, ServiceManager.getService(this, JavaFileManager::class.java))
+                    )
                 }
 
                 super.registerJavaPsiFacade()
@@ -182,35 +187,35 @@ class KotlinCoreEnvironment private constructor(
             try {
                 registrar.registerProjectComponents(project, configuration)
             } catch (e: AbstractMethodError) {
-                throw IllegalStateException("The provided plugin ${registrar.javaClass.name} is not compatible with this version of compiler", e)
+                throw IllegalStateException(
+                    "The provided plugin ${registrar.javaClass.name} is not compatible with this version of compiler", e
+                )
             }
         }
 
         project.registerService(DeclarationProviderFactoryService::class.java, CliDeclarationProviderFactoryService(sourceFiles))
-        project.registerService(ModuleVisibilityManager::class.java, CliModuleVisibilityManagerImpl(configFiles == EnvironmentConfigFiles.JVM_CONFIG_FILES))
+
+        val isJvm = configFiles == EnvironmentConfigFiles.JVM_CONFIG_FILES
+        project.registerService(ModuleVisibilityManager::class.java, CliModuleVisibilityManagerImpl(isJvm))
 
         registerProjectServicesForCLI(projectEnvironment)
 
         val messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
         registerProjectServices(projectEnvironment, messageCollector)
 
-        CompilerConfigurationExtension.getInstances(project).forEach {
+        for (extension in CompilerConfigurationExtension.getInstances(project)) {
-            it.updateConfiguration(configuration)
+            extension.updateConfiguration(configuration)
         }
 
-        sourceFiles += CompileEnvironmentUtil.getKtFiles(project, getSourceRootsCheckingForDuplicates(), this.configuration, {
+        sourceFiles += CompileEnvironmentUtil.getKtFiles(project, getSourceRootsCheckingForDuplicates(), this.configuration) { message ->
-            message ->
             report(ERROR, message)
-        })
+        }
         sourceFiles.sortBy { it.virtualFile.path }
 
         val scriptDefinitionProvider = ScriptDefinitionProvider.getInstance(project) as? CliScriptDefinitionProvider
         if (scriptDefinitionProvider != null) {
-            scriptDefinitionProvider.setScriptDefinitionsSources(
+            scriptDefinitionProvider.setScriptDefinitionsSources(configuration.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS_SOURCES))
-                configuration.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS_SOURCES)
+            scriptDefinitionProvider.setScriptDefinitions(configuration.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS))
-            )
-            scriptDefinitionProvider.setScriptDefinitions(
-                    configuration.getList(JVMConfigurationKeys.SCRIPT_DEFINITIONS))
 
             ScriptDependenciesProvider.getInstance(project).let { importsProvider ->
                 configuration.addJvmClasspathRoots(
@@ -313,7 +318,10 @@ class KotlinCoreEnvironment private constructor(
         bootClasspath: List<File>? = null,
         sourcePath: List<File>? = null
     ): Boolean {
-        return JavacWrapperRegistrar.registerJavac(projectEnvironment.project, configuration, javaFiles, kotlinFiles, arguments, bootClasspath, sourcePath, LightClassGenerationSupport.getInstance(project))
+        return JavacWrapperRegistrar.registerJavac(
+            projectEnvironment.project, configuration, javaFiles, kotlinFiles, arguments, bootClasspath, sourcePath,
+            LightClassGenerationSupport.getInstance(project)
+        )
     }
 
     private val applicationEnvironment: CoreApplicationEnvironment
@@ -495,9 +503,7 @@ class KotlinCoreEnvironment private constructor(
         }
 
         private fun createApplicationEnvironment(
-                parentDisposable: Disposable,
+            parentDisposable: Disposable, configuration: CompilerConfiguration, unitTestMode: Boolean
-                configuration: CompilerConfiguration,
-                unitTestMode: Boolean
         ): JavaCoreApplicationEnvironment {
             Extensions.cleanRootArea(parentDisposable)
             registerAppExtensionPoints()
@@ -514,20 +520,24 @@ class KotlinCoreEnvironment private constructor(
         }
 
         private fun registerAppExtensionPoints() {
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint::class.java)
+            val area = Extensions.getRootArea()
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), FileContextProvider.EP_NAME, FileContextProvider::class.java)
+
-            //
+            CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, FileTypeExtensionPoint::class.java)
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaDataContributor.EP_NAME, MetaDataContributor::class.java)
+            CoreApplicationEnvironment.registerExtensionPoint(area, FileContextProvider.EP_NAME, FileContextProvider::class.java)
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), PsiAugmentProvider.EP_NAME, PsiAugmentProvider::class.java)
+
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider::class.java)
+            CoreApplicationEnvironment.registerExtensionPoint(area, MetaDataContributor.EP_NAME, MetaDataContributor::class.java)
-            //
+            CoreApplicationEnvironment.registerExtensionPoint(area, PsiAugmentProvider.EP_NAME, PsiAugmentProvider::class.java)
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ContainerProvider.EP_NAME, ContainerProvider::class.java)
+            CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, JavaMainMethodProvider::class.java)
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler::class.java)
+
-            //
+            CoreApplicationEnvironment.registerExtensionPoint(area, ContainerProvider.EP_NAME, ContainerProvider::class.java)
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier::class.java)
+            CoreApplicationEnvironment.registerExtensionPoint(
-            CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaLanguage.EP_NAME, MetaLanguage::class.java)
+                area, ClassFileDecompilers.EP_NAME, ClassFileDecompilers.Decompiler::class.java
-            //
+            )
-            IdeaExtensionPoints.registerVersionSpecificAppExtensionPoints(Extensions.getRootArea())
+
+            CoreApplicationEnvironment.registerExtensionPoint(area, TypeAnnotationModifier.EP_NAME, TypeAnnotationModifier::class.java)
+            CoreApplicationEnvironment.registerExtensionPoint(area, MetaLanguage.EP_NAME, MetaLanguage::class.java)
+
+            IdeaExtensionPoints.registerVersionSpecificAppExtensionPoints(area)
         }
 
         private fun registerApplicationExtensionPointsAndExtensionsFrom(configuration: CompilerConfiguration, configFilePath: String) {
@@ -535,10 +545,9 @@ class KotlinCoreEnvironment private constructor(
                 if (isDirectory) File(this, "META-INF" + File.separator + configFile).exists()
                 else try {
                     ZipFile(this).use {
-                            it.getEntry("META-INF/" + configFile) != null
+                        it.getEntry("META-INF/$configFile") != null
                     }
-                    }
+                } catch (e: Throwable) {
-                    catch (e: Throwable) {
                     false
                 }
 
@@ -550,7 +559,8 @@ class KotlinCoreEnvironment private constructor(
                         ?: File("idea/src").takeIf { it.hasConfigFile(configFilePath) }
                         ?: throw IllegalStateException(
                             "Unable to find extension point configuration $configFilePath " +
-                                "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})")
+                                    "(cp:\n  ${(Thread.currentThread().contextClassLoader as? UrlClassLoader)?.urls?.joinToString("\n  ") { it.file }})"
+                        )
 
             CoreApplicationEnvironment.registerExtensionPointAndExtensions(pluginRoot, configFilePath, Extensions.getRootArea())
         }
@@ -562,7 +572,7 @@ class KotlinCoreEnvironment private constructor(
         }
 
         // made public for Upsource
-        @Suppress("MemberVisibilityCanPrivate")
+        @Suppress("MemberVisibilityCanBePrivate")
         @JvmStatic
         fun registerApplicationServices(applicationEnvironment: JavaCoreApplicationEnvironment) {
             with(applicationEnvironment) {
@@ -576,7 +586,9 @@ class KotlinCoreEnvironment private constructor(
         }
 
         private fun registerProjectExtensionPoints(area: ExtensionsArea) {
-            CoreApplicationEnvironment.registerExtensionPoint(area, PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor::class.java)
+            CoreApplicationEnvironment.registerExtensionPoint(
+                area, PsiTreeChangePreprocessor.EP_NAME, PsiTreeChangePreprocessor::class.java
+            )
             CoreApplicationEnvironment.registerExtensionPoint(area, PsiElementFinder.EP_NAME, PsiElementFinder::class.java)
 
             IdeaExtensionPoints.registerVersionSpecificProjectExtensionPoints(area)
@@ -588,7 +600,10 @@ class KotlinCoreEnvironment private constructor(
             with(projectEnvironment.project) {
                 val scriptDefinitionProvider = CliScriptDefinitionProvider()
                 registerService(ScriptDefinitionProvider::class.java, scriptDefinitionProvider)
-                registerService(ScriptDependenciesProvider::class.java, CliScriptDependenciesProvider(projectEnvironment.project, scriptDefinitionProvider))
+                registerService(
+                    ScriptDependenciesProvider::class.java,
+                    CliScriptDependenciesProvider(projectEnvironment.project, scriptDefinitionProvider)
+                )
                 registerService(KotlinJavaPsiFacade::class.java, KotlinJavaPsiFacade(this))
                 registerService(KtLightClassForFacade.FacadeStubCache::class.java, KtLightClassForFacade.FacadeStubCache(this))
                 registerService(ModuleAnnotationsResolver::class.java, CliModuleAnnotationsResolver())
@@ -603,7 +618,6 @@ class KotlinCoreEnvironment private constructor(
              * Note that Kapt may restart code analysis process, and CLI services should be aware of that.
              * Use PsiManager.getModificationTracker() to ensure that all the data you cached is still valid.
              */
-
         }
 
         private fun CompilerConfiguration.setupJdkClasspathRoots(configFiles: EnvironmentConfigFiles) {
@@ -618,8 +632,7 @@ class KotlinCoreEnvironment private constructor(
                 put(JVMConfigurationKeys.JDK_HOME, javaHome)
 
                 javaHome to PathUtil.getJdkClassesRootsFromCurrentJre()
-            }
+            } else {
-            else {
                 jdkHome to PathUtil.getJdkClassesRoots(jdkHome)
             }
 
@@ -627,12 +640,10 @@ class KotlinCoreEnvironment private constructor(
                 if (classesRoots.isEmpty()) {
                     val messageCollector = get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
                     messageCollector?.report(ERROR, "No class roots are found in the JDK path: $javaRoot")
-                }
+                } else {
-                else {
                     addJvmSdkRoots(classesRoots)
                 }
             }
         }
-
     }
 }