diff options
| author | Marcin Aman <marcin.aman@gmail.com> | 2021-08-25 20:55:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-25 20:55:41 +0200 |
| commit | f2adc0a50462a63f7e1901db2e58077001acd622 (patch) | |
| tree | a0a21d3c99b2d8cbe77ebf95d865aabd36d6598f /core/src/main/kotlin/model/additionalExtras.kt | |
| parent | 939cbcd4d867961516da71f7c55d037ec88cb7f3 (diff) | |
| parent | efc9f92b0ac083c73ac494c95b530305ac04115a (diff) | |
| download | dokka-f2adc0a50462a63f7e1901db2e58077001acd622.tar.gz dokka-f2adc0a50462a63f7e1901db2e58077001acd622.tar.bz2 dokka-f2adc0a50462a63f7e1901db2e58077001acd622.zip | |
Merge pull request #2066 from Kotlin/webhelp-like-frontend
Webhelp like frontend
Diffstat (limited to 'core/src/main/kotlin/model/additionalExtras.kt')
| -rw-r--r-- | core/src/main/kotlin/model/additionalExtras.kt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/kotlin/model/additionalExtras.kt b/core/src/main/kotlin/model/additionalExtras.kt index 62e1fa2d..bc9135dd 100644 --- a/core/src/main/kotlin/model/additionalExtras.kt +++ b/core/src/main/kotlin/model/additionalExtras.kt @@ -116,7 +116,7 @@ data class ActualTypealias(val underlyingType: SourceSetDependent<Bound>) : Extr override val key: ExtraProperty.Key<DClasslike, ActualTypealias> = ActualTypealias } -data class ConstructorValues(val values: SourceSetDependent<List<String>>) : ExtraProperty<DEnumEntry> { +data class ConstructorValues(val values: SourceSetDependent<List<Expression>>) : ExtraProperty<DEnumEntry> { companion object : ExtraProperty.Key<DEnumEntry, ConstructorValues> { override fun mergeStrategyFor(left: ConstructorValues, right: ConstructorValues) = MergeStrategy.Replace(ConstructorValues(left.values + right.values)) |