Fix setup of JS deps in AnalysisEnvironment

Kotlin · Dec 5, 2021 · 8b97c9b · 8b97c9b
1 parent ba4ed92
commit 8b97c9b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt b/kotlin-analysis/src/main/kotlin/org/jetbrains/dokka/analysis/AnalysisEnvironment.kt
@@ -310,7 +310,7 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
                                 else DokkaJsKlibLibraryInfo(kotlinLibrary, analyzerServices, dependencyResolver)
                             )
                         }
-                    } catch (e: kotlin.Throwable) {
+                    } catch (e: Throwable) {
                         configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY)
                             .report(CompilerMessageSeverity.WARNING, "Can not resolve KLIB. " + e.message)
                     }
@@ -496,7 +496,8 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
      * Classpath for this environment.
      */
     val classpath: List<File>
-        get() = configuration.jvmClasspathRoots
+        get() = configuration.jvmClasspathRoots + configuration.getList(JSConfigurationKeys.LIBRARIES)
+            .mapNotNull { File(it) }
 
     /**
      * Adds list of paths to classpath.
@@ -505,8 +506,9 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
     fun addClasspath(paths: List<File>) {
         if (analysisPlatform == Platform.js) {
             configuration.addAll(JSConfigurationKeys.LIBRARIES, paths.map { it.absolutePath })
+        } else {
+            configuration.addJvmClasspathRoots(paths)
         }
-        configuration.addJvmClasspathRoots(paths)
     }
 
     /**
@@ -516,8 +518,9 @@ class AnalysisEnvironment(val messageCollector: MessageCollector, val analysisPl
     fun addClasspath(path: File) {
         if (analysisPlatform == Platform.js) {
             configuration.add(JSConfigurationKeys.LIBRARIES, path.absolutePath)
+        } else {
+            configuration.addJvmClasspathRoot(path)
         }
-        configuration.addJvmClasspathRoot(path)
     }
 
     /**