Merge branch 'website-samples'

3 files changed, 10 insertions, 13 deletions

diff --git a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
index b1e3ff91..7ebc5f09 100644
--- a/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
+++ b/core/src/main/kotlin/Formats/KotlinWebsiteFormatService.kt
@@ -169,7 +169,7 @@ class KotlinWebsiteRunnableSamplesOutputBuilder(to: StringBuilder,
         div(to, "sample", true) {
             appendBlockCode(language) {
                 imports()
-                wrap("\nfun main(args: Array<String>) {", "}") {
+                wrap("\n\nfun main(args: Array<String>) {", "}") {
                     wrap("\n//sampleStart\n", "\n//sampleEnd\n", body)
                 }
             }
diff --git a/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt b/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
index e6539135..1eb0c114 100644
--- a/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
+++ b/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
@@ -42,10 +42,9 @@ open class DefaultSampleProcessingService
             return ContentBlockSampleCode().apply { append(ContentText("//Source not found: $functionName")) }
         }
 
-        val text = processSampleBody(psiElement)
-
-        val lines = text.trimEnd().split("\n".toRegex()).toTypedArray().filterNot(String::isEmpty)
-        val indent = lines.map { it.takeWhile(Char::isWhitespace).count() }.min() ?: 0
+        val text = processSampleBody(psiElement).trim { it == '\n' || it == '\r' }.trimEnd()
+        val lines = text.split("\n")
+        val indent = lines.filter(String::isNotBlank).map { it.takeWhile(Char::isWhitespace).count() }.min() ?: 0
         val finalText = lines.map { it.drop(indent) }.joinToString("\n")
 
         return ContentBlockSampleCode(importsBlock = processImports(psiElement)).apply { append(ContentText(finalText)) }
diff --git a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt
index baf44904..864033f0 100644
--- a/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt
+++ b/core/src/main/kotlin/Samples/KotlinWebsiteSampleProcessingService.kt
@@ -2,6 +2,7 @@ package org.jetbrains.dokka.Samples
 
 import com.google.inject.Inject
 import com.intellij.psi.PsiElement
+import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.dokka.*
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.ImportPath
@@ -12,7 +13,7 @@ open class KotlinWebsiteSampleProcessingService
                     resolutionFacade: DokkaResolutionFacade)
     : DefaultSampleProcessingService(options, logger, resolutionFacade) {
 
-    private class SampleBuilder() : KtVisitorVoid() {
+    private class SampleBuilder : KtTreeVisitorVoid() {
         val builder = StringBuilder()
         val text: String
             get() = builder.toString()
@@ -48,13 +49,10 @@ open class KotlinWebsiteSampleProcessingService
             }
         }
 
-        override fun visitElement(element: PsiElement?) {
-            if (element != null) {
-                if (element.children.isEmpty())
-                    builder.append(element.text)
-                else
-                    element.acceptChildren(this)
-            }
+        override fun visitElement(element: PsiElement) {
+            if (element is LeafPsiElement)
+                builder.append(element.text)
+            super.visitElement(element)
         }
     }