Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Project Search: Don't prompt to save edited buffers in project search results if buffers open elsewhere (#31026)

Browse source 
Closes #ISSUE

Release Notes:

- N/A *or* Added/Fixed/Improved ...
This commit is contained in:
Ben Kunkle 2025-05-20 10:34:42 -05:00 • committed by GitHub
parent 110195cdae
commit 36ae564b61
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/search/src/project_search.rs
View file

@ -1055,10 +1055,17 @@ impl ProjectSearchView {
let is_dirty = self.is_dirty(cx);
let should_confirm_save = !will_autosave && is_dirty;
let skip_save_on_close = self
.workspace
.read_with(cx, |workspace, cx| {
workspace::Pane::skip_save_on_close(&self.results_editor, workspace, cx)
})
.unwrap_or(false);
let should_prompt_to_save = !skip_save_on_close && !will_autosave && is_dirty;
cx.spawn_in(window, async move |this, cx| {
let should_search = if should_confirm_save {
let should_search = if should_prompt_to_save {
let options = &["Save", "Don't Save", "Cancel"];
let result_channel = this.update_in(cx, |_, window, cx| {
window.prompt(

11
crates/workspace/src/pane.rs
View file

@ -1449,10 +1449,7 @@ impl Pane {
}
});
if dirty_project_item_ids.is_empty() {
if item.is_singleton(cx) && item.is_dirty(cx) {
return false;
}
return true;
return !(item.is_singleton(cx) && item.is_dirty(cx));
}
for open_item in workspace.items(cx) {
@ -1465,11 +1462,7 @@ impl Pane {
let other_project_item_ids = open_item.project_item_model_ids(cx);
dirty_project_item_ids.retain(|id| !other_project_item_ids.contains(id));
}
if dirty_project_item_ids.is_empty() {
return true;
}
false
return dirty_project_item_ids.is_empty();
}
pub(super) fn file_names_for_prompt(