Merge branch 'property-var'

Conflicts:
	test/src/format/MarkdownFormatTest.kt

2 files changed, 9 insertions, 2 deletions

diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt
index 0b978370..d7ba8a32 100644
--- a/src/Kotlin/DocumentationBuilder.kt
+++ b/src/Kotlin/DocumentationBuilder.kt
@@ -285,6 +285,10 @@ class DocumentationBuilder(val session: ResolveSession, val options: Documentati
         getExtensionReceiverParameter()?.let { node.appendChild(it, DocumentationReference.Kind.Detail) }
         node.appendType(getReturnType())
         node.appendAnnotations(this)
+        if (isVar()) {
+            node.append(DocumentationNode("var", Content.Empty, DocumentationNode.Kind.Modifier),
+                    DocumentationReference.Kind.Detail)
+        }
         getGetter()?.let {
             if (!it.isDefault())
                 node.appendChild(it, DocumentationReference.Kind.Member)
diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt
index 8795aba6..c273ff3d 100644
--- a/src/Kotlin/KotlinLanguageService.kt
+++ b/src/Kotlin/KotlinLanguageService.kt
@@ -108,7 +108,7 @@ class KotlinLanguageService : LanguageService {
 
     private fun ContentNode.renderModifier(node: DocumentationNode) {
         when (node.name) {
-            "final", "internal" -> {}
+            "final", "internal", "var" -> {}
             else -> {
                 keyword(node.name)
                 text(" ")
@@ -237,7 +237,7 @@ class KotlinLanguageService : LanguageService {
         renderAnnotationsForNode(node)
         when (node.kind) {
             DocumentationNode.Kind.Property,
-            DocumentationNode.Kind.ClassObjectProperty -> keyword("val ")
+            DocumentationNode.Kind.ClassObjectProperty -> keyword("${node.getPropertyKeyword()} ")
             else -> throw IllegalArgumentException("Node $node is not a property")
         }
         renderTypeParametersForNode(node)
@@ -252,6 +252,9 @@ class KotlinLanguageService : LanguageService {
         renderType(node.detail(DocumentationNode.Kind.Type))
     }
 
+    fun DocumentationNode.getPropertyKeyword() =
+            if (details(DocumentationNode.Kind.Modifier).any { it.name == "var" }) "var" else "val"
+
     fun ContentNode.identifierOrDeprecated(node: DocumentationNode) {
         if (node.deprecation != null) {
             val strike = ContentStrikethrough()