Skip to content

fix(json-patch-ot): merge equal str_ins operations at same position #940

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(json-patch-ot): merge equal str_ins operations at same position #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/json-patch-ot/__tests__/scenarios.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,6 +785,14 @@ const groups: ScenarioGroup[] = [
user2: [{op: 'str_ins', path: '/a', pos: 2, str: '_bar_'}],
docEnd: {a: '12_foo__bar_345'},
},
{
// discard multiple same inserts (will typically happen in markdown task lists)
name: 'Inserts the same into same string at the same position.',
docStart: {a: '12345'},
user1: [{op: 'str_ins', path: '/a', pos: 2, str: '_foo_'}],
user2: [{op: 'str_ins', path: '/a', pos: 2, str: '_foo_'}],
docEnd: {a: '12_foo_345'},
},
],
},
{
Expand Down
1 change: 1 addition & 0 deletions src/json-patch-ot/transforms/xStrIns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {type Op, OpStrDel, OpStrIns} from '../../json-patch/op';
export const xStrIns = (ins: OpStrIns, op: Op): null | Op | Op[] => {
if (op instanceof OpStrIns) {
if (ins.pos > op.pos) return op;
if (ins.pos === op.pos && ins.str === op.str) return null; // discard equal inserts
return operationToOp({...op.toJson(), pos: op.pos + ins.str.length}, {});
} else if (op instanceof OpStrDel) {
const del = op;
Expand Down
Loading