Remove find(sourceSetID: DokkaSourceSetID)

Kotlin · Jan 20, 2023 · 36eb341 · 36eb341
1 parent d854002
commit 36eb341
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/KotlinAnalysis.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/KotlinAnalysis.kt
@@ -88,13 +88,9 @@ abstract class KotlinAnalysis(
             ?: throw IllegalStateException("Missing EnvironmentAndFacade for sourceSet ${key}")
     }
 
-    operator fun get(sourceSetID: DokkaSourceSetID): AnalysisContext {
-        return find(sourceSetID)
-            ?: parent?.get(sourceSetID)
-            ?: throw IllegalStateException("Missing EnvironmentAndFacade for sourceSet ${sourceSetID.sourceSetName}")
-    }
+    @Deprecated("sourceSetID can be non unique")
+    protected abstract fun get(sourceSetID: DokkaSourceSetID): AnalysisContext
 
-    protected abstract fun find(sourceSetID: DokkaSourceSetID): AnalysisContext?
     protected abstract fun find(sourceSet: DokkaSourceSet): AnalysisContext?
 }
 
@@ -103,9 +99,10 @@ internal open class EnvironmentKotlinAnalysis(
     parent: KotlinAnalysis? = null,
 ) : KotlinAnalysis(parent = parent) {
 
-    override fun find(sourceSetID: DokkaSourceSetID): AnalysisContext? {
-        return environments.entries.firstOrNull { (sourceSet, _) -> sourceSet.sourceSetID == sourceSetID }?.value
-    }
+    @Deprecated("sourceSetID can be non unique")
+    override fun get(sourceSetID: DokkaSourceSetID): AnalysisContext =
+        this[environments.keys.firstOrNull { sourceSet -> sourceSet.sourceSetID == sourceSetID } ?: throw IllegalStateException("Unknown ${sourceSetID}")]
+
 
     override fun find(sourceSet: DokkaSourceSet): AnalysisContext? {
         return environments[sourceSet]