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

2 files changed, 3 insertions, 3 deletions

diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
index 98d56856..2eaf4af2 100644
--- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
+++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
@@ -347,7 +347,7 @@ class JavaPsiDocumentationBuilder : JavaDocumentationBuilder {
 }
 
 fun hasSuppressDocTag(element: Any?): Boolean {
-    val declaration = (element as? KtLightDeclaration<*, *>)?.kotlinOrigin as? KtDeclaration ?: return false
+    val declaration = (element as? KtLightDeclaration<*, *>)?.kotlinOrigin ?: return false
     return PsiTreeUtil.findChildrenOfType(declaration.docComment, KDocTag::class.java).any { it.knownTag == KDocKnownTag.SUPPRESS }
 }
 
diff --git a/core/src/main/kotlin/Java/JavadocParser.kt b/core/src/main/kotlin/Java/JavadocParser.kt
index 66db46d7..25a974a3 100644
--- a/core/src/main/kotlin/Java/JavadocParser.kt
+++ b/core/src/main/kotlin/Java/JavadocParser.kt
@@ -192,7 +192,7 @@ class JavadocParser(
         return when {
             element.hasAttr("docref") -> {
                 val docref = element.attr("docref")
-                ContentNodeLazyLink(docref, { -> refGraph.lookupOrWarn(docref, logger) })
+                ContentNodeLazyLink(docref) { refGraph.lookupOrWarn(docref, logger)}
             }
             element.hasAttr("href") -> {
                 val href = element.attr("href")
@@ -235,7 +235,7 @@ class JavadocParser(
                 val linkNode =
                         ContentNodeLazyLink(
                                 (tag.valueElement ?: linkElement).text
-                        ) { -> refGraph.lookupOrWarn(linkSignature!!, logger) }
+                        ) { refGraph.lookupOrWarn(linkSignature!!, logger) }
                 linkNode.append(text)
                 linkNode
             }