From 88303321abb91b73a03fa62f44152e82fef0dc3a Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Fri, 15 Jan 2021 16:04:28 +0100 Subject: Fix incorrect DRI conversion in KotlinAsJava modes for nested definitions --- .../kotlin/org/jetbrains/dokka/analysis/EnvironmentAndFacade.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'kotlin-analysis/src') diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/EnvironmentAndFacade.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/EnvironmentAndFacade.kt index ea8ce2f6..9726e5b7 100644 --- a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/EnvironmentAndFacade.kt +++ b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/EnvironmentAndFacade.kt @@ -17,12 +17,11 @@ internal fun createEnvironmentAndFacade( if (analysisPlatform == Platform.jvm) { addClasspath(PathUtil.getJdkClassesRootsFromCurrentJre()) } - sourceSet.classpath.forEach(::addClasspath) - addSources( - (sourceSet.sourceRoots + sourceSets.filter { it.sourceSetID in sourceSet.dependentSourceSets } - .flatMap { it.sourceRoots }) - ) + val parentSourceSets = sourceSets.filter { it.sourceSetID in sourceSet.dependentSourceSets } + addClasspath(sourceSet.classpath + parentSourceSets.flatMap { it.classpath }) + + addSources(sourceSet.sourceRoots + parentSourceSets.flatMap { it.sourceRoots }) loadLanguageVersionSettings(sourceSet.languageVersion, sourceSet.apiVersion) -- cgit