mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 03:25:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #619 from zed-industries/project-entry-ids

Browse source 
Ensure that worktree entry ids are unique across the project
This commit is contained in:
Max Brunsfeld 2022-03-14 12:43:58 -07:00 committed by GitHub
commit 7bdb91f4ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
crates/project/src/project.rs
View file

@ -38,7 +38,10 @@ use std::{
ops::Range,
path::{Component, Path, PathBuf},
rc::Rc,
sync::{atomic::AtomicBool, Arc},
sync::{
atomic::{AtomicBool, AtomicUsize},
Arc,
},
time::Instant,
};
use util::{post_inc, ResultExt, TryFutureExt as _};
@ -56,6 +59,7 @@ pub struct Project {
language_server_settings: Arc<Mutex<serde_json::Value>>,
next_language_server_id: usize,
client: Arc<client::Client>,
next_entry_id: Arc<AtomicUsize>,
user_store: ModelHandle<UserStore>,
fs: Arc<dyn Fs>,
client_state: ProjectClientState,
@ -331,6 +335,7 @@ impl Project {
client,
user_store,
fs,
next_entry_id: Default::default(),
language_servers_with_diagnostics_running: 0,
language_servers: Default::default(),
started_language_servers: Default::default(),
@ -381,6 +386,7 @@ impl Project {
languages,
user_store: user_store.clone(),
fs,
next_entry_id: Default::default(),
subscriptions: vec![client.add_model_for_remote_entity(remote_id, cx)],
client: client.clone(),
client_state: ProjectClientState::Remote {
@ -2979,6 +2985,7 @@ impl Project {
) -> Task<Result<ModelHandle<Worktree>>> {
let fs = self.fs.clone();
let client = self.client.clone();
let next_entry_id = self.next_entry_id.clone();
let path: Arc<Path> = abs_path.as_ref().into();
let task = self
.loading_local_worktrees
@ -2986,9 +2993,15 @@ impl Project {
.or_insert_with(|| {
cx.spawn(|project, mut cx| {
async move {
let worktree =
Worktree::local(client.clone(), path.clone(), visible, fs, &mut cx)
.await;
let worktree = Worktree::local(
client.clone(),
path.clone(),
visible,
fs,
next_entry_id,
&mut cx,
)
.await;
project.update(&mut cx, |project, _| {
project.loading_local_worktrees.remove(&path);
});

9
crates/project/src/worktree.rs
View file

@ -172,10 +172,11 @@ impl Worktree {
path: impl Into<Arc<Path>>,
visible: bool,
fs: Arc<dyn Fs>,
next_entry_id: Arc<AtomicUsize>,
cx: &mut AsyncAppContext,
) -> Result<ModelHandle<Self>> {
let (tree, scan_states_tx) =
LocalWorktree::new(client, path, visible, fs.clone(), cx).await?;
LocalWorktree::new(client, path, visible, fs.clone(), next_entry_id, cx).await?;
tree.update(cx, |tree, cx| {
let tree = tree.as_local_mut().unwrap();
let abs_path = tree.abs_path().clone();
@ -425,11 +426,11 @@ impl LocalWorktree {
path: impl Into<Arc<Path>>,
visible: bool,
fs: Arc<dyn Fs>,
next_entry_id: Arc<AtomicUsize>,
cx: &mut AsyncAppContext,
) -> Result<(ModelHandle<Worktree>, UnboundedSender<ScanState>)> {
let abs_path = path.into();
let path: Arc<Path> = Arc::from(Path::new(""));
let next_entry_id = AtomicUsize::new(0);
// After determining whether the root entry is a file or a directory, populate the
// snapshot's "root name", which will be used for the purpose of fuzzy matching.
@ -457,7 +458,7 @@ impl LocalWorktree {
scan_id: 0,
ignores: Default::default(),
removed_entry_ids: Default::default(),
next_entry_id: Arc::new(next_entry_id),
next_entry_id,
snapshot: Snapshot {
id: WorktreeId::from_usize(cx.model_id()),
root_name: root_name.clone(),
@ -2425,6 +2426,7 @@ mod tests {
Arc::from(Path::new("/root")),
true,
fs,
Default::default(),
&mut cx.to_async(),
)
.await
@ -2468,6 +2470,7 @@ mod tests {
dir.path(),
true,
Arc::new(RealFs),
Default::default(),
&mut cx.to_async(),
)
.await