Merge pull request #4209 from marcoarnulfo/fix/save-as-document-folder

Save As starts in the folder of the open file
This commit is contained in:
FredApps authored and GitHub committed 2026-11-18 22:16:38 +07:00
commit 6ef13b2cc8
2 files changed
+47 -6

No files matched your search

+5 -1
View File
@@ -431,7 +431,11 @@ 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. 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() })
}
/// The user templates folder (#2852): the one File › Options names, else the app's own.
+42 -5
View File
@@ -54,7 +54,7 @@ fn imported_word_save_asks_for_docx_and_preserves_the_original() {
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);
@@ -204,7 +204,7 @@ fn imported_word_save_controls_ask_for_docx() {
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);
@@ -215,7 +215,7 @@ fn imported_word_save_controls_ask_for_docx() {
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);
@@ -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
@@ -327,6 +327,43 @@ fn save_as_template_starts_in_the_templates_folder() {
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: format!("{UNSAVED}.docx"), dir: None });
answer(&shown, None);
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() {
@@ -375,7 +412,7 @@ fn save_as_with_a_new_filename_saves_under_it() {
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);
}