From 5e9dd421cd323c138486cf8b38b6ce7158bcca8a Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Sat, 2 Dec 2017 05:18:41 +0300 Subject: Bind NodeLocationAwareGenerator to Generator --- core/src/main/kotlin/Formats/FormatDescriptor.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/kotlin/Formats/FormatDescriptor.kt b/core/src/main/kotlin/Formats/FormatDescriptor.kt index d3861b82..aa00df97 100644 --- a/core/src/main/kotlin/Formats/FormatDescriptor.kt +++ b/core/src/main/kotlin/Formats/FormatDescriptor.kt @@ -2,8 +2,6 @@ package org.jetbrains.dokka.Formats import com.google.inject.Binder import org.jetbrains.dokka.* -import org.jetbrains.dokka.Model.DescriptorSignatureProvider -import org.jetbrains.dokka.Samples.SampleProcessingService import org.jetbrains.dokka.Utilities.bind import org.jetbrains.dokka.Utilities.toOptional import org.jetbrains.dokka.Utilities.toType @@ -18,16 +16,17 @@ interface FormatDescriptorOutputComponent { fun configureOutput(binder: Binder) } -interface FormatDescriptor: FormatDescriptorAnalysisComponent, FormatDescriptorOutputComponent +interface FormatDescriptor : FormatDescriptorAnalysisComponent, FormatDescriptorOutputComponent abstract class FileGeneratorBasedFormatDescriptor : FormatDescriptor { override fun configureOutput(binder: Binder): Unit = with(binder) { + bind() toType NodeLocationAwareGenerator::class + bind() toOptional (outlineServiceClass) bind() toOptional formatServiceClass - bind() toType generatorServiceClass - //bind() toType generatorServiceClass + bind() toType generatorServiceClass bind() toOptional packageListServiceClass } -- cgit