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, 4 insertions, 4 deletions

diff --git a/core/src/main/kotlin/Languages/JavaLanguageService.kt b/core/src/main/kotlin/Languages/JavaLanguageService.kt
index 59bedd02..ad66123b 100644
--- a/core/src/main/kotlin/Languages/JavaLanguageService.kt
+++ b/core/src/main/kotlin/Languages/JavaLanguageService.kt
@@ -84,7 +84,7 @@ class JavaLanguageService : LanguageService {
         return if (constraints.none())
             node.name
         else {
-            node.name + " extends " + constraints.map { renderType(node) }.joinToString()
+            node.name + " extends " + constraints.joinToString { renderType(node) }
         }
     }
 
@@ -97,7 +97,7 @@ class JavaLanguageService : LanguageService {
             val typeParameters = node.details(NodeKind.TypeParameter)
             if (typeParameters.any()) {
                 append("<")
-                append(typeParameters.map { renderTypeParameter(it) }.joinToString())
+                append(typeParameters.joinToString { renderTypeParameter(it) })
                 append("> ")
             }
         }.toString()
@@ -142,9 +142,9 @@ class JavaLanguageService : LanguageService {
             val receiver = node.details(NodeKind.Receiver).singleOrNull()
             append("(")
             if (receiver != null)
-                (listOf(receiver) + node.details(NodeKind.Parameter)).map { renderParameter(it) }.joinTo(this)
+                (listOf(receiver) + node.details(NodeKind.Parameter)).joinTo(this) { renderParameter(it) }
             else
-                node.details(NodeKind.Parameter).map { renderParameter(it) }.joinTo(this)
+                node.details(NodeKind.Parameter).joinTo(this) { renderParameter(it) }
 
             append(")")
         }.toString()