Skip to content

Commit ed405dc

Browse files
committed
feat: add newline between description blocks
1 parent d0e64c0 commit ed405dc

17 files changed

Lines changed: 38 additions & 32 deletions

mmrpc-definition/src/commonMain/kotlin/builder/ArrayDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class ArrayDefinitionBuilder :
1616
val cn = buildCanonicalName()
1717
return ArrayDefinition(
1818
canonicalName = cn,
19-
description = this.description,
20-
metadata = this.metadata.toList(),
19+
description = buildDescription(),
20+
metadata = buildMetadata(),
2121
type = this::type.getOrThrow()
2222
.asAnonSiblingOf(cn, "type"),
2323
)

mmrpc-definition/src/commonMain/kotlin/builder/ConstDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class ConstDefinitionBuilder :
1717
val cn = buildCanonicalName()
1818
return ConstDefinition(
1919
canonicalName = cn,
20-
description = this.description,
21-
metadata = this.metadata.toList(),
20+
description = buildDescription(),
21+
metadata = buildMetadata(),
2222
type = this::type.getOrThrow()
2323
.asAnonSiblingOf(cn, "type"),
2424
value = this::value.getOrThrow(),

mmrpc-definition/src/commonMain/kotlin/builder/ContainerExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ fun traitList(block: context(TraitDefinitionContainerBuilder) () -> Unit): List<
2020

2121
@Marker2
2222
fun markdown(block: context(MarkdownContainerBuilder) () -> Unit): String =
23-
buildString { block { append(it) } }
23+
buildList { block { add(it) } }.joinToString("\n")

mmrpc-definition/src/commonMain/kotlin/builder/ElementDefinitionBuilder.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sealed class ElementDefinitionBuilder :
1010
MetadataUsageContainerBuilder {
1111
lateinit var name: String
1212
var namespace: CanonicalName? = null
13-
var description = ""
13+
val description = mutableListOf<String>()
1414
val metadata = mutableListOf<MetadataUsage>()
1515

1616
override fun addMarkdown(value: String) {
@@ -23,4 +23,10 @@ sealed class ElementDefinitionBuilder :
2323

2424
protected fun buildCanonicalName() =
2525
CanonicalName(namespace, name)
26+
27+
protected fun buildDescription() =
28+
description.joinToString("\n")
29+
30+
protected fun buildMetadata() =
31+
metadata.toList()
2632
}

mmrpc-definition/src/commonMain/kotlin/builder/EnumDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ open class EnumDefinitionBuilder :
2323
val cn = buildCanonicalName()
2424
return EnumDefinition(
2525
canonicalName = cn,
26-
description = this.description,
27-
metadata = this.metadata.toList(),
26+
description = buildDescription(),
27+
metadata = buildMetadata(),
2828
type = this::type.getOrThrow()
2929
.asAnonChildOf(cn, "type"),
3030
entries = this.entries.mapIndexed { i, it ->

mmrpc-definition/src/commonMain/kotlin/builder/FaultDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ class FaultDefinitionBuilder :
1515
val cn = buildCanonicalName()
1616
return FaultDefinition(
1717
canonicalName = cn,
18-
description = this.description,
19-
metadata = this.metadata.toList(),
18+
description = buildDescription(),
19+
metadata = buildMetadata(),
2020
)
2121
}
2222
}

mmrpc-definition/src/commonMain/kotlin/builder/FieldDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class FieldDefinitionBuilder :
1818
val cn = buildCanonicalName()
1919
return FieldDefinition(
2020
canonicalName = cn,
21-
description = this.description,
22-
metadata = this.metadata.toList(),
21+
description = buildDescription(),
22+
metadata = buildMetadata(),
2323
key = this.key,
2424
type = this::type.getOrThrow()
2525
.asAnonSiblingOf(cn, "type"),

mmrpc-definition/src/commonMain/kotlin/builder/MapDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class MapDefinitionBuilder :
1616
val cn = buildCanonicalName()
1717
return MapDefinition(
1818
canonicalName = cn,
19-
description = this.description,
20-
metadata = this.metadata.toList(),
19+
description = buildDescription(),
20+
metadata = buildMetadata(),
2121
type = this::type.getOrThrow()
2222
.asAnonSiblingOf(cn, "type"),
2323
)

mmrpc-definition/src/commonMain/kotlin/builder/MetadataDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class MetadataDefinitionBuilder :
2626
val cn = buildCanonicalName()
2727
return MetadataDefinition(
2828
canonicalName = cn,
29-
description = this.description,
30-
metadata = this.metadata.toList(),
29+
description = buildDescription(),
30+
metadata = buildMetadata(),
3131
repeated = this.repeated,
3232
fields = this.fields.mapIndexed { i, it ->
3333
it.asAnonChildOf(cn, "field", i)

mmrpc-definition/src/commonMain/kotlin/builder/OptionalDefinitionBuilder.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class OptionalDefinitionBuilder :
1616
val cn = buildCanonicalName()
1717
return OptionalDefinition(
1818
canonicalName = cn,
19-
description = this.description,
20-
metadata = this.metadata.toList(),
19+
description = buildDescription(),
20+
metadata = buildMetadata(),
2121
type = this::type.getOrThrow()
2222
.asAnonSiblingOf(cn, "type"),
2323
)

0 commit comments

Comments
 (0)