updated according to language change: class object -> default object

5 files changed, 17 insertions, 16 deletions

diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt
index 8309d053..10650ab2 100644
--- a/src/Formats/StructuredFormatService.kt
+++ b/src/Formats/StructuredFormatService.kt
@@ -238,8 +238,8 @@ public abstract class StructuredFormatService(val locationService: LocationServi
             appendSection(location, "Constructors", node.members(DocumentationNode.Kind.Constructor), node, to)
             appendSection(location, "Properties", node.members(DocumentationNode.Kind.Property), node, to)
             appendSection(location, "Functions", node.members(DocumentationNode.Kind.Function), node, to)
-            appendSection(location, "Class Object Properties", node.members(DocumentationNode.Kind.ClassObjectProperty), node, to)
-            appendSection(location, "Class Object Functions", node.members(DocumentationNode.Kind.ClassObjectFunction), node, to)
+            appendSection(location, "Default Object Properties", node.members(DocumentationNode.Kind.DefaultObjectProperty), node, to)
+            appendSection(location, "Default Object Functions", node.members(DocumentationNode.Kind.DefaultObjectFunction), node, to)
             appendSection(location, "Accessors", node.members(DocumentationNode.Kind.PropertyAccessor), node, to)
             appendSection(location, "Enum Values", node.members(DocumentationNode.Kind.EnumItem), node, to)
             appendSection(location, "Other members", node.members.filter {
@@ -254,8 +254,8 @@ public abstract class StructuredFormatService(val locationService: LocationServi
                         DocumentationNode.Kind.Package,
                         DocumentationNode.Kind.Function,
                         DocumentationNode.Kind.PropertyAccessor,
-                        DocumentationNode.Kind.ClassObjectProperty,
-                        DocumentationNode.Kind.ClassObjectFunction,
+                        DocumentationNode.Kind.DefaultObjectProperty,
+                        DocumentationNode.Kind.DefaultObjectFunction,
                         DocumentationNode.Kind.ExternalClass,
                         DocumentationNode.Kind.EnumItem
                         )
diff --git a/src/Java/JavaDocumentationBuilder.kt b/src/Java/JavaDocumentationBuilder.kt
index d501d98a..5b4a6bfa 100644
--- a/src/Java/JavaDocumentationBuilder.kt
+++ b/src/Java/JavaDocumentationBuilder.kt
@@ -136,7 +136,7 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions)
 
     private fun PsiField.nodeKind(): Kind = when {
         this is PsiEnumConstant -> Kind.EnumItem
-        hasModifierProperty(PsiModifier.STATIC) -> Kind.ClassObjectProperty
+        hasModifierProperty(PsiModifier.STATIC) -> Kind.DefaultObjectProperty
         else -> Kind.Property
     }
 
@@ -154,7 +154,7 @@ public class JavaDocumentationBuilder(private val options: DocumentationOptions)
 
     private fun PsiMethod.nodeKind(): Kind = when {
         isConstructor() -> Kind.Constructor
-        hasModifierProperty(PsiModifier.STATIC) -> Kind.ClassObjectFunction
+        hasModifierProperty(PsiModifier.STATIC) -> Kind.DefaultObjectFunction
         else -> Kind.Function
     }
 
diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt
index e77f97c9..0ad93801 100644
--- a/src/Kotlin/DocumentationBuilder.kt
+++ b/src/Kotlin/DocumentationBuilder.kt
@@ -270,8 +270,9 @@ class DocumentationBuilder(val session: ResolveSession, val options: Documentati
                 getConstructors()
             node.appendChildren(constructorsToDocument, DocumentationReference.Kind.Member)
         }
-        node.appendChildren(getDefaultType().getMemberScope().getAllDescriptors(), DocumentationReference.Kind.Member)
-        val classObjectDescriptor = getClassObjectDescriptor()
+        val members = getDefaultType().getMemberScope().getAllDescriptors().filter { it != getDefaultObjectDescriptor() }
+        node.appendChildren(members, DocumentationReference.Kind.Member)
+        val classObjectDescriptor = getDefaultObjectDescriptor()
         if (classObjectDescriptor != null) {
             node.appendChildren(classObjectDescriptor.getDefaultType().getMemberScope().getAllDescriptors(),
                     DocumentationReference.Kind.Member)
@@ -302,7 +303,7 @@ class DocumentationBuilder(val session: ResolveSession, val options: Documentati
     }
 
     fun FunctionDescriptor.build(): DocumentationNode {
-        val node = DocumentationNode(this, if (inClassObject()) Kind.ClassObjectFunction else Kind.Function)
+        val node = DocumentationNode(this, if (inClassObject()) Kind.DefaultObjectFunction else Kind.Function)
 
         node.appendChildren(getTypeParameters(), DocumentationReference.Kind.Detail)
         getExtensionReceiverParameter()?.let { node.appendChild(it, DocumentationReference.Kind.Detail) }
@@ -328,7 +329,7 @@ class DocumentationBuilder(val session: ResolveSession, val options: Documentati
     }
 
     fun PropertyDescriptor.build(): DocumentationNode {
-        val node = DocumentationNode(this, if (inClassObject()) Kind.ClassObjectProperty else Kind.Property)
+        val node = DocumentationNode(this, if (inClassObject()) Kind.DefaultObjectProperty else Kind.Property)
         node.appendChildren(getTypeParameters(), DocumentationReference.Kind.Detail)
         getExtensionReceiverParameter()?.let { node.appendChild(it, DocumentationReference.Kind.Detail) }
         node.appendType(getReturnType())
diff --git a/src/Kotlin/KotlinLanguageService.kt b/src/Kotlin/KotlinLanguageService.kt
index 526582e6..56baad58 100644
--- a/src/Kotlin/KotlinLanguageService.kt
+++ b/src/Kotlin/KotlinLanguageService.kt
@@ -26,10 +26,10 @@ class KotlinLanguageService : LanguageService {
                 DocumentationNode.Kind.Modifier -> renderModifier(node)
                 DocumentationNode.Kind.Constructor,
                 DocumentationNode.Kind.Function,
-                DocumentationNode.Kind.ClassObjectFunction,
+                DocumentationNode.Kind.DefaultObjectFunction,
                 DocumentationNode.Kind.PropertyAccessor -> renderFunction(node)
                 DocumentationNode.Kind.Property,
-                DocumentationNode.Kind.ClassObjectProperty -> renderProperty(node)
+                DocumentationNode.Kind.DefaultObjectProperty -> renderProperty(node)
                 else -> identifier(node.name)
             }
         }
@@ -215,7 +215,7 @@ class KotlinLanguageService : LanguageService {
         when (node.kind) {
             DocumentationNode.Kind.Constructor -> identifier(node.owner!!.name)
             DocumentationNode.Kind.Function,
-            DocumentationNode.Kind.ClassObjectFunction -> keyword("fun ")
+            DocumentationNode.Kind.DefaultObjectFunction -> keyword("fun ")
             DocumentationNode.Kind.PropertyAccessor -> {}
             else -> throw IllegalArgumentException("Node $node is not a function-like object")
         }
@@ -251,7 +251,7 @@ class KotlinLanguageService : LanguageService {
         renderAnnotationsForNode(node)
         when (node.kind) {
             DocumentationNode.Kind.Property,
-            DocumentationNode.Kind.ClassObjectProperty -> keyword("${node.getPropertyKeyword()} ")
+            DocumentationNode.Kind.DefaultObjectProperty -> keyword("${node.getPropertyKeyword()} ")
             else -> throw IllegalArgumentException("Node $node is not a property")
         }
         renderTypeParametersForNode(node)
diff --git a/src/Model/DocumentationNode.kt b/src/Model/DocumentationNode.kt
index ee948a87..f0c3ddf5 100644
--- a/src/Model/DocumentationNode.kt
+++ b/src/Model/DocumentationNode.kt
@@ -69,8 +69,8 @@ public open class DocumentationNode(val name: String,
         Property
         PropertyAccessor
 
-        ClassObjectProperty
-        ClassObjectFunction
+        DefaultObjectProperty
+        DefaultObjectFunction
 
         Parameter
         Receiver