447a1170ce
Task 2 of the native-surfaces migration plan. GitBaselineAdapter resolves a
document's HEAD blob via the built-in vscode.git extension (hardened with a
.git/logs/HEAD watch that nudges repo.status(), since the git extension's own
watcher doesn't reliably notice out-of-band commits on non-workspace-folder
repos in the E2E host). DiffViewController is reworked into a baseline router:
head mode (git-tracked, never persisted, re-read on commit) vs snapshot mode
(captured on CoeditingRegistry entry, re-pinned by "Mark Changes as Reviewed"
— renamed from cowriting.pinDiffBaseline, D14). The shipped machine-landing
baseline advance (#48/INV-18) is retired: a landed Claude edit now stays a
visible change-since-baseline until commit or review (INV-7/D21). Legacy
on-disk reasons ("opened"/"machine-landing") migrate to "entered" via
BaselineStore.normalizeReason on load.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
67 lines
3.5 KiB
TypeScript
67 lines
3.5 KiB
TypeScript
import * as assert from "assert";
|
|
import * as fs from "fs";
|
|
import * as path from "path";
|
|
import * as vscode from "vscode";
|
|
import type { CowritingApi } from "../../../src/extension";
|
|
|
|
const WS = process.env.E2E_WORKSPACE!;
|
|
const settle = () => new Promise((r) => setTimeout(r, 400));
|
|
|
|
async function getApi(): Promise<CowritingApi> {
|
|
const ext = vscode.extensions.getExtension("benstull.vscode-cowriting-plugin")!;
|
|
const api = (await ext.activate()) as CowritingApi;
|
|
assert.ok(api?.trackChangesPreviewController, "exports preview controller");
|
|
return api;
|
|
}
|
|
|
|
/** Also enters coediting (INV-10/Task 2): the baseline is established only on
|
|
* entry, not merely on open. */
|
|
async function freshDoc(rel: string, body: string): Promise<{ doc: vscode.TextDocument; key: string }> {
|
|
const abs = path.join(WS, rel);
|
|
fs.mkdirSync(path.dirname(abs), { recursive: true });
|
|
fs.writeFileSync(abs, body, "utf8");
|
|
const uri = vscode.Uri.file(abs);
|
|
const doc = await vscode.workspace.openTextDocument(uri);
|
|
await vscode.window.showTextDocument(doc);
|
|
await vscode.commands.executeCommand("cowriting.coeditDocument");
|
|
await settle();
|
|
return { doc, key: uri.toString() };
|
|
}
|
|
|
|
// #48 host E2E (no LLM): pinning the baseline leaves the review panel fully clean
|
|
// — no authorship coloring on unchanged blocks — while re-divergence brings the
|
|
// annotations back. The author colors are read from the on-state renderReview HTML.
|
|
suite("S48 — pin → fully clean review panel (host E2E, no LLM)", () => {
|
|
test("pin clears authorship coloring; a later edit brings annotations back", async () => {
|
|
const { doc, key } = await freshDoc("docs/s48pin.md", "# S48\n\nAn original baseline paragraph.\n");
|
|
const api = await getApi();
|
|
const ctl = api.trackChangesPreviewController;
|
|
await vscode.commands.executeCommand("cowriting.showTrackChangesPreview");
|
|
await settle();
|
|
|
|
// Type a paragraph → a human attribution span + author coloring in the on-state.
|
|
const edit = new vscode.WorkspaceEdit();
|
|
edit.insert(doc.uri, doc.positionAt(doc.getText().length), "\n\nA freshly typed human paragraph.\n");
|
|
assert.ok(await vscode.workspace.applyEdit(edit), "operator edit applied");
|
|
await settle();
|
|
assert.match(ctl.renderHtmlFor(key), /cw-ins-human/, "typed text is author-colored cw-ins-human before the pin");
|
|
|
|
// Pin the baseline → zero diff → the panel must be fully clean.
|
|
ctl.receiveMessage(key, { type: "pinBaseline" });
|
|
await settle();
|
|
const pinned = ctl.renderHtmlFor(key);
|
|
assert.ok(!pinned.includes("cw-ins-human"), "no human insertion marks after pin");
|
|
assert.ok(!pinned.includes("cw-ins-claude"), "no Claude insertion marks after pin");
|
|
assert.ok(!pinned.includes("cw-ins-") && !pinned.includes("cw-del-"), "no insertion or deletion marks after pin");
|
|
assert.match(pinned, /data-src-start/, "blocks still carry data-src offsets (INV-36 mapping kept)");
|
|
assert.ok(pinned.includes("freshly typed human paragraph"), "the body text is still rendered, just plain");
|
|
|
|
// Edit again → there are changes since the pinned baseline → annotations return.
|
|
const edit2 = new vscode.WorkspaceEdit();
|
|
edit2.insert(doc.uri, doc.positionAt(doc.getText().length), "\n\nA second typed paragraph diverges again.\n");
|
|
assert.ok(await vscode.workspace.applyEdit(edit2), "second operator edit applied");
|
|
await settle();
|
|
assert.match(ctl.renderHtmlFor(key), /cw-ins-human/, "cw-ins-human authorship coloring returns once the doc diverges from the pin");
|
|
});
|
|
});
|