From 47790d166100dc50d797fc0312b9b3fe0e7e9d7f Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 14 Nov 2016 18:08:17 +0300 Subject: Replacing assertPrints, assertTrue to println for kotlin-website samples, Added SampleProcessingService to FormatDescriptor --- core/src/main/kotlin/Formats/FormatDescriptor.kt | 2 ++ core/src/main/kotlin/Formats/StandardFormats.kt | 6 ++++++ 2 files changed, 8 insertions(+) (limited to 'core/src/main/kotlin/Formats') diff --git a/core/src/main/kotlin/Formats/FormatDescriptor.kt b/core/src/main/kotlin/Formats/FormatDescriptor.kt index e384f223..58c9472b 100644 --- a/core/src/main/kotlin/Formats/FormatDescriptor.kt +++ b/core/src/main/kotlin/Formats/FormatDescriptor.kt @@ -1,5 +1,6 @@ package org.jetbrains.dokka.Formats +import Samples.SampleProcessingService import org.jetbrains.dokka.* import kotlin.reflect.KClass @@ -9,4 +10,5 @@ interface FormatDescriptor { val generatorServiceClass: KClass val packageDocumentationBuilderClass: KClass val javaDocumentationBuilderClass: KClass + val sampleProcessingService: KClass } diff --git a/core/src/main/kotlin/Formats/StandardFormats.kt b/core/src/main/kotlin/Formats/StandardFormats.kt index fdc8eb9e..45a653b0 100644 --- a/core/src/main/kotlin/Formats/StandardFormats.kt +++ b/core/src/main/kotlin/Formats/StandardFormats.kt @@ -1,5 +1,8 @@ package org.jetbrains.dokka.Formats +import Samples.DefaultSampleProcessingService +import Samples.KotlinWebsiteSampleProcessingService +import Samples.SampleProcessingService import org.jetbrains.dokka.* import kotlin.reflect.KClass @@ -9,6 +12,7 @@ abstract class KotlinFormatDescriptorBase : FormatDescriptor { override val generatorServiceClass = FileGenerator::class override val outlineServiceClass: KClass? = null + override val sampleProcessingService: KClass = DefaultSampleProcessingService::class } class HtmlFormatDescriptor : KotlinFormatDescriptorBase() { @@ -22,11 +26,13 @@ class HtmlAsJavaFormatDescriptor : FormatDescriptor { override val generatorServiceClass = FileGenerator::class override val packageDocumentationBuilderClass = KotlinAsJavaDocumentationBuilder::class override val javaDocumentationBuilderClass = JavaPsiDocumentationBuilder::class + override val sampleProcessingService: KClass = DefaultSampleProcessingService::class } class KotlinWebsiteFormatDescriptor : KotlinFormatDescriptorBase() { override val formatServiceClass = KotlinWebsiteFormatService::class override val outlineServiceClass = YamlOutlineService::class + override val sampleProcessingService: KClass = KotlinWebsiteSampleProcessingService::class } class JekyllFormatDescriptor : KotlinFormatDescriptorBase() { -- cgit