From 7db15c357a417ccd9ff8ad1f90f5aff84eec132f Mon Sep 17 00:00:00 2001
From: Błażej Kardyś <bkardys@virtuslab.com>
Date: Tue, 6 Oct 2020 04:54:31 +0200
Subject: Adding function division switch

---
 core/src/main/kotlin/defaultConfiguration.kt         | 12 ++++++------
 core/src/main/kotlin/model/documentableProperties.kt | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'core/src')

diff --git a/core/src/main/kotlin/defaultConfiguration.kt b/core/src/main/kotlin/defaultConfiguration.kt
index a28df152..61c86c5a 100644
--- a/core/src/main/kotlin/defaultConfiguration.kt
+++ b/core/src/main/kotlin/defaultConfiguration.kt
@@ -14,7 +14,7 @@ data class DokkaConfigurationImpl(
     override val pluginsClasspath: List<File> = emptyList(),
     override val pluginsConfiguration: List<PluginConfigurationImpl> = DokkaDefaults.pluginsConfiguration,
     override val modules: List<DokkaModuleDescriptionImpl> = emptyList(),
-    override val failOnWarning: Boolean = DokkaDefaults.failOnWarning
+    override val failOnWarning: Boolean = DokkaDefaults.failOnWarning,
 ) : DokkaConfiguration
 
 data class PluginConfigurationImpl(
@@ -45,19 +45,19 @@ data class DokkaSourceSetImpl(
     override val noStdlibLink: Boolean = DokkaDefaults.noStdlibLink,
     override val noJdkLink: Boolean = DokkaDefaults.noJdkLink,
     override val suppressedFiles: Set<File> = emptySet(),
-    override val analysisPlatform: Platform = DokkaDefaults.analysisPlatform
+    override val analysisPlatform: Platform = DokkaDefaults.analysisPlatform,
 ) : DokkaSourceSet
 
 data class DokkaModuleDescriptionImpl(
     override val name: String,
     override val relativePathToOutputDirectory: File,
-    override val includes: Set<File>
+    override val includes: Set<File>,
 ) : DokkaConfiguration.DokkaModuleDescription
 
 data class SourceLinkDefinitionImpl(
     override val localDirectory: String,
     override val remoteUrl: URL,
-    override val remoteLineSuffix: String?
+    override val remoteLineSuffix: String?,
 ) : DokkaConfiguration.SourceLinkDefinition {
     companion object {
         fun parseSourceLinkDefinition(srcLink: String): SourceLinkDefinitionImpl {
@@ -75,11 +75,11 @@ data class PackageOptionsImpl(
     override val includeNonPublic: Boolean,
     override val reportUndocumented: Boolean?,
     override val skipDeprecated: Boolean,
-    override val suppress: Boolean
+    override val suppress: Boolean,
 ) : DokkaConfiguration.PackageOptions
 
 
 data class ExternalDocumentationLinkImpl(
     override val url: URL,
-    override val packageListUrl: URL
+    override val packageListUrl: URL,
 ) : DokkaConfiguration.ExternalDocumentationLink
diff --git a/core/src/main/kotlin/model/documentableProperties.kt b/core/src/main/kotlin/model/documentableProperties.kt
index 991f5311..209a6296 100644
--- a/core/src/main/kotlin/model/documentableProperties.kt
+++ b/core/src/main/kotlin/model/documentableProperties.kt
@@ -5,16 +5,16 @@ import org.jetbrains.dokka.links.DRI
 import org.jetbrains.dokka.model.properties.ExtraProperty
 import org.jetbrains.dokka.model.properties.MergeStrategy
 
-data class InheritedFunction(val inheritedFrom: SourceSetDependent<DRI?>) : ExtraProperty<DFunction> {
-    companion object : ExtraProperty.Key<DFunction, InheritedFunction> {
-        override fun mergeStrategyFor(left: InheritedFunction, right: InheritedFunction) = MergeStrategy.Replace(
-            InheritedFunction(left.inheritedFrom + right.inheritedFrom)
+data class InheritedMember(val inheritedFrom: SourceSetDependent<DRI?>) : ExtraProperty<Documentable> {
+    companion object : ExtraProperty.Key<Documentable, InheritedMember> {
+        override fun mergeStrategyFor(left: InheritedMember, right: InheritedMember) = MergeStrategy.Replace(
+            InheritedMember(left.inheritedFrom + right.inheritedFrom)
         )
     }
 
     fun isInherited(sourceSetDependent: DokkaSourceSet): Boolean = inheritedFrom[sourceSetDependent] != null
 
-    override val key: ExtraProperty.Key<DFunction, *> = InheritedFunction
+    override val key: ExtraProperty.Key<Documentable, *> = InheritedMember
 }
 
 data class ImplementedInterfaces(val interfaces: SourceSetDependent<List<TypeConstructor>>) : ExtraProperty<Documentable> {
-- 
cgit