From d414891cc08c73cb13519bd240e8ab6cc943f034 Mon Sep 17 00:00:00 2001 From: Marco Arnulfo Date: Sat, 24 Oct 2026 23:44:15 +0200 Subject: [PATCH 1/4] Save As starts in the folder of the open file (fixes #4143) --- crates/ui-egui/src/file_dialogs.rs | 39 ++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/file_dialogs.rs b/crates/ui-egui/src/file_dialogs.rs index f40ebf1867..b48c6b32c7 100644 --- a/crates/ui-egui/src/file_dialogs.rs +++ b/crates/ui-egui/src/file_dialogs.rs @@ -385,7 +385,9 @@ impl WordApp { /// Ask where to save, save there, then do `after`. pub(crate) fn save_as(&mut self, after: AfterSave) -> Asked { let name = self.default_save_name(); - self.ask_file(FileDialogRequest::Save { name, dir: None }, AfterPick::SaveAs { after, document: self.session.document_id() }) + // Start in the open file's folder (#4143); a document never saved has none. + let dir = self.session.path.as_deref().and_then(std::path::Path::parent).map(|d| d.to_string_lossy().into_owned()); + self.ask_file(FileDialogRequest::Save { name, dir }, AfterPick::SaveAs { after, document: self.session.document_id() }) } /// The user templates folder (#2852): the one File › Options names, else the app's own. @@ -534,7 +536,7 @@ mod tests { let revision = a.session.rev(); let result = a.run("file.save", json!({})).unwrap(); assert_eq!(result["pending"], "saveAs"); - assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "contract.docx".into(), dir: None }); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "contract.docx".into(), dir: Some(dir.to_string_lossy().into_owned()) }); answer(&shown, None); assert_eq!(a.poll_file_dialog().unwrap().unwrap()["saved"], false); assert_eq!(a.session.doc, draft); @@ -683,7 +685,7 @@ mod tests { h.get_by_label("Save").click(); h.run_steps(3); assert!(h.state().file_dialog_open(), "the Save button asks for a supported target"); - assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "contract.docx".into(), dir: None }); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "contract.docx".into(), dir: Some(dir.to_string_lossy().into_owned()) }); answer(&shown, None); h.run_steps(3); @@ -694,7 +696,7 @@ mod tests { h.event(egui::Event::Key { key: egui::Key::S, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::COMMAND }); h.run_steps(3); assert!(h.state().file_dialog_open(), "the focused editor's Mod+S asks too"); - assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "contract.docx".into(), dir: None }); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "contract.docx".into(), dir: Some(dir.to_string_lossy().into_owned()) }); answer(&shown, None); h.run_steps(3); assert!(h.state().session.dirty); @@ -787,6 +789,30 @@ mod tests { let _ = std::fs::remove_dir_all(&dir); } + /// #4143: Save As starts in the folder of the open file, not in the home folder; a document + /// that was never saved has no folder to offer. + #[test] + fn save_as_starts_in_the_folder_of_the_open_file() { + let dir = scratch("save-as-folder"); + let opened = dir.join("one.docx"); + wordcraft_engine::Session::new(wordcraft_doc::Document::from_text("original")) + .run("file.save", &json!({"path": opened.to_string_lossy()})) + .unwrap(); + let (mut a, shown) = async_app(); + a.services.templates_dir = Some(dir.join("Templates")); + a.run("file.open", json!({"path": opened.to_string_lossy()})).unwrap(); + a.save_as_dialog(); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "one.docx".into(), dir: Some(dir.to_string_lossy().into_owned()) }); + answer(&shown, None); + + let (mut fresh, shown) = async_app(); + typed(&mut fresh); + fresh.save_as_dialog(); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "Document1.docx".into(), dir: None }); + answer(&shown, None); + let _ = std::fs::remove_dir_all(&dir); + } + /// Save As returns at once (the UI keeps running); the frame loop saves once the answer arrives. #[test] fn save_as_answer_arriving_later_is_saved() { @@ -834,7 +860,10 @@ mod tests { let r = a.run("file.saveAs", json!({})).unwrap(); assert_eq!(r, json!({"saved": false})); assert!(a.file_dialog_open(), "F12's saveAs request opens the dialog"); - assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "two.docx".into(), dir: None }); + assert_eq!( + shown.borrow()[0].0, + FileDialogRequest::Save { name: "two.docx".into(), dir: Some(dir.join("sub").to_string_lossy().into_owned()) } + ); let _ = std::fs::remove_dir_all(&dir); } From 1113013e8749163ec240f48309c602c5b7ec033d Mon Sep 17 00:00:00 2001 From: Marco Arnulfo Date: Fri, 30 Oct 2026 04:41:52 +0100 Subject: [PATCH 2/4] Save As starts in the working folder for a file opened by a relative path (#4143) --- crates/ui-egui/src/file_dialogs.rs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/file_dialogs.rs b/crates/ui-egui/src/file_dialogs.rs index b48c6b32c7..67d2e3531d 100644 --- a/crates/ui-egui/src/file_dialogs.rs +++ b/crates/ui-egui/src/file_dialogs.rs @@ -385,8 +385,10 @@ impl WordApp { /// Ask where to save, save there, then do `after`. pub(crate) fn save_as(&mut self, after: AfterSave) -> Asked { let name = self.default_save_name(); - // Start in the open file's folder (#4143); a document never saved has none. - let dir = self.session.path.as_deref().and_then(std::path::Path::parent).map(|d| d.to_string_lossy().into_owned()); + // Start in the open file's folder (#4143); a document never saved has none. A path opened + // as `one.docx` has an empty parent, so it's made absolute first. + let dir = + self.session.path.as_deref().and_then(|p| std::path::absolute(p).ok()).and_then(|p| p.parent().map(|d| d.to_string_lossy().into_owned())); self.ask_file(FileDialogRequest::Save { name, dir }, AfterPick::SaveAs { after, document: self.session.document_id() }) } @@ -813,6 +815,19 @@ mod tests { let _ = std::fs::remove_dir_all(&dir); } + /// A file opened by a relative path (`wordcraft one.docx`) has an empty parent: Save As starts + /// in the working folder, not with an empty folder the dialog would drop. + #[test] + fn save_as_starts_in_the_working_folder_for_a_relative_path() { + let (mut a, shown) = async_app(); + typed(&mut a); + a.session.path = Some(std::path::PathBuf::from("one.docx")); + a.save_as_dialog(); + let cwd = std::env::current_dir().unwrap().to_string_lossy().into_owned(); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "one.docx".into(), dir: Some(cwd) }); + answer(&shown, None); + } + /// Save As returns at once (the UI keeps running); the frame loop saves once the answer arrives. #[test] fn save_as_answer_arriving_later_is_saved() { From 9ba48e003273ca1e70cbe51628bb1064a874cd5e Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Wed, 18 Nov 2026 21:10:53 +0700 Subject: [PATCH 3/4] Tests: unsaved Save As still has no folder, and uses the first words as its name #5793 landed on main after this PR: a new document's Save As name is its first words, not Document1.docx. The folder is still none, which is what #4143 tests. --- crates/ui-egui/src/file_dialogs/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/file_dialogs/tests.rs b/crates/ui-egui/src/file_dialogs/tests.rs index 1f139f65ff..fb5733f3d8 100644 --- a/crates/ui-egui/src/file_dialogs/tests.rs +++ b/crates/ui-egui/src/file_dialogs/tests.rs @@ -346,7 +346,7 @@ fn save_as_starts_in_the_folder_of_the_open_file() { let (mut fresh, shown) = async_app(); typed(&mut fresh); fresh.save_as_dialog(); - assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: "Document1.docx".into(), dir: None }); + assert_eq!(shown.borrow()[0].0, FileDialogRequest::Save { name: format!("{UNSAVED}.docx"), dir: None }); answer(&shown, None); let _ = std::fs::remove_dir_all(&dir); } From 6f288b926e3d97f6d551eb886c2e1f6c023d0a1f Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Wed, 18 Nov 2026 21:40:42 +0700 Subject: [PATCH 4/4] Tests: make file-dialog scratch directories absolute If TMPDIR is relative, scratch() used to return a relative path, but Save As sends an absolute folder. Make the scratch path absolute so the assertions match. --- crates/ui-egui/src/file_dialogs/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/file_dialogs/tests.rs b/crates/ui-egui/src/file_dialogs/tests.rs index fb5733f3d8..42985558bf 100644 --- a/crates/ui-egui/src/file_dialogs/tests.rs +++ b/crates/ui-egui/src/file_dialogs/tests.rs @@ -283,7 +283,7 @@ fn body_text(a: &WordApp) -> String { } fn scratch(name: &str) -> std::path::PathBuf { - let dir = std::env::temp_dir().join(format!("wordcraft-ui-dialogs-{name}-{}", std::process::id())); + let dir = std::path::absolute(std::env::temp_dir().join(format!("wordcraft-ui-dialogs-{name}-{}", std::process::id()))).expect("temp dir"); let _ = std::fs::remove_dir_all(&dir); std::fs::create_dir_all(&dir).unwrap(); dir