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, 3 insertions, 2 deletions

diff --git a/core/src/test/kotlin/javadoc/JavadocTest.kt b/core/src/test/kotlin/javadoc/JavadocTest.kt
index 64ada1d5..1c4dd258 100644
--- a/core/src/test/kotlin/javadoc/JavadocTest.kt
+++ b/core/src/test/kotlin/javadoc/JavadocTest.kt
@@ -149,8 +149,9 @@ class JavadocTest {
                     .find { it.name() == "some" }!!.parameters().first()
                     .type()
             assertEquals("kotlin.jvm.functions.Function1", methodParamType.qualifiedTypeName())
-            assertEquals("? super A, C", methodParamType.asParameterizedType().typeArguments()
-                    .map(Type::qualifiedTypeName).joinToString())
+            assertEquals("? super A, C",
+                methodParamType.asParameterizedType().typeArguments().joinToString(transform = Type::qualifiedTypeName)
+            )
         }
     }