mirror of
https://github.com/larvit/adf-codec.git
synced 2026-11-18 22:25:44 +01:00
Pin the replay's edge cases as fixed tests, delete its merge step that no drop reaches, file item 191
This commit is contained in:
@@ -137,6 +137,19 @@ for (const [name, line] of blankLines) {
|
||||
})
|
||||
}
|
||||
|
||||
const em: AdfMark = { type: 'em' }
|
||||
const replayedLines: readonly [string, AdfNode[], AdfNode[]][] = [
|
||||
['the lead whitespace a dropped blank leaves at the line start', [marked(' ', em), marked(' x')], [{ text: 'x', type: 'text' }]],
|
||||
['the trail whitespace dropped blanks leave before a hard break', [marked('x ', link), marked(' ', em, link), marked(' ', link), marked(' ', em, link), { type: 'hardBreak' }, marked('y', link)], [marked('x', link), { type: 'hardBreak' }, marked('y', link)]],
|
||||
['the lead whitespace dropped blanks leave after a hard break', [marked('y', link), { type: 'hardBreak' }, marked(' ', em, link), marked(' ', link), marked(' ', em, link), marked(' x', link)], [marked('y', link), { type: 'hardBreak' }, marked('x', link)]],
|
||||
['a blank beside a leaf holding no text', [marked(' ', em), { attrs: { id: 'a' }, type: 'mention' }], [{ attrs: { id: 'a' }, type: 'mention' }]],
|
||||
]
|
||||
for (const [name, line, trimmed] of replayedLines) {
|
||||
test(`trims ${name} in 2 passes`, () => {
|
||||
assert.deepEqual(trimmedWith(line, spannedPass), { line: trimmed, passes: 2 })
|
||||
})
|
||||
}
|
||||
|
||||
function alternatingBlanks(blanks: number, first: AdfNode, second: AdfNode): AdfNode[] {
|
||||
return Array.from({ length: blanks }, (_, index) => (index % 2 === 0 ? first : second))
|
||||
}
|
||||
|
||||
@@ -216,8 +216,7 @@ function withoutEdgeWhitespace(leaves: readonly AdfNode[], grouping: RunGrouping
|
||||
// Every leaf of a round is judged before any changes, as `trimPass` judges against one snapshot.
|
||||
const outcomes = [...judged].flatMap((position) => {
|
||||
const node = linked[position]
|
||||
const leaf = node === undefined || node.dropped ? undefined : withoutLineEdges(node, linked, grouping)
|
||||
return node === undefined || node.dropped || leaf === node.leaf ? [] : [{ leaf, node }]
|
||||
return node === undefined || node.dropped ? [] : [{ leaf: withoutLineEdges(node, linked, grouping), node }]
|
||||
})
|
||||
judged = new Set()
|
||||
for (const { leaf, node } of outcomes) {
|
||||
@@ -228,17 +227,6 @@ function withoutEdgeWhitespace(leaves: readonly AdfNode[], grouping: RunGrouping
|
||||
unlink(node, linked)
|
||||
judged.add(node.previous).add(node.next)
|
||||
}
|
||||
// `trimPass` merges before it judges, so leaves a drop brings together reach an edge as one.
|
||||
for (const position of judged) {
|
||||
const node = linked[position]
|
||||
if (node === undefined || node.dropped) continue
|
||||
for (let next = linked[node.next]; next !== undefined && next.breakBefore === undefined; next = linked[node.next]) {
|
||||
const [merged, unmerged] = mergeAdjacentText([node.leaf, next.leaf], joinsWhenEditorNormal)
|
||||
if (merged === undefined || unmerged !== undefined) break
|
||||
node.leaf = merged
|
||||
unlink(next, linked)
|
||||
}
|
||||
}
|
||||
}
|
||||
const kept: AdfNode[] = []
|
||||
let position = 0
|
||||
|
||||
Reference in New Issue
Block a user