Merge branch 'javadoc' of https://github.com/cy6erGn0m/dokka into cy6erGn0m-javadoc

# Conflicts:
#	dokka.iml
#	javadoc/javadoc.iml
#	javadoc/src/main/kotlin/docbase.kt
#	javadoc/src/main/kotlin/dokka-adapters.kt
#	javadoc/src/main/kotlin/reporter.kt
#	javadoc/src/main/kotlin/tags.kt
#	src/Analysis/AnalysisEnvironment.kt
#	src/Analysis/CompilerAPI.kt
#	src/Formats/KotlinWebsiteFormatService.kt
#	src/Formats/StructuredFormatService.kt
#	src/Java/JavaDocumentationBuilder.kt
#	src/Kotlin/ContentBuilder.kt
#	src/Kotlin/DocumentationBuilder.kt
#	src/Languages/JavaLanguageService.kt
#	src/Model/Content.kt
#	src/Model/PackageDocs.kt
#	src/Utilities/GuiceModule.kt
#	src/Utilities/Path.kt
#	src/Utilities/ServiceLocator.kt
#	test/src/markdown/MarkdownTestRunner.kt

1 files changed, 7 insertions, 3 deletions

diff --git a/src/Java/JavaDocumentationBuilder.kt b/src/Java/JavaDocumentationBuilder.kt
index 01ecb478..88c13d38 100644
--- a/src/Java/JavaDocumentationBuilder.kt
+++ b/src/Java/JavaDocumentationBuilder.kt
@@ -108,8 +108,11 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions,
     }
 
     private fun MutableContent.convertSeeTag(tag: PsiDocTag) {
-        val linkElement = tag.linkElement() ?: return
-        val seeSection = findSectionByTag("See Also") ?: addSection("See Also", null)
+        val linkElement = tag.linkElement()
+        if (linkElement == null) {
+            return
+        }
+        val seeSection = findSectionByTag(ContentTags.SeeAlso) ?: addSection(ContentTags.SeeAlso, null)
         val linkSignature = resolveLink(linkElement)
         val text = ContentText(linkElement.text)
         if (linkSignature != null) {
@@ -189,7 +192,7 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions,
         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.map { it.type.typeSignature() }.join(",") + ")"
         else -> null
     }
 
@@ -339,6 +342,7 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions,
 
     fun DocumentationNode.appendModifiers(element: PsiModifierListOwner) {
         val modifierList = element.modifierList ?: return
+
         PsiModifier.MODIFIERS.forEach {
             if (it != "static" && modifierList.hasExplicitModifier(it)) {
                 appendTextNode(it, Kind.Modifier)