Skip to content

Motion diff issue with nested list and text change #5871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
reiterl wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Motion diff issue with nested list and text change #5871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecc8276
Add an unittest which shows the problem in html diff part
reiterl Feb 12, 2026
44ea90a
Merge branch 'main' into 5856-diff-amendments-nested-lists
Elblinator Mar 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions packages/openslides-motion-diff/src/diff/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,29 @@
expect(diff).toBe(expected);
});

it(`handles inserted text within nested lists`, () => {
const before =
`<ul><li><span class="os-line-number line-number-1" data-line-number="1" contenteditable="false">&nbsp;</span>Ebene 1` +
`<ul><li><span class="os-line-number line-number-2" data-line-number="2" contenteditable="false">&nbsp;</span>Ebene 2` +
`</li><li><span class="os-line-number line-number-3" data-line-number="3" contenteditable="false">&nbsp;</span>Ebene 3` +
`</li></ul></li></ul>`,
after =
`<ul><li>Ebene 1` +
`<ul><li>Ebene 2a` +
`</li><li>Ebene 3` +
`</li></ul></li></ul>`,
expected =
`<ul><li><span class="line-number-1 os-line-number" contenteditable="false" data-line-number="1">&nbsp;</span>Ebene 1` +
`<ul><li><span class="line-number-2 os-line-number" contenteditable="false" data-line-number="2">&nbsp;</span>` +
`Ebene 2<ins>a</ins>` +
`</li><li><span class="line-number-3 os-line-number" contenteditable="false" data-line-number="3">&nbsp;</span>` +
`Ebene 3` +
`</li></ul></li></ul>`;

const diff = HtmlDiff.diff(before, after);
expect(diff).toBe(expected);

Check failure on line 845 in packages/openslides-motion-diff/src/diff/index.spec.ts

View workflow job for this annotation

GitHub Actions / build-and-test-package-motion-diff

src/diff/index.spec.ts > MotionDiffService > the core diff algorithm > handles inserted text within nested lists 

AssertionError: expected '<ul><li><span class="line-number-1 os…' to be '<ul><li><span class="line-number-1 os…' // Object.is equality

Expected: "<ul><li><span class="line-number-1 os-line-number" contenteditable="false" data-line-number="1">&nbsp;</span>Ebene 1<ul><li><span class="line-number-2 os-line-number" contenteditable="false" data-line-number="2">&nbsp;</span>Ebene 2<ins>a</ins></li><li><span class="line-number-3 os-line-number" contenteditable="false" data-line-number="3">&nbsp;</span>Ebene 3</li></ul></li></ul>"
Received: "<ul><li><span class="line-number-1 os-line-number" contenteditable="false" data-line-number="1">&nbsp;</span>Ebene 1<ul><li><span class="line-number-2 os-line-number" contenteditable="false" data-line-number="2">&nbsp;</span><del>Ebene 2</del></li><li><span class="line-number-3 os-line-number" contenteditable="false" data-line-number="3">&nbsp;</span><ins>Ebene 2a</ins></li><li>Ebene 3</li></ul></li></ul>"

 ❯ src/diff/index.spec.ts:845:26
});

it(`handles replaced text at the end of nested lists`, () => {
// Hint: line number should be moved into first element
const before =
Expand Down
Loading