Skip to content

fix(#222): Fixed issue with poor rendering performance and marker misalignment #227

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

Merged
wickedest merged 1 commit into from
Feb 23, 2026
Merged

fix(#222): Fixed issue with poor rendering performance and marker misalignment #227

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: 6 additions & 2 deletions src/diff-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,10 @@ CodeMirrorDiffView.prototype._isChangeInView = function(side, vp, change) {
return true;
}

// there are 3 conditions to test
// 1: the change "from" is within the viewport from/to
// 2: the change "to" is within the viewport from/to
// 3: the change is so big that the viewport is within
return (change[`${side}-line-from`] >= vp.from && change[`${side}-line-from`] <= vp.to) ||
(change[`${side}-line-to`] >= vp.from && change[`${side}-line-to`] <= vp.to) ||
(vp.from >= change[`${side}-line-from`] && vp.to <= change[`${side}-line-to`]);
Expand Down Expand Up @@ -1090,8 +1094,8 @@ CodeMirrorDiffView.prototype._renderDiff = function(changes) {
ctx_lhs.strokeRect(1.5, mkr_lhs_y_start, 4.5, Math.max(mkr_lhs_y_end - mkr_lhs_y_start, 5));
ctx_lhs.stroke();

const mkr_rhs_y_start = change['rhs-y-start'] * lratio;
const mkr_rhs_y_end = Math.max(change['rhs-y-end'] * lratio, 5);
const mkr_rhs_y_start = change['rhs-y-start'] * rratio;
const mkr_rhs_y_end = Math.max(change['rhs-y-end'] * rratio, 5);
ctx_rhs.beginPath();
ctx_rhs.fillStyle = '#a3a3a3';
ctx_rhs.strokeStyle = '#000';
Expand Down
23 changes: 13 additions & 10 deletions src/vdoc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,13 @@ class VDoc {
if (this.options._debug) {
trace('vdoc#update', side, editor, viewport);
}
const lines = Object.keys(this._lines[side]);
for (let i = 0; i < lines.length; ++i) {
const id = lines[i];
const keys = Object.keys(this._lines[side]);
// while Mergely diffs unicode diacritic chars (letters+mark),
// CM is by character, so diffs need to be mapped.
const mappedChars = mapLettersToChars(editor.getValue());

for (const key of keys) {
const { id } = this._lines[side][key];
if (id < viewport.from || id > viewport.to) {
continue;
}
Expand All @@ -216,7 +220,7 @@ class VDoc {
if (vline.rendered) {
continue;
}
vline.update(editor);
vline.update(editor, mappedChars);
}
}

Expand Down Expand Up @@ -257,7 +261,7 @@ class VLine {
this.markup.push([ charFrom, charTo, className ]);
}

update(editor) {
update(editor, mappedChars) {
if (this.rendered) {
// FIXME: probably do not need this now
console.log('already rendered', this.id);
Expand All @@ -279,18 +283,17 @@ class VLine {
editor.setGutterMarker(this.id, name, item);
}
if (this.markup.length) {
// while Mergely diffs unicode chars (letters+mark), CM is by character,
// so diffs need to be mapped.
const mapped = mapLettersToChars(editor.getValue());
// while Mergely diffs unicode diacritic chars (letters+mark),
// CM is by character, so diffs need to be mapped.
for (const markup of this.markup) {
const [ charFrom, charTo, className ] = markup;
const fromPos = { line: this.id };
const toPos = { line: this.id };
if (charFrom >= 0) {
fromPos.ch = mapped[charFrom];
fromPos.ch = mappedChars[charFrom];
}
if (charTo >= 0) {
toPos.ch = mapped[charTo];
toPos.ch = mappedChars[charTo];
}
this._clearMarkup.push(
editor.markText(fromPos, toPos, { className }));
Expand Down