From 00dadd1a1ca1fe3bf95f901cdc2416fdb90b433a Mon Sep 17 00:00:00 2001 From: Lilleman auf Larv Date: Sat, 14 Nov 2026 16:11:19 +0100 Subject: [PATCH] Split adfToPlainText's step and line-feed helpers out of its writer --- src/plain-text/adf-to-plain-text.ts | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/plain-text/adf-to-plain-text.ts b/src/plain-text/adf-to-plain-text.ts index ad2dfca..659421d 100644 --- a/src/plain-text/adf-to-plain-text.ts +++ b/src/plain-text/adf-to-plain-text.ts @@ -42,8 +42,7 @@ function writeText(content: readonly AdfNode[]): Result { let literal = 0 function emit(text: string): void { - let end = text.length - while (end > 0 && text[end - 1] === '\n') end -= 1 + const end = endBeforeLineFeeds(text) if (end > 0) { const owed = Math.max(gap, literal) const head = length === 0 || owed > 0 ? `${length === 0 ? '' : '\n'.repeat(owed)}${lead ?? indent}` : '' @@ -52,9 +51,8 @@ function writeText(content: readonly AdfNode[]): Result { length += head.length + body.length gap = 0 lead = undefined - literal = 0 } - literal += text.length - end + literal = (end > 0 ? 0 : literal) + text.length - end } const pending: Step[] = childSteps(content, { level: 1, lines: 2 }, 0, undefined, () => undefined).reverse() @@ -88,6 +86,17 @@ function writeText(content: readonly AdfNode[]): Result { return success(pieces.join('')) } +function endBeforeLineFeeds(text: string): number { + let end = text.length + while (end > 0 && text[end - 1] === '\n') end -= 1 + return end +} + +function stepsWithin(node: AdfNode, depth: number, place: Place | undefined): Step[] { + const layout = layoutOf(node) + return childSteps(nodeContent(node), layout, depth + layout.level, place, markerFor(node)) +} + // The steps for `nodes` in document order, `layout.lines` line feeds apart. function childSteps(nodes: readonly AdfNode[], layout: Layout, depth: number, parent: Place | undefined, markerFor: (index: number, node: AdfNode) => string | undefined): Step[] { const steps: Step[] = []