Fix IDEA Inspections

2 files changed, 6 insertions, 10 deletions

diff --git a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
index cf2b0514..624c5fdc 100644
--- a/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
+++ b/core/src/main/kotlin/Java/JavaPsiDocumentationBuilder.kt
@@ -18,7 +18,7 @@ fun getSignature(element: PsiElement?) = when(element) {
     is PsiField -> element.containingClass!!.qualifiedName + "$" + element.name
     is PsiMethod ->
         element.containingClass!!.qualifiedName + "$" + element.name + "(" +
-                element.parameterList.parameters.map { it.type.typeSignature() }.joinToString(",") + ")"
+                element.parameterList.parameters.joinToString(",") { it.type.typeSignature() } + ")"
     else -> null
 }
 
@@ -291,7 +291,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 c25f5813..ea3a5963 100644
--- a/core/src/main/kotlin/Java/JavadocParser.kt
+++ b/core/src/main/kotlin/Java/JavadocParser.kt
@@ -23,8 +23,7 @@ interface JavaDocumentationParser {
 class JavadocParser(private val refGraph: NodeReferenceGraph,
                     private val logger: DokkaLogger) : JavaDocumentationParser {
     override fun parseDocumentation(element: PsiNamedElement): JavadocParseResult {
-        val docComment = (element as? PsiDocCommentOwner)?.docComment
-        if (docComment == null) return JavadocParseResult.Empty
+        val docComment = (element as? PsiDocCommentOwner)?.docComment ?: return JavadocParseResult.Empty
         val result = MutableContent()
         var deprecatedContent: Content? = null
         val para = ContentParagraph()
@@ -101,7 +100,7 @@ class JavadocParser(private val refGraph: NodeReferenceGraph,
     private fun createLink(element: Element): ContentBlock {
         val docref = element.attr("docref")
         if (docref != null) {
-            return ContentNodeLazyLink(docref, { -> refGraph.lookupOrWarn(docref, logger)})
+            return ContentNodeLazyLink(docref) { refGraph.lookupOrWarn(docref, logger)}
         }
         val href = element.attr("href")
         if (href != null) {
@@ -112,15 +111,12 @@ class JavadocParser(private val refGraph: NodeReferenceGraph,
     }
 
     private fun MutableContent.convertSeeTag(tag: PsiDocTag) {
-        val linkElement = tag.linkElement()
-        if (linkElement == null) {
-            return
-        }
+        val linkElement = tag.linkElement() ?: return
         val seeSection = findSectionByTag(ContentTags.SeeAlso) ?: addSection(ContentTags.SeeAlso, null)
         val linkSignature = resolveLink(linkElement)
         val text = ContentText(linkElement.text)
         if (linkSignature != null) {
-            val linkNode = ContentNodeLazyLink(tag.valueElement!!.text, { -> refGraph.lookupOrWarn(linkSignature, logger)})
+            val linkNode = ContentNodeLazyLink(tag.valueElement!!.text) { refGraph.lookupOrWarn(linkSignature, logger)}
             linkNode.append(text)
             seeSection.append(linkNode)
         } else {