benstull/vscode-cowriting-plugin
1
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

F10 SLICE-2: fix renderReview author-coloring for duplicate blocks; tidy renderReviewOp + escape proposal id (#29)

Browse Source 
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Ben Stull
2026-06-12 00:13:54 -07:00
parent d59f22b22f
commit bcacbf062d
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trackChangesModel.ts
+11 -10
View File
@@ -437,7 +437,7 @@ function proposalBlockHtml(p: ProposalView, render: (src: string) => string): st
`<button class="cw-accept" data-action="accept">✓</button>` +
`<button class="cw-reject" data-action="reject">✗</button>` +
`</span>`;
return `<div class="cw-proposal${unanchored}" data-proposal-id="${p.id}">${actions}${before}${after}</div>`;
return `<div class="cw-proposal${unanchored}" data-proposal-id="${md.utils.escapeHtml(p.id)}">${actions}${before}${after}</div>`;
}
function renderReviewOp(
@@ -445,9 +445,9 @@ function renderReviewOp(
render: (src: string) => string,
colored: (raw: string) => string,
): string {
if (op.kind === "removed") return renderOp(op, render);
if (op.kind === "changed" && op.atomic) return renderOp(op, render);
if (op.kind === "changed") return renderOp(op, render); // word-merged <ins>/<del>
// removed blocks and any changed block (atomic fences diffed whole; non-atomic prose
// word-merged) render via renderOp — no author sentinels (deletions neutral, spec §6.7).
if (op.kind === "removed" || op.kind === "changed") return renderOp(op, render);
return `<div class="cw-blk ${op.kind === "added" ? "cw-added" : "cw-unchanged"}">${colored(op.block.raw)}</div>`;
}
@@ -468,12 +468,13 @@ export function renderReview(
const render = opts.render ?? defaultRender;
const ranges = splitBlocksWithRanges(currentText);
const ops = diffBlocks(baselineText, currentText);
const colored = (raw: string): string => {
const blk = ranges.find((r) => r.raw === raw);
if (!blk) return render(raw);
return colorByAuthor(raw, blk.start, authorSpans, render);
};
const bodyParts = ops.map((op) => renderReviewOp(op, render, colored));
let ci = 0; // pointer into ranges; advances for every op with a current-side block
const bodyParts = ops.map((op) => {
const blk = op.kind === "removed" ? undefined : ranges[ci++];
const colored = (raw: string): string =>
blk ? colorByAuthor(raw, blk.start, authorSpans, render) : render(raw);
return renderReviewOp(op, render, colored);
});
const anchored = proposals.filter((p) => p.anchorStart !== null);
const unanchored = proposals.filter((p) => p.anchorStart === null);
const proposalParts = [...anchored, ...unanchored].map((p) => proposalBlockHtml(p, render));