@@ -11,7 +11,7 @@ use gpui::{
};
use language::{Anchor, Buffer, BufferId};
use project::{
- ConflictRegion, ConflictSet, ConflictSetUpdate, ProjectItem as _,
+ ConflictRegion, ConflictSet, ConflictSetUpdate, Project, ProjectItem as _,
git_store::{GitStoreEvent, RepositoryEvent},
};
use settings::Settings;
@@ -497,8 +497,7 @@ fn render_conflict_buttons(
.into_any()
}
-fn collect_conflicted_file_paths(workspace: &Workspace, cx: &App) -> Vec<String> {
- let project = workspace.project().read(cx);
+fn collect_conflicted_file_paths(project: &Project, cx: &App) -> Vec<String> {
let git_store = project.git_store().read(cx);
let mut paths = Vec::new();
@@ -534,7 +533,11 @@ pub(crate) fn register_conflict_notification(
GitStoreEvent::ConflictsUpdated
| GitStoreEvent::RepositoryUpdated(_, RepositoryEvent::StatusesChanged, _)
);
- if !AgentSettings::get_global(cx).enabled || !conflicts_changed {
+ if !AgentSettings::get_global(cx).enabled(cx) || !conflicts_changed {
+ return;
+ }
+ let project = workspace.project().read(cx);
+ if project.is_via_collab() {
return;
}
@@ -542,7 +545,7 @@ pub(crate) fn register_conflict_notification(
return;
}
- let paths = collect_conflicted_file_paths(workspace, cx);
+ let paths = collect_conflicted_file_paths(project, cx);
let notification_id = workspace::merge_conflict_notification_id();
let current_paths_set: HashSet<String> = paths.iter().cloned().collect();
@@ -556,11 +559,10 @@ pub(crate) fn register_conflict_notification(
let file_count = paths.len();
workspace.show_notification(notification_id, cx, |cx| {
cx.new(|cx| {
- let message = if file_count == 1 {
- "1 file has unresolved merge conflicts".to_string()
- } else {
- format!("{file_count} files have unresolved merge conflicts")
- };
+ let message = format!(
+ "{file_count} file{} have unresolved merge conflicts",
+ if file_count == 1 { "" } else { "s" }
+ );
MessageNotification::new(message, cx)
.primary_message("Resolve with Agent")
@@ -306,7 +306,7 @@ enum ProjectClientState {
/// Multi-player mode but still a local project.
Shared { remote_id: u64 },
/// Multi-player mode but working on a remote project.
- Remote {
+ Collab {
sharing_has_stopped: bool,
capability: Capability,
remote_id: u64,
@@ -1815,7 +1815,7 @@ impl Project {
client_subscriptions: Default::default(),
_subscriptions: vec![cx.on_release(Self::release)],
collab_client: client.clone(),
- client_state: ProjectClientState::Remote {
+ client_state: ProjectClientState::Collab {
sharing_has_stopped: false,
capability: Capability::ReadWrite,
remote_id,
@@ -1933,7 +1933,7 @@ impl Project {
ProjectClientState::Shared { .. } => {
let _ = self.unshare_internal(cx);
}
- ProjectClientState::Remote { remote_id, .. } => {
+ ProjectClientState::Collab { remote_id, .. } => {
let _ = self.collab_client.send(proto::LeaveProject {
project_id: *remote_id,
});
@@ -2159,7 +2159,7 @@ impl Project {
match self.client_state {
ProjectClientState::Local => None,
ProjectClientState::Shared { remote_id, .. }
- | ProjectClientState::Remote { remote_id, .. } => Some(remote_id),
+ | ProjectClientState::Collab { remote_id, .. } => Some(remote_id),
}
}
@@ -2213,7 +2213,7 @@ impl Project {
#[inline]
pub fn replica_id(&self) -> ReplicaId {
match self.client_state {
- ProjectClientState::Remote { replica_id, .. } => replica_id,
+ ProjectClientState::Collab { replica_id, .. } => replica_id,
_ => {
if self.remote_client.is_some() {
ReplicaId::REMOTE_SERVER
@@ -2753,7 +2753,7 @@ impl Project {
} else {
Capability::ReadOnly
};
- if let ProjectClientState::Remote { capability, .. } = &mut self.client_state {
+ if let ProjectClientState::Collab { capability, .. } = &mut self.client_state {
if *capability == new_capability {
return;
}
@@ -2766,7 +2766,7 @@ impl Project {
}
fn disconnected_from_host_internal(&mut self, cx: &mut App) {
- if let ProjectClientState::Remote {
+ if let ProjectClientState::Collab {
sharing_has_stopped,
..
} = &mut self.client_state
@@ -2793,7 +2793,7 @@ impl Project {
#[inline]
pub fn is_disconnected(&self, cx: &App) -> bool {
match &self.client_state {
- ProjectClientState::Remote {
+ ProjectClientState::Collab {
sharing_has_stopped,
..
} => *sharing_has_stopped,
@@ -2815,7 +2815,7 @@ impl Project {
#[inline]
pub fn capability(&self) -> Capability {
match &self.client_state {
- ProjectClientState::Remote { capability, .. } => *capability,
+ ProjectClientState::Collab { capability, .. } => *capability,
ProjectClientState::Shared { .. } | ProjectClientState::Local => Capability::ReadWrite,
}
}
@@ -2831,7 +2831,7 @@ impl Project {
ProjectClientState::Local | ProjectClientState::Shared { .. } => {
self.remote_client.is_none()
}
- ProjectClientState::Remote { .. } => false,
+ ProjectClientState::Collab { .. } => false,
}
}
@@ -2842,7 +2842,7 @@ impl Project {
ProjectClientState::Local | ProjectClientState::Shared { .. } => {
self.remote_client.is_some()
}
- ProjectClientState::Remote { .. } => false,
+ ProjectClientState::Collab { .. } => false,
}
}
@@ -2851,7 +2851,7 @@ impl Project {
pub fn is_via_collab(&self) -> bool {
match &self.client_state {
ProjectClientState::Local | ProjectClientState::Shared { .. } => false,
- ProjectClientState::Remote { .. } => true,
+ ProjectClientState::Collab { .. } => true,
}
}
@@ -4524,7 +4524,7 @@ impl Project {
match &self.client_state {
ProjectClientState::Shared { .. } => true,
ProjectClientState::Local => false,
- ProjectClientState::Remote { .. } => true,
+ ProjectClientState::Collab { .. } => true,
}
}
@@ -5649,7 +5649,7 @@ impl Project {
fn synchronize_remote_buffers(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
let project_id = match self.client_state {
- ProjectClientState::Remote {
+ ProjectClientState::Collab {
sharing_has_stopped,
remote_id,
..