diff options
author | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-03-20 15:37:46 +0300 |
---|---|---|
committer | Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com> | 2017-03-20 15:37:46 +0300 |
commit | 8eff2cf33d1ba671191d6e2873f005e6b5f7057e (patch) | |
tree | 8cfd83e1eb6aa08500e600233a5ca509bd1f4bd7 /core/src/main/kotlin/Samples/SampleProcessingService.kt | |
parent | 39bfaa5f89dc07bce5456578f4e17905f2e4c095 (diff) | |
parent | 372e9c796cc77aaff788df56a13deeef64b6edd7 (diff) | |
download | dokka-8eff2cf33d1ba671191d6e2873f005e6b5f7057e.tar.gz dokka-8eff2cf33d1ba671191d6e2873f005e6b5f7057e.tar.bz2 dokka-8eff2cf33d1ba671191d6e2873f005e6b5f7057e.zip |
Merge branch '0.9.14/KT-15497'
# Conflicts:
# core/src/test/kotlin/format/MarkdownFormatTest.kt
Diffstat (limited to 'core/src/main/kotlin/Samples/SampleProcessingService.kt')
-rw-r--r-- | core/src/main/kotlin/Samples/SampleProcessingService.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Samples/SampleProcessingService.kt b/core/src/main/kotlin/Samples/SampleProcessingService.kt index 7f46299f..86c917cf 100644 --- a/core/src/main/kotlin/Samples/SampleProcessingService.kt +++ b/core/src/main/kotlin/Samples/SampleProcessingService.kt @@ -2,7 +2,8 @@ package org.jetbrains.dokka.Samples import org.jetbrains.dokka.ContentNode import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.kdoc.psi.impl.KDocTag interface SampleProcessingService { - fun resolveSample(descriptor: DeclarationDescriptor, functionName: String?): ContentNode + fun resolveSample(descriptor: DeclarationDescriptor, functionName: String?, kdocTag: KDocTag): ContentNode }
\ No newline at end of file |