vrr/zed
2
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-05-27 00:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

git_ui: Fix "resolve with agent" merge conflict notification (#51290)

Browse source 
Follow up to https://github.com/zed-industries/zed/pull/49807

This PR fixes the merge conflict notification by making it appear only
once per a given set of conflicted paths, as opposed to showing every
time the `ConflictsUpdated` or `StatusesChanged` even would fire.

Release Notes:

- N/A
This commit is contained in:
Danilo Leal 2026-03-11 11:35:59 -03:00 • committed by GitHub
parent db9d9752c7
commit 3c82ddf261
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/git_ui/src/conflict_view.rs
View file

@ -15,7 +15,7 @@ use project::{
git_store::{GitStoreEvent, RepositoryEvent},
};
use settings::Settings;
use std::{ops::Range, sync::Arc};
use std::{cell::RefCell, ops::Range, rc::Rc, sync::Arc};
use ui::{ActiveTheme, Divider, Element as _, Styled, Window, prelude::*};
use util::{ResultExt as _, debug_panic, maybe};
use workspace::{
@ -534,7 +534,9 @@ pub(crate) fn register_conflict_notification(
) {
let git_store = workspace.project().read(cx).git_store().clone();
cx.subscribe(&git_store, |workspace, _git_store, event, cx| {
let last_shown_paths: Rc<RefCell<HashSet<String>>> = Rc::new(RefCell::new(HashSet::default()));
cx.subscribe(&git_store, move |workspace, _git_store, event, cx| {
let conflicts_changed = matches!(
event,
GitStoreEvent::ConflictsUpdated
@ -546,10 +548,15 @@ pub(crate) fn register_conflict_notification(
let paths = collect_conflicted_file_paths(workspace, cx);
let notification_id = merge_conflict_notification_id();
let current_paths_set: HashSet<String> = paths.iter().cloned().collect();
if paths.is_empty() {
last_shown_paths.borrow_mut().clear();
workspace.dismiss_notification(&notification_id, cx);
} else {
} else if *last_shown_paths.borrow() != current_paths_set {
// Only show the notification if the set of conflicted paths has changed.
// This prevents re-showing after the user dismisses it while working on the same conflicts.
*last_shown_paths.borrow_mut() = current_paths_set;
let file_count = paths.len();
workspace.show_notification(notification_id, cx, |cx| {
cx.new(|cx| {
@ -560,7 +567,7 @@ pub(crate) fn register_conflict_notification(
};
MessageNotification::new(message, cx)
.primary_message("Resolve Conflicts with Agent")
.primary_message("Resolve with Agent")
.primary_icon(IconName::ZedAssistant)
.primary_icon_color(Color::Muted)
.primary_on_click({

14
crates/workspace/src/notifications.rs
View file

@ -657,15 +657,17 @@ impl RenderOnce for NotificationFrame {
IconButton::new(close_id, close_icon)
.tooltip(move |_window, cx| {
if suppress {
Tooltip::for_action(
"Suppress.\nClose with click.",
&SuppressNotification,
Tooltip::with_meta(
"Suppress",
Some(&SuppressNotification),
"Click to Close",
cx,
)
} else if show_suppress_button {
Tooltip::for_action(
"Close.\nSuppress with shift-click.",
&menu::Cancel,
Tooltip::with_meta(
"Close",
Some(&menu::Cancel),
"Shift-click to Suppress",
cx,
)
} else {