From 95a606f54604d673a8bda00f19dae81463925475 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 8 Jul 2016 12:55:26 +0200 Subject: update Kotlin compiler and kotlin-ide-common to 1.0.4-dev-13, fixing the qualified name resolve problem in doc comments --- core/src/main/kotlin/main.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'core/src/main/kotlin/main.kt') diff --git a/core/src/main/kotlin/main.kt b/core/src/main/kotlin/main.kt index 30a33a96..22859187 100644 --- a/core/src/main/kotlin/main.kt +++ b/core/src/main/kotlin/main.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot -import org.jetbrains.kotlin.config.CommonConfigurationKeys +import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzerForTopLevel import org.jetbrains.kotlin.resolve.TopDownAnalysisMode import org.jetbrains.kotlin.utils.PathUtil @@ -136,9 +136,16 @@ object DokkaConsoleLogger: DokkaLogger { } class DokkaMessageCollector(val logger: DokkaLogger): MessageCollector { + private var seenErrors = false + override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { + if (severity == CompilerMessageSeverity.ERROR) { + seenErrors = true + } logger.error(MessageRenderer.PLAIN_FULL_PATHS.render(severity, message, location)) } + + override fun hasErrors() = seenErrors } class DokkaGenerator(val logger: DokkaLogger, @@ -242,7 +249,7 @@ fun buildDocumentationModule(injector: Injector, fun KotlinCoreEnvironment.getJavaSourceFiles(): List { - val sourceRoots = configuration.get(CommonConfigurationKeys.CONTENT_ROOTS) + val sourceRoots = configuration.get(JVMConfigurationKeys.CONTENT_ROOTS) ?.filterIsInstance() ?.map { it.file } ?: listOf() -- cgit