Move the Properties block to be above Functions

Kotlin · Mar 8, 2023 · 08f77ef · 08f77ef
1 parent 14c05d7
commit 08f77ef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt b/plugins/base/src/main/kotlin/renderers/html/HtmlRenderer.kt
@@ -90,17 +90,17 @@ open class HtmlRenderer(
                     listOf(
                         BasicTabbedContentType.CONSTRUCTOR,
                         BasicTabbedContentType.TYPE,
-                        BasicTabbedContentType.FUNCTION,
-                        BasicTabbedContentType.PROPERTY
+                        BasicTabbedContentType.PROPERTY,
+                        BasicTabbedContentType.FUNCTION
                     )
                 ),
             if (extensions.isEmpty()) null else ContentTab(
                 "Members & Extensions",
                 listOf(
                     BasicTabbedContentType.CONSTRUCTOR,
                     BasicTabbedContentType.TYPE,
-                    BasicTabbedContentType.FUNCTION,
                     BasicTabbedContentType.PROPERTY,
+                    BasicTabbedContentType.FUNCTION,
                     BasicTabbedContentType.EXTENSION_PROPERTY,
                     BasicTabbedContentType.EXTENSION_FUNCTION
                 )

diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -318,10 +318,10 @@ open class DefaultPageCreator(
                 "Inherited functions", inheritedFunctions + inheritedExtensionFunctions
             )
         } else {
-            functionsBlock("Functions", functions + extensionFuns)
             propertiesBlock(
                 "Properties", properties + extensionProps
             )
+            functionsBlock("Functions", functions + extensionFuns)
         }
     }
 
@@ -740,4 +740,4 @@ internal inline fun <reified T : NamedTagWrapper> GroupedTags.withTypeNamed(): M
 // Annotations might have constructors to substitute reflection invocations
 // and for internal/compiler purposes, but they are not expected to be documented
 // and instantiated directly under normal circumstances, so constructors should not be rendered.
-internal fun List<Documentable>.shouldDocumentConstructors() = !this.any { it is DAnnotation }
+internal fun List<Documentable>.shouldDocumentConstructors() = !this.any { it is DAnnotation }