aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt5
-rw-r--r--core/src/test/kotlin/model/CommentTest.kt3
2 files changed, 2 insertions, 6 deletions
diff --git a/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt b/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
index e9cf5e18..1eb0c114 100644
--- a/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
+++ b/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
@@ -42,9 +42,8 @@ open class DefaultSampleProcessingService
return ContentBlockSampleCode().apply { append(ContentText("//Source not found: $functionName")) }
}
- val text = processSampleBody(psiElement)
-
- val lines = text.trimEnd().split("\n")
+ 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")
diff --git a/core/src/test/kotlin/model/CommentTest.kt b/core/src/test/kotlin/model/CommentTest.kt
index 0d6a3374..0d919128 100644
--- a/core/src/test/kotlin/model/CommentTest.kt
+++ b/core/src/test/kotlin/model/CommentTest.kt
@@ -160,19 +160,16 @@ line two""", toTestString())
|}
|[/code]
|[code lang=kotlin]
- |
|if (true) {
| println(property)
|}
|[/code]
|[code lang=kotlin]
- |
|if (true) {
| println(property)
|}
|[/code]
|[code lang=kotlin]
- |
|if (true) {
| println(property)
|}