From 5a72f4a7e63d96f98072bf3989373592c2b906c2 Mon Sep 17 00:00:00 2001 From: Andrzej Ratajczak Date: Wed, 8 Apr 2020 16:23:19 +0200 Subject: Apply requested changes --- core/src/main/kotlin/DokkaGenerator.kt | 11 +---------- core/src/main/kotlin/renderers/Renderer.kt | 4 +--- 2 files changed, 2 insertions(+), 13 deletions(-) (limited to 'core') diff --git a/core/src/main/kotlin/DokkaGenerator.kt b/core/src/main/kotlin/DokkaGenerator.kt index 0a797769..053b4cb6 100644 --- a/core/src/main/kotlin/DokkaGenerator.kt +++ b/core/src/main/kotlin/DokkaGenerator.kt @@ -3,10 +3,6 @@ package org.jetbrains.dokka import com.intellij.openapi.vfs.VirtualFileManager import com.intellij.psi.PsiJavaFile import com.intellij.psi.PsiManager -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking import org.jetbrains.dokka.analysis.AnalysisEnvironment import org.jetbrains.dokka.analysis.DokkaResolutionFacade import org.jetbrains.dokka.model.DModule @@ -113,12 +109,7 @@ class DokkaGenerator( context: DokkaContext ) { val renderer = context.single(CoreExtensions.renderer) - runBlocking { - val scope = this - with(renderer) { - scope.render(transformedPages).join() - } - } + renderer.render(transformedPages) } private fun createEnvironmentAndFacade(pass: DokkaConfiguration.PassConfiguration): EnvironmentAndFacade = diff --git a/core/src/main/kotlin/renderers/Renderer.kt b/core/src/main/kotlin/renderers/Renderer.kt index 9d054503..10235f21 100644 --- a/core/src/main/kotlin/renderers/Renderer.kt +++ b/core/src/main/kotlin/renderers/Renderer.kt @@ -1,9 +1,7 @@ package org.jetbrains.dokka.renderers -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Job import org.jetbrains.dokka.pages.RootPageNode interface Renderer { - fun CoroutineScope.render(root: RootPageNode): Job + fun render(root: RootPageNode) } \ No newline at end of file -- cgit