hl-valdemar/vamp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Wiki Activity

refactor: remove legacy diff review command aliases

Browse Source
This commit is contained in:
Valdemar Høgsvig Lorenzen
2026-10-22 23:00:33 +02:00
parent e6d94dcb41
commit c12d98e348
8 changed files with 103 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/editor.rs
+81 -81
View File
@@ -1205,11 +1205,11 @@ fn command_completion_respects_bindings_and_preserves_visual_diff_and_search_inp
editor.handle(Input::Char('V'));
let selections = editor.selections();
let cursor = editor.cursor();
type_text(&mut editor, ":diff.com");
type_text(&mut editor, ":comm");
editor.handle(Input::Char('\t'));
assert_eq!(editor.command_line(), "diff.com");
assert_eq!(editor.command_line(), "comm");
editor.handle(Input::Ctrl('n'));
assert_eq!(editor.command_line(), "diff.comment");
assert_eq!(editor.command_line(), "comment");
assert_eq!(editor.selections(), selections);
assert_eq!(editor.cursor(), cursor);
editor.handle(Input::Escape);
@@ -3301,7 +3301,7 @@ fn unsaved_review_comments_are_discarded_on_escape() {
let mut editor = editor();
editor.set_review_directory(storage.clone());
historical_diff(&mut editor, &root, vec!["old".into()], vec!["new".into()]);
editor.execute("diff.comment");
editor.execute("comment");
type_text(&mut editor, "iDiscard me");
editor.handle(Input::Escape);
editor.handle(Input::Escape);
@@ -3313,17 +3313,17 @@ fn unsaved_review_comments_are_discarded_on_escape() {
.unwrap()
.is_empty()
);
editor.execute("diff.comment");
editor.execute("comment");
assert_eq!(editor.context().text, "");
type_text(&mut editor, "iKeep me");
editor.handle(Input::Escape);
editor.execute("w");
editor.handle(Input::Escape);
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
type_text(&mut editor, "A discarded");
editor.handle(Input::Escape);
editor.handle(Input::Escape);
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
assert_eq!(editor.context().text, "Keep me");
editor.handle(Input::Char('u'));
assert_eq!(editor.context().text, "Keep me");
@@ -3342,13 +3342,13 @@ fn review_metadata_autosaves_do_not_commit_hidden_comment_or_summary_drafts() {
let mut editor = editor();
editor.set_review_directory(storage.clone());
historical_diff(&mut editor, &root, vec!["old".into()], vec!["new".into()]);
editor.execute("diff.comment");
editor.execute("comment");
type_text(&mut editor, "iHidden comment");
editor.handle(Input::Escape);
editor.execute("diff.review.summary");
editor.execute("review.summary");
type_text(&mut editor, "iHidden summary");
editor.handle(Input::Escape);
editor.execute("diff.review.verdict looks_good");
editor.execute("review.verdict looks_good");
let store = crate::review::Store::open(&storage).unwrap();
let saved = store.list(&root).unwrap().pop().unwrap();
assert!(saved.comments.is_empty());
@@ -3376,12 +3376,12 @@ fn reviewed_file_marks_autosave_restore_and_stay_with_the_selected_review() {
let id = saved.storage_id.unwrap();
assert_eq!(saved.reviewed_files[0].path, Path::new("file.txt"));
let export = root.join("review.json");
first.execute(&format!("diff.review.save {}", export.display()));
first.execute(&format!("review.save {}", export.display()));
assert_eq!(
Review::load(&export, &root).unwrap().reviewed_files,
saved.reviewed_files
);
first.execute("diff.review.summary");
first.execute("review.summary");
type_text(&mut first, "iUnsaved summary");
first.handle(Input::Escape);
first.execute("diff.review.toggle");
@@ -3396,9 +3396,9 @@ fn reviewed_file_marks_autosave_restore_and_stay_with_the_selected_review() {
reopened.workspace_diff().unwrap().reviewed_files,
BTreeSet::from([0])
);
reopened.execute("diff.review.new");
reopened.execute("review.new");
assert!(reopened.workspace_diff().unwrap().reviewed_files.is_empty());
reopened.execute(&format!("diff.review.open {id}"));
reopened.execute(&format!("review.open {id}"));
assert_eq!(
reopened.workspace_diff().unwrap().reviewed_files,
BTreeSet::from([0])
@@ -3474,7 +3474,7 @@ fn review_navigation_maps_working_ranges_and_preserves_stale_snapshots() {
.as_mut()
.unwrap()
.revisions[1] = "working:new".into();
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
let owner = editor.diff_owner.unwrap();
editor.select_pane(owner);
assert_eq!(editor.cursor(), Cursor { row: 2, column: 14 });
@@ -3487,7 +3487,7 @@ fn review_navigation_maps_working_ranges_and_preserves_stale_snapshots() {
.unwrap();
editor.refresh_live_diff();
set_carets(&mut editor, &[(0, 0)], 0);
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
assert!(editor.message().contains("stale"));
editor.select_pane(owner);
assert_eq!(editor.cursor(), Cursor::default());
@@ -3508,7 +3508,7 @@ fn sqlite_reviews_autosave_restore_select_and_keep_exports_independent() {
vec!["p界e\u{301}z".into()],
vec!["changed".into()],
);
type_text(&mut first, "lvl:diff.comment");
type_text(&mut first, "lvl:comment");
first.handle(Input::Enter);
type_text(&mut first, "iFirst feedback");
first.handle(Input::Escape);
@@ -3533,17 +3533,17 @@ fn sqlite_reviews_autosave_restore_select_and_keep_exports_independent() {
persisted.comments[0].anchor.end,
TextPosition { row: 0, column: 3 }
);
first.execute("diff.review.summary");
first.execute("review.summary");
type_text(&mut first, "iSummary");
first.handle(Input::Escape);
first.execute("w");
first.execute("diff.review.verdict changes_requested");
first.execute("review.verdict changes_requested");
let persisted = store.load(&root, id).unwrap();
assert_eq!(persisted.summary, "Summary");
assert_eq!(persisted.verdict, Some(Verdict::ChangesRequested));
let exported = root.join("shared.json");
first.execute(&format!("diff.review.save {}", exported.display()));
first.execute("diff.review.edit 1");
first.execute(&format!("review.save {}", exported.display()));
first.execute("review.edit 1");
type_text(&mut first, "A revised");
first.handle(Input::Escape);
first.execute("w");
@@ -3574,7 +3574,7 @@ fn sqlite_reviews_autosave_restore_select_and_keep_exports_independent() {
.review_anchor_range(&restored.comments[0].anchor, &reopened.local_review)
.is_none()
);
reopened.execute("diff.review.new");
reopened.execute("review.new");
let second_id = reopened.local_review.document.storage_id.unwrap();
assert_ne!(id, second_id);
let mut choosing = editor();
@@ -3582,11 +3582,11 @@ fn sqlite_reviews_autosave_restore_select_and_keep_exports_independent() {
historical_diff(&mut choosing, &root, vec!["old".into()], vec!["new".into()]);
choosing.handle(Input::Enter);
assert_eq!(choosing.local_review.document.storage_id, Some(second_id));
choosing.execute(&format!("diff.review.open {id}"));
choosing.execute(&format!("review.open {id}"));
assert_eq!(choosing.local_review.document.storage_id, Some(id));
choosing.execute("diff.review.delete 1");
choosing.execute("review.delete 1");
assert!(store.load(&root, id).unwrap().comments.is_empty());
choosing.execute(&format!("diff.review.open {}", exported.display()));
choosing.execute(&format!("review.open {}", exported.display()));
let imported_id = choosing.local_review.document.storage_id.unwrap();
assert_ne!(imported_id, id);
assert_eq!(
@@ -3604,7 +3604,7 @@ fn review_resolution_persists_without_hiding_comments_or_changing_stale_anchors(
let mut first = editor();
first.set_review_directory(storage.clone());
historical_diff(&mut first, &root, vec!["old".into()], vec!["new".into()]);
first.execute("diff.comment");
first.execute("comment");
type_text(&mut first, "iFeedback");
first.handle(Input::Escape);
first.execute("w");
@@ -3614,7 +3614,7 @@ fn review_resolution_persists_without_hiding_comments_or_changing_stale_anchors(
.unwrap()
.contains(" · unresolved · ")
);
first.execute("diff.review.resolve");
first.execute("review.resolve");
assert!(
first
.context()
@@ -3626,7 +3626,7 @@ fn review_resolution_persists_without_hiding_comments_or_changing_stale_anchors(
let id = document.storage_id.unwrap();
let anchor = document.comments[0].anchor.clone();
assert!(store.load(&root, id).unwrap().comments[0].resolved);
first.execute("diff.review.next");
first.execute("review.next");
assert_eq!(first.context().text, "Feedback");
assert!(
first
@@ -3635,7 +3635,7 @@ fn review_resolution_persists_without_hiding_comments_or_changing_stale_anchors(
.contains(" · resolved · ")
);
let export = root.join("resolved.json");
first.execute(&format!("diff.review.save {}", export.display()));
first.execute(&format!("review.save {}", export.display()));
assert!(Review::load(&export, &root).unwrap().comments[0].resolved);
let mut stale = editor();
stale.set_review_directory(storage.clone());
@@ -3645,35 +3645,35 @@ fn review_resolution_persists_without_hiding_comments_or_changing_stale_anchors(
vec!["changed".into()],
vec!["new".into()],
);
stale.execute("diff.review.overview");
stale.execute("review.overview");
assert!(
stale
.context()
.text
.contains("Comment #1 · resolved · stale")
);
first.execute("diff.review.unresolve 1");
first.execute("review.unresolve 1");
assert!(!store.load(&root, id).unwrap().comments[0].resolved);
stale.execute("diff.review.unresolve 1");
stale.execute("review.unresolve 1");
assert!(stale.current_review_dirty());
assert!(!stale.local_review.document.comments[0].resolved);
assert_eq!(stale.local_review.document.comments[0].anchor, anchor);
assert!(stale.message().contains("changed in another session"));
first.execute("diff.review.resolve");
first.execute("review.resolve");
assert!(
first
.context()
.text
.contains("Comment #1 · resolved · current")
);
first.execute("diff.review.unresolve");
first.execute("review.unresolve");
assert!(
first
.context()
.text
.contains("Comment #1 · unresolved · current")
);
first.execute(&format!("diff.review.open {}", export.display()));
first.execute(&format!("review.open {}", export.display()));
let imported = &first.local_review.document;
assert_ne!(imported.storage_id, Some(id));
assert!(
@@ -3694,7 +3694,7 @@ fn sqlite_review_conflicts_and_write_failures_keep_dirty_drafts() {
let mut first = editor();
first.set_review_directory(storage.clone());
historical_diff(&mut first, &root, vec!["old".into()], vec!["new".into()]);
first.execute("diff.comment");
first.execute("comment");
type_text(&mut first, "iStored feedback");
first.handle(Input::Escape);
first.execute("w");
@@ -3704,8 +3704,8 @@ fn sqlite_review_conflicts_and_write_failures_keep_dirty_drafts() {
stale.set_review_directory(storage.clone());
historical_diff(&mut stale, &root, vec!["old".into()], vec!["new".into()]);
let version = stale.local_review.document.storage_revision;
first.execute("diff.review.verdict looks_good");
stale.execute("diff.review.verdict changes_requested");
first.execute("review.verdict looks_good");
stale.execute("review.verdict changes_requested");
assert!(stale.current_review_dirty());
assert_eq!(stale.local_review.document.storage_revision, version);
assert_eq!(
@@ -3719,7 +3719,7 @@ fn sqlite_review_conflicts_and_write_failures_keep_dirty_drafts() {
let blocked = root.join("not-a-directory");
fs::write(&blocked, "preserve").unwrap();
first.set_review_directory(blocked.clone());
first.execute("diff.review.edit 1");
first.execute("review.edit 1");
type_text(&mut first, "A unsaved");
first.handle(Input::Escape);
first.execute("w");
@@ -3758,7 +3758,7 @@ fn local_review_native_composition_roundtrip_and_draft_lifecycle() {
);
let owner = editor.pane_id();
let source = editor.context().text;
editor.execute("diff.comment");
editor.execute("comment");
assert_ne!(editor.pane_id(), owner);
assert!(
editor
@@ -3768,12 +3768,12 @@ fn local_review_native_composition_roundtrip_and_draft_lifecycle() {
);
type_text(&mut editor, "iExplain the removed branch");
editor.handle(Input::Escape);
editor.execute("diff.review.summary");
editor.execute("review.summary");
type_text(&mut editor, "iPlease simplify the branch");
editor.handle(Input::Escape);
editor.execute("diff.review.verdict changes_requested");
editor.execute("review.verdict changes_requested");
assert!(editor.context().text.contains("Changes requested"));
editor.execute(&format!("diff.review.save {}", path.display()));
editor.execute(&format!("review.save {}", path.display()));
let review = Review::load(&path, &root).unwrap();
assert_eq!(review.comments[0].body, "Explain the removed branch");
assert_eq!(review.comments[0].anchor.side, Side::Before);
@@ -3781,7 +3781,7 @@ fn local_review_native_composition_roundtrip_and_draft_lifecycle() {
assert_eq!(review.summary, "Please simplify the branch");
assert_eq!(review.verdict, Some(Verdict::ChangesRequested));
assert!(!editor.local_reviews_dirty());
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
// Native undo applies to comment text, never to the reviewed source.
type_text(&mut editor, "A!");
editor.handle(Input::Escape);
@@ -3796,11 +3796,11 @@ fn local_review_native_composition_roundtrip_and_draft_lifecycle() {
vec!["before".into(), "removed".into()],
vec!["after".into(), "added".into()],
);
editor.execute(&format!("diff.review.open {}", path.display()));
editor.execute(&format!("review.open {}", path.display()));
assert!(editor.context().text.contains("Explain the removed branch"));
editor.execute("diff.review.next");
editor.execute("review.next");
assert_eq!(editor.context().text, "Explain the removed branch");
editor.execute("diff.review.delete");
editor.execute("review.delete");
assert!(editor.context().text.starts_with("# Local review"));
editor.execute("w");
assert!(Review::load(&path, &root).unwrap().comments.is_empty());
@@ -3827,34 +3827,34 @@ fn review_identity_changes_retire_drafts_before_reusing_comment_ids() {
editor.set_review_directory(root.join("data"));
}
historical_diff(&mut editor, &root, vec!["old".into()], vec!["new".into()]);
editor.execute("diff.comment");
editor.execute("comment");
type_text(&mut editor, "iOriginal feedback");
editor.handle(Input::Escape);
editor.execute("diff.review.summary");
editor.execute("review.summary");
type_text(&mut editor, "iKeep summary");
editor.handle(Input::Escape);
let original = root.join("original.json");
editor.execute(&format!("diff.review.save {}", original.display()));
editor.execute(&format!("review.save {}", original.display()));
editor.execute("diff.review.delete 1");
editor.execute("diff.comment");
editor.execute("review.delete 1");
editor.execute("comment");
assert_eq!(editor.context().text, "");
type_text(&mut editor, "iFresh feedback");
editor.handle(Input::Escape);
let fresh = root.join("fresh.json");
editor.execute(&format!("diff.review.save {}", fresh.display()));
editor.execute(&format!("review.save {}", fresh.display()));
let document = crate::review::Review::load(&fresh, &root).unwrap();
assert_eq!(document.comments[0].id, 1);
assert_eq!(document.comments[0].body, "Fresh feedback");
assert_eq!(document.summary, "Keep summary");
editor.execute(&format!("diff.review.open {}", original.display()));
editor.execute("diff.review.edit 1");
editor.execute(&format!("review.open {}", original.display()));
editor.execute("review.edit 1");
assert_eq!(editor.context().text, "Original feedback");
editor.execute("diff.review.summary");
editor.execute("review.summary");
assert_eq!(editor.context().text, "Keep summary");
let restored = root.join("restored.json");
editor.execute(&format!("diff.review.save {}", restored.display()));
editor.execute(&format!("review.save {}", restored.display()));
assert_eq!(
crate::review::Review::load(&restored, &root)
.unwrap()
@@ -3863,13 +3863,13 @@ fn review_identity_changes_retire_drafts_before_reusing_comment_ids() {
"Original feedback"
);
editor.execute("diff.review.new");
editor.execute("diff.comment");
editor.execute("review.new");
editor.execute("comment");
assert_eq!(editor.context().text, "");
type_text(&mut editor, "iSeparate review");
editor.handle(Input::Escape);
let separate = root.join("separate.json");
editor.execute(&format!("diff.review.save {}", separate.display()));
editor.execute(&format!("review.save {}", separate.display()));
let document = crate::review::Review::load(&separate, &root).unwrap();
assert_eq!(document.comments[0].body, "Separate review");
assert_eq!(document.summary, "");
@@ -3893,10 +3893,10 @@ fn precise_review_ranges_capture_graphemes_and_navigate_to_their_start() {
editor.bind_diff_buffer();
let owner = editor.pane_id();
type_text(&mut editor, keys);
type_text(&mut editor, ":diff.comment");
type_text(&mut editor, ":comment");
editor.handle(Input::Enter);
editor.execute(&format!(
"diff.review.save {}",
"review.save {}",
root.join("range.json").display()
));
let diff = editor.workspace_diff().unwrap();
@@ -3936,9 +3936,9 @@ fn precise_review_ranges_capture_graphemes_and_navigate_to_their_start() {
historical_diff(&mut editor, &root, vec!["before".into()], split_lines(text));
editor.diff.as_mut().unwrap().focus = Focus::After;
editor.bind_diff_buffer();
editor.execute("diff.comment");
editor.execute("comment");
editor.execute(&format!(
"diff.review.save {}",
"review.save {}",
root.join("range.json").display()
));
let anchor = &editor.local_review.document.comments[0].anchor;
@@ -4019,13 +4019,13 @@ fn local_review_visual_commands_and_palette_preserve_both_side_ranges() {
type_text(&mut editor, "Vj");
if palette {
editor.handle(Input::Ctrl('p'));
type_text(&mut editor, "diff.comment");
type_text(&mut editor, "comment");
} else {
type_text(&mut editor, ":diff.comment");
type_text(&mut editor, ":comment");
}
editor.handle(Input::Enter);
editor.execute(&format!(
"diff.review.save {}",
"review.save {}",
root.join("range.json").display()
));
let diff = editor.workspace_diff().unwrap();
@@ -4054,9 +4054,9 @@ fn local_review_visual_commands_and_palette_preserve_both_side_ranges() {
.as_mut()
.unwrap()
.revisions[anchor.side.index()] = "changed-snapshot".into();
editor.execute("diff.review.overview");
editor.execute("review.overview");
assert!(editor.context().text.contains("stale"));
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
assert_eq!(editor.local_review.document.comments[0].anchor, anchor);
}
}
@@ -4067,10 +4067,10 @@ fn local_review_guards_metadata_and_hidden_native_drafts_against_loss() {
let root = directory.0.canonicalize().unwrap();
let mut editor = editor();
historical_diff(&mut editor, &root, vec!["old".into()], vec!["new".into()]);
editor.execute("diff.comment");
editor.execute("comment");
type_text(&mut editor, "iUnsaved feedback");
editor.handle(Input::Escape);
editor.execute("diff.review.overview");
editor.execute("review.overview");
let panel = editor.pane_id();
let source_buffer = editor.diff_return_buffer.unwrap();
editor.delete_buffer(source_buffer, false);
@@ -4091,7 +4091,7 @@ fn local_review_guards_metadata_and_hidden_native_drafts_against_loss() {
editor.execute("q");
assert!(!editor.should_quit());
let invalid = root.join("missing/review.json");
editor.execute(&format!("diff.review.save {}", invalid.display()));
editor.execute(&format!("review.save {}", invalid.display()));
assert!(editor.local_reviews_dirty());
assert!(editor.local_review.document.comments.is_empty());
assert!(
@@ -4101,10 +4101,10 @@ fn local_review_guards_metadata_and_hidden_native_drafts_against_loss() {
.any(|buffer| buffer.lines == ["Unsaved feedback"])
);
let path = root.join("review.json");
editor.execute(&format!("diff.review.save {}", path.display()));
editor.execute(&format!("review.save {}", path.display()));
assert!(!editor.local_reviews_dirty());
fs::write(&path, "external change").unwrap();
editor.execute("diff.review.verdict looks_good");
editor.execute("review.verdict looks_good");
editor.execute("w");
assert_eq!(fs::read_to_string(&path).unwrap(), "external change");
assert!(editor.local_reviews_dirty());
@@ -5483,7 +5483,7 @@ fn diff_review_actions_preserve_readonly_text_history_and_parked_tabs() {
assert_eq!(editor.tab_id(), first_tab);
assert_eq!(editor.diff().unwrap().reviewed_files, BTreeSet::from([0]));
editor.execute(&format!(
"diff.review.save {}",
"review.save {}",
directory.path("review.json").display()
));
editor.execute("diff.close");
@@ -7636,7 +7636,7 @@ mod system_clipboard {
editor.set_clipboard_mode(mode).unwrap();
editor.clipboard = vec!["internal".into()];
fixture.external("external");
editor.execute("diff.review.copy");
editor.execute("review.copy");
assert_eq!(editor.clipboard, ["internal"]);
assert_eq!(fixture.bytes("state"), b"external");
@@ -7647,11 +7647,11 @@ mod system_clipboard {
vec!["xe\u{301}👩‍💻".into(), "界z".into()],
vec!["new".into()],
);
editor.execute("diff.review.edit 1");
editor.execute("review.edit 1");
type_text(&mut editor, "A UNSAVED");
editor.handle(Input::Escape);
let draft = editor.context().text;
editor.execute("diff.review.copy");
editor.execute("review.copy");
assert_eq!(editor.context().text, draft);
assert!(editor.local_reviews_dirty());
let stored = store.load(&root, id).unwrap();
@@ -7662,7 +7662,7 @@ mod system_clipboard {
assert_eq!(editor.clipboard, ["internal"]);
let owned = editor.owned_system_clipboard.clone();
fixture.fail("fail-write", true);
editor.execute("diff.review.copy");
editor.execute("review.copy");
assert_eq!(fixture.bytes("state"), expected.as_bytes());
assert_eq!(editor.owned_system_clipboard, owned);
} else {
@@ -7671,11 +7671,11 @@ mod system_clipboard {
assert_eq!(fixture.bytes("state"), b"external");
assert!(fixture.bytes("writes").is_empty());
}
editor.execute("diff.review.copy unexpected");
editor.execute("review.copy unexpected");
editor.with_pane(editor.diff_owner.unwrap(), |editor| {
editor.local_review.document.comments.clear();
});
editor.execute("diff.review.copy");
editor.execute("review.copy");
if mode == "system" {
assert_eq!(fixture.bytes("state"), expected.as_bytes());
} else {