Merge branch 'dev' of git://github.com/Xerus2000/dokka into Xerus2000-dev

update .gitignore and .idea

# Conflicts:
#	.idea/compiler.xml
#	.idea/kotlinc.xml
#	.idea/modules.xml
#	core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
#	core/src/main/kotlin/Java/JavadocParser.kt
#	core/src/main/kotlin/Kotlin/DeclarationLinkResolver.kt
#	core/src/main/kotlin/Kotlin/DocumentationBuilder.kt
#	core/src/main/kotlin/Model/DocumentationReference.kt
#	core/src/main/kotlin/Model/PackageDocs.kt
#	core/src/main/kotlin/Model/SourceLinks.kt
#	core/src/main/kotlin/Utilities/DokkaModules.kt
#	core/src/main/kotlin/Utilities/ServiceLocator.kt
#	core/src/main/kotlin/javadoc/docbase.kt
#	core/src/test/kotlin/format/HtmlFormatTest.kt
#	core/src/test/kotlin/format/KotlinWebSiteFormatTest.kt
#	core/src/test/kotlin/format/KotlinWebSiteHtmlFormatTest.kt
#	core/src/test/kotlin/format/KotlinWebSiteRunnableSamplesFormatTest.kt
#	core/src/test/kotlin/issues/IssuesTest.kt

1 files changed, 2 insertions, 4 deletions

diff --git a/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt b/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
index f3f45c3f..da74495f 100644
--- a/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
+++ b/core/src/main/kotlin/Samples/DefaultSampleProcessingService.kt
@@ -45,7 +45,7 @@ open class DefaultSampleProcessingService
         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")
+        val finalText = lines.joinToString("\n") { it.drop(indent) }
 
         return ContentBlockSampleCode(importsBlock = processImports(psiElement)).apply { append(ContentText(finalText)) }
     }
@@ -81,9 +81,7 @@ open class DefaultSampleProcessingService
         for (part in parts) {
             // short name
             val symbolName = Name.identifier(part)
-            val partSymbol = currentScope.getContributedDescriptors(DescriptorKindFilter.ALL, { it == symbolName })
-                    .filter { it.name == symbolName }
-                    .firstOrNull()
+            val partSymbol = currentScope.getContributedDescriptors(DescriptorKindFilter.ALL) { it == symbolName }.firstOrNull { it.name == symbolName }
 
             if (partSymbol == null) {
                 symbol = null