2 files changed, 32 insertions, 1 deletions
diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt
index 57f8572f..c00580c5 100644
--- a/src/Kotlin/DocumentationBuilder.kt
+++ b/src/Kotlin/DocumentationBuilder.kt
@@ -9,6 +9,9 @@ import org.jetbrains.jet.lang.resolve.lazy.*
 import org.jetbrains.jet.lang.descriptors.annotations.Annotated
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.jet.lang.resolve.DescriptorUtils
+import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant
+import com.intellij.openapi.util.text.StringUtil
+import org.jetbrains.jet.lang.descriptors.impl.EnumEntrySyntheticClassDescriptor
 
 public data class DocumentationOptions(val includeNonPublic: Boolean = false)
 
@@ -290,10 +293,30 @@ class DocumentationBuilder(val session: ResolveSession, val options: Documentati
     fun AnnotationDescriptor.build(): DocumentationNode {
         val annotationClass = getType().getConstructor().getDeclarationDescriptor()
         val node = DocumentationNode(annotationClass.getName().asString(), Content.Empty, DocumentationNode.Kind.Annotation)
-        // TODO handle parameters
+        val arguments = getAllValueArguments().toList().sortBy { it.first.getIndex() }
+        arguments.forEach {
+            val valueNode = it.second.build()
+            if (valueNode != null) {
+                val paramNode = DocumentationNode(it.first.getName().asString(), Content.Empty, DocumentationNode.Kind.Parameter)
+                paramNode.append(valueNode, DocumentationReference.Kind.Detail)
+                node.append(paramNode, DocumentationReference.Kind.Detail)
+            }
+        }
         return node
     }
 
+    fun CompileTimeConstant<out Any?>.build(): DocumentationNode? {
+        val value = getValue()
+        val valueString = when(value) {
+            is String ->
+                "\"" + StringUtil.escapeStringCharacters(value) + "\""
+            is EnumEntrySyntheticClassDescriptor ->
+                value.getContainingDeclaration().getName().asString() + "." + value.getName()
+            else -> value?.toString()
+        }
+        return if (valueString != null) DocumentationNode(valueString, Content.Empty, DocumentationNode.Kind.Value) else null
+    }
+
     /**
      * Generates cross-references for documentation such as extensions for a type, inheritors, etc
      *
diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt
index 0538ba74..92d5bf1d 100644
--- a/src/Kotlin/KotlinLanguageService.kt
+++ b/src/Kotlin/KotlinLanguageService.kt
@@ -172,6 +172,14 @@ class KotlinLanguageService : LanguageService {
 
     private fun ContentNode.renderAnnotation(node: DocumentationNode) {
         identifier(node.name)
+        val parameters = node.details(DocumentationNode.Kind.Parameter)
+        if (!parameters.isEmpty()) {
+            symbol("(")
+            renderList(parameters) {
+                text(it.detail(DocumentationNode.Kind.Value).name)
+            }
+            symbol(")")
+        }
         text(" ")
     }