aboutsummaryrefslogtreecommitdiff
path: root/core/src/main/kotlin/Kotlin
diff options
context:
space:
mode:
authorSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2017-03-20 15:37:46 +0300
committerSimon Ogorodnik <Simon.Ogorodnik@jetbrains.com>2017-03-20 15:37:46 +0300
commit8eff2cf33d1ba671191d6e2873f005e6b5f7057e (patch)
tree8cfd83e1eb6aa08500e600233a5ca509bd1f4bd7 /core/src/main/kotlin/Kotlin
parent39bfaa5f89dc07bce5456578f4e17905f2e4c095 (diff)
parent372e9c796cc77aaff788df56a13deeef64b6edd7 (diff)
downloaddokka-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/Kotlin')
-rw-r--r--core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt
index 06acf2e6..6d7ff7ba 100644
--- a/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt
+++ b/core/src/main/kotlin/Kotlin/DescriptorDocumentationParser.kt
@@ -59,7 +59,7 @@ class DescriptorDocumentationParser
tags.forEach {
when (it.knownTag) {
KDocKnownTag.SAMPLE ->
- content.append(sampleService.resolveSample(descriptor, it.getSubjectName()))
+ content.append(sampleService.resolveSample(descriptor, it.getSubjectName(), it))
KDocKnownTag.SEE ->
content.addTagToSeeAlso(descriptor, it)
else -> {