[Platform API] Minor: move some classes to separate files

2019-04-24 19:09:46 +03:00
parent bf51a402b9
commit 451d14e504
9 changed files with 173 additions and 113 deletions
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.resolve
+
+import org.jetbrains.kotlin.container.StorageComponentContainer
+
+interface PlatformConfigurator {
+    val platformSpecificContainer: StorageComponentContainer
+    fun configureModuleComponents(container: StorageComponentContainer)
+    fun configureModuleDependentCheckers(container: StorageComponentContainer)
+}
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.resolve
+
+import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.config.*
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import org.jetbrains.kotlin.storage.StorageManager
+import java.util.ArrayList
+
+abstract class PlatformDependentCompilerServices {
+    private data class DefaultImportsKey(val includeKotlinComparisons: Boolean, val includeLowPriorityImports: Boolean)
+
+    private val defaultImports = LockBasedStorageManager("TargetPlatform").let { storageManager ->
+        storageManager.createMemoizedFunction<DefaultImportsKey, List<ImportPath>> { (includeKotlinComparisons, includeLowPriorityImports) ->
+            ArrayList<ImportPath>().apply {
+                listOf(
+                    "kotlin.*",
+                    "kotlin.annotation.*",
+                    "kotlin.collections.*",
+                    "kotlin.ranges.*",
+                    "kotlin.sequences.*",
+                    "kotlin.text.*",
+                    "kotlin.io.*"
+                ).forEach { add(ImportPath.fromString(it)) }
+
+                if (includeKotlinComparisons) {
+                    add(ImportPath.fromString("kotlin.comparisons.*"))
+                }
+
+                computePlatformSpecificDefaultImports(storageManager, this)
+
+                if (includeLowPriorityImports) {
+                    addAll(defaultLowPriorityImports)
+                }
+            }
+        }
+    }
+
+    abstract val platformConfigurator: PlatformConfigurator
+
+    open val defaultLowPriorityImports: List<ImportPath> get() = emptyList()
+
+    fun getDefaultImports(languageVersionSettings: LanguageVersionSettings, includeLowPriorityImports: Boolean): List<ImportPath> =
+        defaultImports(
+            DefaultImportsKey(
+                languageVersionSettings.supportsFeature(LanguageFeature.DefaultImportOfPackageKotlinComparisons),
+                includeLowPriorityImports
+            )
+        )
+
+    protected abstract fun computePlatformSpecificDefaultImports(storageManager: StorageManager, result: MutableList<ImportPath>)
+
+    open val excludedImports: List<FqName> get() = emptyList()
+
+    open fun dependencyOnBuiltIns(): ModuleInfo.DependencyOnBuiltIns =
+        ModuleInfo.DependencyOnBuiltIns.LAST
+}
@@ -5,69 +5,7 @@

 package org.jetbrains.kotlin.resolve

-import org.jetbrains.kotlin.analyzer.ModuleInfo
-import org.jetbrains.kotlin.config.*
-import org.jetbrains.kotlin.container.StorageComponentContainer
-import org.jetbrains.kotlin.name.FqName
-import org.jetbrains.kotlin.storage.LockBasedStorageManager
-import org.jetbrains.kotlin.storage.StorageManager
-import java.util.*
-
 abstract class TargetPlatform(val platformName: String) {
    override fun toString() = platformName
    abstract val platform: MultiTargetPlatform
 }
-
-abstract class PlatformDependentCompilerServices {
-    private data class DefaultImportsKey(val includeKotlinComparisons: Boolean, val includeLowPriorityImports: Boolean)
-
-    private val defaultImports = LockBasedStorageManager("TargetPlatform").let { storageManager ->
-        storageManager.createMemoizedFunction<DefaultImportsKey, List<ImportPath>> { (includeKotlinComparisons, includeLowPriorityImports) ->
-            ArrayList<ImportPath>().apply {
-                listOf(
-                    "kotlin.*",
-                    "kotlin.annotation.*",
-                    "kotlin.collections.*",
-                    "kotlin.ranges.*",
-                    "kotlin.sequences.*",
-                    "kotlin.text.*",
-                    "kotlin.io.*"
-                ).forEach { add(ImportPath.fromString(it)) }
-
-                if (includeKotlinComparisons) {
-                    add(ImportPath.fromString("kotlin.comparisons.*"))
-                }
-
-                computePlatformSpecificDefaultImports(storageManager, this)
-
-                if (includeLowPriorityImports) {
-                    addAll(defaultLowPriorityImports)
-                }
-            }
-        }
-    }
-
-    abstract val platformConfigurator: PlatformConfigurator
-
-    open val defaultLowPriorityImports: List<ImportPath> get() = emptyList()
-
-    fun getDefaultImports(languageVersionSettings: LanguageVersionSettings, includeLowPriorityImports: Boolean): List<ImportPath> =
-        defaultImports(
-            DefaultImportsKey(
-                languageVersionSettings.supportsFeature(LanguageFeature.DefaultImportOfPackageKotlinComparisons),
-                includeLowPriorityImports
-            )
-        )
-
-    protected abstract fun computePlatformSpecificDefaultImports(storageManager: StorageManager, result: MutableList<ImportPath>)
-
-    open val excludedImports: List<FqName> get() = emptyList()
-    
-    open fun dependencyOnBuiltIns(): ModuleInfo.DependencyOnBuiltIns = ModuleInfo.DependencyOnBuiltIns.LAST
-}
-
-interface PlatformConfigurator {
-    val platformSpecificContainer: StorageComponentContainer
-    fun configureModuleComponents(container: StorageComponentContainer)
-    fun configureModuleDependentCheckers(container: StorageComponentContainer)
-}