show extensions applicable to superclasses in the list of class members

3 files changed, 26 insertions, 5 deletions

diff --git a/src/Formats/StructuredFormatService.kt b/src/Formats/StructuredFormatService.kt
index 8bc60826..d6a167d5 100644
--- a/src/Formats/StructuredFormatService.kt
+++ b/src/Formats/StructuredFormatService.kt
@@ -337,14 +337,32 @@ public abstract class StructuredFormatService(locationService: LocationService,
                         DocumentationNode.Kind.EnumItem
                         )
             }, node, to)
-            appendSection(location, "Extension Properties", node.extensions.filter { it.kind == DocumentationNode.Kind.Property }, node, to)
-            appendSection(location, "Extension Functions", node.extensions.filter { it.kind == DocumentationNode.Kind.Function }, node, to)
-            appendSection(location, "Companion Object Extension Properties", node.extensions.filter { it.kind == DocumentationNode.Kind.CompanionObjectProperty }, node, to)
-            appendSection(location, "Companion Object Extension Functions", node.extensions.filter { it.kind == DocumentationNode.Kind.CompanionObjectFunction }, node, to)
+
+            val allExtensions = collectAllExtensions(node)
+            appendSection(location, "Extension Properties", allExtensions.filter { it.kind == DocumentationNode.Kind.Property }, node, to)
+            appendSection(location, "Extension Functions", allExtensions.filter { it.kind == DocumentationNode.Kind.Function }, node, to)
+            appendSection(location, "Companion Object Extension Properties", allExtensions.filter { it.kind == DocumentationNode.Kind.CompanionObjectProperty }, node, to)
+            appendSection(location, "Companion Object Extension Functions", allExtensions.filter { it.kind == DocumentationNode.Kind.CompanionObjectFunction }, node, to)
             appendSection(location, "Inheritors",
                     node.inheritors.filter { it.kind != DocumentationNode.Kind.EnumItem }, node, to)
             appendSection(location, "Links", node.links, node, to)
 
         }
     }
+
+    private fun collectAllExtensions(node: DocumentationNode): Collection<DocumentationNode> {
+        val result = LinkedHashSet<DocumentationNode>()
+        val visited = hashSetOf<DocumentationNode>()
+
+        fun collect(node: DocumentationNode) {
+            if (!visited.add(node)) return
+            result.addAll(node.extensions)
+            node.references(DocumentationReference.Kind.Superclass).forEach { collect(it.to) }
+        }
+
+        collect(node)
+
+        return result
+
+    }
 }
\ No newline at end of file
diff --git a/src/Kotlin/DocumentationBuilder.kt b/src/Kotlin/DocumentationBuilder.kt
index 08a74172..2d3105ac 100644
--- a/src/Kotlin/DocumentationBuilder.kt
+++ b/src/Kotlin/DocumentationBuilder.kt
@@ -279,7 +279,9 @@ class DocumentationBuilder(val resolutionFacade: ResolutionFacade,
         for (superType in superTypes) {
             if (!ignoreSupertype(superType)) {
                 appendType(superType, DocumentationNode.Kind.Supertype)
-                link(superType?.constructor?.declarationDescriptor, descriptor, DocumentationReference.Kind.Inheritor)
+                val superclass = superType?.constructor?.declarationDescriptor
+                link(superclass, descriptor, DocumentationReference.Kind.Inheritor)
+                link(descriptor, superclass, DocumentationReference.Kind.Superclass)
             }
         }
     }
diff --git a/src/Model/DocumentationReference.kt b/src/Model/DocumentationReference.kt
index 47b9a265..79cec2f3 100644
--- a/src/Model/DocumentationReference.kt
+++ b/src/Model/DocumentationReference.kt
@@ -10,6 +10,7 @@ public data class DocumentationReference(val from: DocumentationNode, val to: Do
         HiddenLink,
         Extension,
         Inheritor,
+        Superclass,
         Override,
         Annotation,
         Deprecation,