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

Use entry_id on File instead of worktree::Diff to detect when buffers' files change

Browse source 
Rather than computing a diff after processing a batch of FSEvents, we instead detect renames as we're inserting entries. We store an entry_id on the File object that is owned by each buffer, and use this to detect when the path of the File has changed.

We now also manage all File-related state and event emission for Buffers in the LocalWorktree, since the logic will need to be totally different in the remote case.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Nathan Sobo 2021-06-29 18:19:38 -06:00
parent e80439daaa
commit 34963ac80d
7 changed files with 396 additions and 553 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Cargo.lock generated
View file

@ -107,6 +107,15 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35c7a5669cb64f085739387e1308b74e6d44022464b7f1b63bbd4ceb6379ec31"
[[package]]
name = "archery"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a8da9bc4c4053ee067669762bcaeea6e241841295a2b6c948312dad6ef4cc02"
dependencies = [
"static_assertions",
]
[[package]]
name = "arrayref"
version = "0.3.6"
@ -3027,6 +3036,15 @@ dependencies = [
"xmlparser",
]
[[package]]
name = "rpds"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "387f58b714cda2b5042ef9e91819445f60189900b618475186b11d7876f6adb4"
dependencies = [
"archery",
]
[[package]]
name = "rsa"
version = "0.4.0"
@ -4330,6 +4348,7 @@ dependencies = [
"parking_lot",
"postage",
"rand 0.8.3",
"rpds",
"rsa",
"rust-embed",
"seahash",

21
zed/Cargo.toml
View file

@ -23,9 +23,9 @@ crossbeam-channel = "0.5.0"
ctor = "0.1.20"
dirs = "3.0"
easy-parallel = "3.1.0"
fsevent = {path = "../fsevent"}
fsevent = { path="../fsevent" }
futures = "0.3"
gpui = {path = "../gpui"}
gpui = { path="../gpui" }
http-auth-basic = "0.1.3"
ignore = "0.4"
lazy_static = "1.4.0"
@ -33,31 +33,32 @@ libc = "0.2"
log = "0.4"
num_cpus = "1.13.0"
parking_lot = "0.11.1"
postage = {version = "0.4.1", features = ["futures-traits"]}
postage = { version="0.4.1", features=["futures-traits"] }
rand = "0.8.3"
rpds = "0.9"
rsa = "0.4"
rust-embed = "5.9.0"
seahash = "4.1"
serde = {version = "1", features = ["derive"]}
serde_json = {version = "1.0.64", features = ["preserve_order"], optional = true}
serde = { version="1", features=["derive"] }
serde_json = { version="1.0.64", features=["preserve_order"], optional=true }
similar = "1.3"
simplelog = "0.9"
smallvec = {version = "1.6", features = ["union"]}
smallvec = { version="1.6", features=["union"] }
smol = "1.2.5"
surf = "2.2"
tempdir = {version = "0.3.7", optional = true}
tempdir = { version="0.3.7", optional=true }
tiny_http = "0.8"
toml = "0.5"
tree-sitter = "0.19.5"
tree-sitter-rust = "0.19.0"
url = "2.2"
zed-rpc = {path = "../zed-rpc"}
zed-rpc = { path="../zed-rpc" }
[dev-dependencies]
cargo-bundle = "0.5.0"
env_logger = "0.8"
serde_json = {version = "1.0.64", features = ["preserve_order"]}
tempdir = {version = "0.3.7"}
serde_json = { version="1.0.64", features=["preserve_order"] }
tempdir = { version="0.3.7" }
unindent = "0.1.7"
[package.metadata.bundle]

10
zed/src/editor.rs
View file

@ -1,4 +1,4 @@
mod buffer;
pub mod buffer;
pub mod display_map;
mod element;
pub mod movement;
@ -2007,9 +2007,9 @@ impl Editor {
}
fn start_transaction(&self, cx: &mut ViewContext<Self>) {
self.buffer.update(cx, |buffer, cx| {
self.buffer.update(cx, |buffer, _| {
buffer
.start_transaction(Some(self.selection_set_id), cx)
.start_transaction(Some(self.selection_set_id))
.unwrap()
});
}
@ -2521,11 +2521,11 @@ impl workspace::ItemView for Editor {
}
fn is_dirty(&self, cx: &AppContext) -> bool {
self.buffer.read(cx).is_dirty(cx)
self.buffer.read(cx).is_dirty()
}
fn has_conflict(&self, cx: &AppContext) -> bool {
self.buffer.read(cx).has_conflict(cx)
self.buffer.read(cx).has_conflict()
}
}

163
zed/src/editor/buffer.rs
View file

@ -533,7 +533,7 @@ impl Buffer {
) -> Self {
let saved_mtime;
if let Some(file) = file.as_ref() {
saved_mtime = file.mtime(cx.as_ref());
saved_mtime = file.mtime;
} else {
saved_mtime = UNIX_EPOCH;
}
@ -628,6 +628,10 @@ impl Buffer {
self.file.as_ref()
}
pub fn file_mut(&mut self) -> Option<&mut File> {
self.file.as_mut()
}
pub fn save(&mut self, cx: &mut ModelContext<Self>) -> Result<Task<Result<()>>> {
let file = self
.file
@ -675,7 +679,7 @@ impl Buffer {
fn did_save(&mut self, version: time::Global, cx: &mut ModelContext<Self>) -> Result<()> {
if let Some(file) = self.file.as_ref() {
self.saved_mtime = file.mtime(cx.as_ref());
self.saved_mtime = file.mtime;
self.saved_version = version;
cx.emit(Event::Saved);
Ok(())
@ -684,35 +688,31 @@ impl Buffer {
}
}
pub fn file_was_moved(&mut self, new_path: Arc<Path>, cx: &mut ModelContext<Self>) {
self.file.as_mut().unwrap().path = new_path;
cx.emit(Event::FileHandleChanged);
}
pub fn file_was_added(&mut self, cx: &mut ModelContext<Self>) {
cx.emit(Event::FileHandleChanged);
}
pub fn file_was_deleted(&mut self, cx: &mut ModelContext<Self>) {
if self.version == self.saved_version {
cx.emit(Event::Dirtied);
}
cx.emit(Event::FileHandleChanged);
}
pub fn file_was_modified(
pub fn file_updated(
&mut self,
new_text: String,
path: Arc<Path>,
mtime: SystemTime,
new_text: Option<String>,
cx: &mut ModelContext<Self>,
) {
let file = self.file.as_mut().unwrap();
let mut changed = false;
if path != file.path {
file.path = path;
changed = true;
}
if mtime != file.mtime {
file.mtime = mtime;
changed = true;
if let Some(new_text) = new_text {
if self.version == self.saved_version {
cx.spawn(|this, mut cx| async move {
let diff = this
.read_with(&cx, |this, cx| this.diff(new_text.into(), cx))
.await;
this.update(&mut cx, |this, cx| {
if this.set_text_via_diff(diff, cx) {
if this.apply_diff(diff, cx) {
this.saved_version = this.version.clone();
this.saved_mtime = mtime;
cx.emit(Event::Reloaded);
@ -721,6 +721,18 @@ impl Buffer {
})
.detach();
}
}
}
if changed {
cx.emit(Event::FileHandleChanged);
}
}
pub fn file_deleted(&mut self, cx: &mut ModelContext<Self>) {
if self.version == self.saved_version {
cx.emit(Event::Dirtied);
}
cx.emit(Event::FileHandleChanged);
}
@ -889,9 +901,23 @@ impl Buffer {
})
}
fn set_text_via_diff(&mut self, diff: Diff, cx: &mut ModelContext<Self>) -> bool {
pub fn set_text_from_disk(&self, new_text: Arc<str>, cx: &mut ModelContext<Self>) -> Task<()> {
cx.spawn(|this, mut cx| async move {
let diff = this
.read_with(&cx, |this, cx| this.diff(new_text, cx))
.await;
this.update(&mut cx, |this, cx| {
if this.apply_diff(diff, cx) {
this.saved_version = this.version.clone();
}
});
})
}
fn apply_diff(&mut self, diff: Diff, cx: &mut ModelContext<Self>) -> bool {
if self.version == diff.base_version {
self.start_transaction(None, cx).unwrap();
self.start_transaction(None).unwrap();
let mut offset = 0;
for (tag, len) in diff.changes {
let range = offset..(offset + len);
@ -911,17 +937,17 @@ impl Buffer {
}
}
pub fn is_dirty(&self, cx: &AppContext) -> bool {
pub fn is_dirty(&self) -> bool {
self.version > self.saved_version
|| self.file.as_ref().map_or(false, |file| file.is_deleted(cx))
|| self.file.as_ref().map_or(false, |file| file.is_deleted())
}
pub fn has_conflict(&self, cx: &AppContext) -> bool {
pub fn has_conflict(&self) -> bool {
self.version > self.saved_version
&& self
.file
.as_ref()
.map_or(false, |file| file.mtime(cx) > self.saved_mtime)
.map_or(false, |file| file.mtime > self.saved_mtime)
}
pub fn remote_id(&self) -> u64 {
@ -1001,20 +1027,11 @@ impl Buffer {
self.deferred_ops.len()
}
pub fn start_transaction(
&mut self,
set_id: Option<SelectionSetId>,
cx: &mut ModelContext<Self>,
) -> Result<()> {
self.start_transaction_at(set_id, Instant::now(), cx)
pub fn start_transaction(&mut self, set_id: Option<SelectionSetId>) -> Result<()> {
self.start_transaction_at(set_id, Instant::now())
}
fn start_transaction_at(
&mut self,
set_id: Option<SelectionSetId>,
now: Instant,
cx: &mut ModelContext<Self>,
) -> Result<()> {
fn start_transaction_at(&mut self, set_id: Option<SelectionSetId>, now: Instant) -> Result<()> {
let selections = if let Some(set_id) = set_id {
let set = self
.selections
@ -1024,12 +1041,8 @@ impl Buffer {
} else {
None
};
self.history.start_transaction(
self.version.clone(),
self.is_dirty(cx.as_ref()),
selections,
now,
);
self.history
.start_transaction(self.version.clone(), self.is_dirty(), selections, now);
Ok(())
}
@ -1104,7 +1117,7 @@ impl Buffer {
}
if !ranges.is_empty() {
self.start_transaction_at(None, Instant::now(), cx).unwrap();
self.start_transaction_at(None, Instant::now()).unwrap();
let timestamp = InsertionTimestamp {
replica_id: self.replica_id,
local: self.local_clock.tick().value,
@ -1235,7 +1248,7 @@ impl Buffer {
ops: I,
cx: &mut ModelContext<Self>,
) -> Result<()> {
let was_dirty = self.is_dirty(cx.as_ref());
let was_dirty = self.is_dirty();
let old_version = self.version.clone();
let mut deferred_ops = Vec::new();
@ -1488,7 +1501,7 @@ impl Buffer {
}
pub fn undo(&mut self, cx: &mut ModelContext<Self>) {
let was_dirty = self.is_dirty(cx.as_ref());
let was_dirty = self.is_dirty();
let old_version = self.version.clone();
if let Some(transaction) = self.history.pop_undo().cloned() {
@ -1507,7 +1520,7 @@ impl Buffer {
}
pub fn redo(&mut self, cx: &mut ModelContext<Self>) {
let was_dirty = self.is_dirty(cx.as_ref());
let was_dirty = self.is_dirty();
let old_version = self.version.clone();
if let Some(transaction) = self.history.pop_redo().cloned() {
@ -2717,12 +2730,12 @@ mod tests {
buffer.edit(Some(2..4), "XYZ", cx);
// An empty transaction does not emit any events.
buffer.start_transaction(None, cx).unwrap();
buffer.start_transaction(None).unwrap();
buffer.end_transaction(None, cx).unwrap();
// A transaction containing two edits emits one edited event.
now += Duration::from_secs(1);
buffer.start_transaction_at(None, now, cx).unwrap();
buffer.start_transaction_at(None, now).unwrap();
buffer.edit(Some(5..5), "u", cx);
buffer.edit(Some(6..6), "w", cx);
buffer.end_transaction_at(None, now, cx).unwrap();
@ -3158,7 +3171,7 @@ mod tests {
move |_, event, _| events.borrow_mut().push(event.clone())
});
assert!(!buffer.is_dirty(cx.as_ref()));
assert!(!buffer.is_dirty());
assert!(events.borrow().is_empty());
buffer.edit(vec![1..2], "", cx);
@ -3167,7 +3180,7 @@ mod tests {
// after the first edit, the buffer is dirty, and emits a dirtied event.
buffer1.update(&mut cx, |buffer, cx| {
assert!(buffer.text() == "ac");
assert!(buffer.is_dirty(cx.as_ref()));
assert!(buffer.is_dirty());
assert_eq!(*events.borrow(), &[Event::Edited, Event::Dirtied]);
events.borrow_mut().clear();
buffer.did_save(buffer.version(), cx).unwrap();
@ -3175,7 +3188,7 @@ mod tests {
// after saving, the buffer is not dirty, and emits a saved event.
buffer1.update(&mut cx, |buffer, cx| {
assert!(!buffer.is_dirty(cx.as_ref()));
assert!(!buffer.is_dirty());
assert_eq!(*events.borrow(), &[Event::Saved]);
events.borrow_mut().clear();
@ -3186,7 +3199,7 @@ mod tests {
// after editing again, the buffer is dirty, and emits another dirty event.
buffer1.update(&mut cx, |buffer, cx| {
assert!(buffer.text() == "aBDc");
assert!(buffer.is_dirty(cx.as_ref()));
assert!(buffer.is_dirty());
assert_eq!(
*events.borrow(),
&[Event::Edited, Event::Dirtied, Event::Edited],
@ -3197,7 +3210,7 @@ mod tests {
// previously-saved state, the is still considered dirty.
buffer.edit(vec![1..3], "", cx);
assert!(buffer.text() == "ac");
assert!(buffer.is_dirty(cx.as_ref()));
assert!(buffer.is_dirty());
});
assert_eq!(*events.borrow(), &[Event::Edited]);
@ -3218,9 +3231,7 @@ mod tests {
});
fs::remove_file(dir.path().join("file2")).unwrap();
buffer2
.condition(&cx, |b, cx| b.is_dirty(cx.as_ref()))
.await;
buffer2.condition(&cx, |b, _| b.is_dirty()).await;
assert_eq!(
*events.borrow(),
&[Event::Dirtied, Event::FileHandleChanged]
@ -3251,7 +3262,7 @@ mod tests {
.condition(&cx, |_, _| !events.borrow().is_empty())
.await;
assert_eq!(*events.borrow(), &[Event::FileHandleChanged]);
cx.read(|cx| assert!(buffer3.read(cx).is_dirty(cx)));
cx.read(|cx| assert!(buffer3.read(cx).is_dirty()));
}
#[gpui::test]
@ -3272,7 +3283,7 @@ mod tests {
// Add a cursor at the start of each row.
let selection_set_id = buffer.update(&mut cx, |buffer, cx| {
assert!(!buffer.is_dirty(cx.as_ref()));
assert!(!buffer.is_dirty());
buffer.add_selection_set(
(0..3)
.map(|row| {
@ -3292,9 +3303,9 @@ mod tests {
// Change the file on disk, adding two new lines of text, and removing
// one line.
buffer.read_with(&cx, |buffer, cx| {
assert!(!buffer.is_dirty(cx.as_ref()));
assert!(!buffer.has_conflict(cx.as_ref()));
buffer.read_with(&cx, |buffer, _| {
assert!(!buffer.is_dirty());
assert!(!buffer.has_conflict());
});
let new_contents = "AAAA\naaa\nBB\nbbbbb\n";
fs::write(&abs_path, new_contents).unwrap();
@ -3306,10 +3317,10 @@ mod tests {
.condition(&cx, |buffer, _| buffer.text() != initial_contents)
.await;
buffer.update(&mut cx, |buffer, cx| {
buffer.update(&mut cx, |buffer, _| {
assert_eq!(buffer.text(), new_contents);
assert!(!buffer.is_dirty(cx.as_ref()));
assert!(!buffer.has_conflict(cx.as_ref()));
assert!(!buffer.is_dirty());
assert!(!buffer.has_conflict());
let selections = buffer.selections(selection_set_id).unwrap();
let cursor_positions = selections
@ -3328,7 +3339,7 @@ mod tests {
// Modify the buffer
buffer.update(&mut cx, |buffer, cx| {
buffer.edit(vec![0..0], " ", cx);
assert!(buffer.is_dirty(cx.as_ref()));
assert!(buffer.is_dirty());
});
// Change the file on disk again, adding blank lines to the beginning.
@ -3337,23 +3348,23 @@ mod tests {
// Becaues the buffer is modified, it doesn't reload from disk, but is
// marked as having a conflict.
buffer
.condition(&cx, |buffer, cx| buffer.has_conflict(cx.as_ref()))
.condition(&cx, |buffer, _| buffer.has_conflict())
.await;
}
#[gpui::test]
async fn test_set_text_via_diff(mut cx: gpui::TestAppContext) {
async fn test_apply_diff(mut cx: gpui::TestAppContext) {
let text = "a\nbb\nccc\ndddd\neeeee\nffffff\n";
let buffer = cx.add_model(|cx| Buffer::new(0, text, cx));
let text = "a\nccc\ndddd\nffffff\n";
let diff = buffer.read_with(&cx, |b, cx| b.diff(text.into(), cx)).await;
buffer.update(&mut cx, |b, cx| b.set_text_via_diff(diff, cx));
buffer.update(&mut cx, |b, cx| b.apply_diff(diff, cx));
cx.read(|cx| assert_eq!(buffer.read(cx).text(), text));
let text = "a\n1\n\nccc\ndd2dd\nffffff\n";
let diff = buffer.read_with(&cx, |b, cx| b.diff(text.into(), cx)).await;
buffer.update(&mut cx, |b, cx| b.set_text_via_diff(diff, cx));
buffer.update(&mut cx, |b, cx| b.apply_diff(diff, cx));
cx.read(|cx| assert_eq!(buffer.read(cx).text(), text));
}
@ -3405,13 +3416,13 @@ mod tests {
let set_id =
buffer.add_selection_set(buffer.selections_from_ranges(vec![4..4]).unwrap(), cx);
buffer.start_transaction_at(Some(set_id), now, cx).unwrap();
buffer.start_transaction_at(Some(set_id), now).unwrap();
buffer.edit(vec![2..4], "cd", cx);
buffer.end_transaction_at(Some(set_id), now, cx).unwrap();
assert_eq!(buffer.text(), "12cd56");
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![4..4]);
buffer.start_transaction_at(Some(set_id), now, cx).unwrap();
buffer.start_transaction_at(Some(set_id), now).unwrap();
buffer
.update_selection_set(
set_id,
@ -3425,7 +3436,7 @@ mod tests {
assert_eq!(buffer.selection_ranges(set_id).unwrap(), vec![1..3]);
now += buffer.history.group_interval + Duration::from_millis(1);
buffer.start_transaction_at(Some(set_id), now, cx).unwrap();
buffer.start_transaction_at(Some(set_id), now).unwrap();
buffer
.update_selection_set(
set_id,
@ -3636,7 +3647,7 @@ mod tests {
// Perform some edits (add parameter and variable reference)
// Parsing doesn't begin until the transaction is complete
buffer.update(&mut cx, |buf, cx| {
buf.start_transaction(None, cx).unwrap();
buf.start_transaction(None).unwrap();
let offset = buf.text().find(")").unwrap();
buf.edit(vec![offset..offset], "b: C", cx);

20
zed/src/workspace.rs
View file

@ -6,7 +6,7 @@ use crate::{
language::LanguageRegistry,
rpc,
settings::Settings,
worktree::{File, Worktree, WorktreeHandle},
worktree::{File, Worktree},
AppState,
};
use anyhow::{anyhow, Result};
@ -394,7 +394,7 @@ impl Workspace {
let entries = abs_paths
.iter()
.cloned()
.map(|path| self.file_for_path(&path, cx))
.map(|path| self.entry_id_for_path(&path, cx))
.collect::<Vec<_>>();
let bg = cx.background_executor().clone();
@ -402,12 +402,11 @@ impl Workspace {
.iter()
.cloned()
.zip(entries.into_iter())
.map(|(abs_path, file)| {
.map(|(abs_path, entry_id)| {
let is_file = bg.spawn(async move { abs_path.is_file() });
cx.spawn(|this, mut cx| async move {
if is_file.await {
return this
.update(&mut cx, |this, cx| this.open_entry(file.entry_id(), cx));
return this.update(&mut cx, |this, cx| this.open_entry(entry_id, cx));
} else {
None
}
@ -440,18 +439,22 @@ impl Workspace {
(self.add_worktree(abs_path, cx), PathBuf::new())
}
fn file_for_path(&mut self, abs_path: &Path, cx: &mut ViewContext<Self>) -> File {
fn entry_id_for_path(
&mut self,
abs_path: &Path,
cx: &mut ViewContext<Self>,
) -> (usize, Arc<Path>) {
for tree in self.worktrees.iter() {
if let Some(relative_path) = tree
.read(cx)
.as_local()
.and_then(|t| abs_path.strip_prefix(t.abs_path()).ok())
{
return tree.file(relative_path);
return (tree.id(), relative_path.into());
}
}
let worktree = self.add_worktree(&abs_path, cx);
worktree.file(Path::new(""))
(worktree.id(), Path::new("").into())
}
pub fn add_worktree(
@ -880,6 +883,7 @@ mod tests {
use crate::{
editor::Editor,
test::{build_app_state, temp_tree},
worktree::WorktreeHandle,
};
use serde_json::json;
use std::{collections::HashSet, fs};

655
zed/src/worktree.rs
View file

@ -4,7 +4,7 @@ mod ignore;
use self::{char_bag::CharBag, ignore::IgnoreStack};
use crate::{
editor::{Buffer, History, Operation, Rope},
editor::{self, Buffer, History, Operation, Rope},
language::LanguageRegistry,
rpc::{self, proto},
sum_tree::{self, Cursor, Edit, SumTree},
@ -25,14 +25,17 @@ use postage::{
prelude::{Sink, Stream},
watch,
};
use smol::channel::Sender;
use smol::{
channel::Sender,
io::{AsyncReadExt, AsyncWriteExt},
};
use std::{
cmp,
collections::{HashMap, HashSet},
collections::HashMap,
ffi::{OsStr, OsString},
fmt, fs,
future::Future,
io::{self, Read, Write},
io,
ops::Deref,
os::unix::fs::MetadataExt,
path::{Path, PathBuf},
@ -40,7 +43,7 @@ use std::{
atomic::{self, AtomicUsize},
Arc,
},
time::{Duration, SystemTime, UNIX_EPOCH},
time::{Duration, SystemTime},
};
lazy_static! {
@ -56,7 +59,7 @@ pub fn init(cx: &mut MutableAppContext, rpc: rpc::Client) {
#[derive(Clone, Debug)]
enum ScanState {
Idle(Option<Diff>),
Idle,
Scanning,
Err(Arc<io::Error>),
}
@ -67,7 +70,7 @@ pub enum Worktree {
}
impl Entity for Worktree {
type Event = Diff;
type Event = ();
}
impl Worktree {
@ -200,14 +203,20 @@ impl Worktree {
.filter_map(move |buffer| buffer.upgrade(cx))
}
pub fn save(
fn save(
&self,
path: &Path,
text: Rope,
cx: &mut ModelContext<Self>,
) -> impl Future<Output = Result<()>> {
match self {
Worktree::Local(worktree) => worktree.save(path, text, cx),
Worktree::Local(worktree) => {
let save = worktree.save(path, text, cx);
async move {
save.await?;
Ok(())
}
}
Worktree::Remote(_) => todo!(),
}
}
@ -247,6 +256,7 @@ impl LocalWorktree {
root_char_bag: Default::default(),
ignores: Default::default(),
entries: Default::default(),
paths_by_id: Default::default(),
removed_entry_ids: Default::default(),
next_entry_id: Default::default(),
};
@ -328,11 +338,10 @@ impl LocalWorktree {
if let Some(existing_buffer) = existing_buffer {
Ok(existing_buffer)
} else {
let contents = this
let (file, contents) = this
.update(&mut cx, |this, cx| this.as_local().unwrap().load(&path, cx))
.await?;
let language = language_registry.select_language(&path).cloned();
let file = File::new(handle, path.into());
let buffer = cx.add_model(|cx| {
Buffer::from_history(0, History::new(contents.into()), Some(file), language, cx)
});
@ -355,73 +364,15 @@ impl LocalWorktree {
}
}
fn observe_scan_state(&mut self, mut scan_state: ScanState, cx: &mut ModelContext<Worktree>) {
let diff = if let ScanState::Idle(diff) = &mut scan_state {
diff.take()
} else {
None
};
fn observe_scan_state(&mut self, scan_state: ScanState, cx: &mut ModelContext<Worktree>) {
self.scan_state.0.blocking_send(scan_state).ok();
self.poll_snapshot(cx);
if let Some(diff) = diff {
self.observe_snapshot_diff(diff, cx);
}
}
fn observe_snapshot_diff(&mut self, diff: Diff, cx: &mut ModelContext<Worktree>) {
let handle = cx.handle();
self.open_buffers.retain(|_buffer_id, buffer| {
if let Some(buffer) = buffer.upgrade(cx.as_ref()) {
buffer.update(cx, |buffer, cx| {
let handle = handle.clone();
if let Some(file) = buffer.file() {
let mut path = file.path.clone();
if let Some(new_path) = diff.moved.get(&path) {
buffer.file_was_moved(new_path.clone(), cx);
path = new_path.clone();
} else if diff.added.contains(&path) {
buffer.file_was_added(cx);
} else if diff.removed.contains(&path) {
buffer.file_was_deleted(cx);
}
if diff.modified.contains(&path) {
cx.spawn(|buffer, mut cx| async move {
let new_text = handle
.update(&mut cx, |this, cx| {
let this = this.as_local().unwrap();
this.load(&path, cx)
})
.await?;
let mtime = handle.read_with(&cx, |this, _| {
let this = this.as_local().unwrap();
this.entry_for_path(&path).map(|entry| entry.mtime)
});
if let Some(mtime) = mtime {
buffer.update(&mut cx, |buffer, cx| {
buffer.file_was_modified(new_text, mtime, cx)
});
}
Result::<_, anyhow::Error>::Ok(())
})
.detach();
}
}
});
true
} else {
false
}
});
cx.emit(diff);
}
fn poll_snapshot(&mut self, cx: &mut ModelContext<Worktree>) {
self.snapshot = self.background_snapshot.lock().clone();
cx.notify();
if self.is_scanning() && !self.poll_scheduled {
if self.is_scanning() {
if !self.poll_scheduled {
cx.spawn(|this, mut cx| async move {
smol::Timer::after(Duration::from_millis(100)).await;
this.update(&mut cx, |this, cx| {
@ -433,6 +384,65 @@ impl LocalWorktree {
.detach();
self.poll_scheduled = true;
}
} else {
let mut buffers_to_delete = Vec::new();
for (buffer_id, buffer) in &self.open_buffers {
if let Some(buffer) = buffer.upgrade(&cx) {
buffer.update(cx, |buffer, cx| {
let buffer_is_clean = !buffer.is_dirty();
if let Some(file) = buffer.file_mut() {
let mut file_changed = false;
if let Some(entry) = file
.entry_id
.and_then(|entry_id| self.entry_for_id(entry_id))
{
if entry.path != file.path {
file.path = entry.path.clone();
file_changed = true;
}
if entry.mtime != file.mtime {
file.mtime = entry.mtime;
file_changed = true;
if buffer_is_clean {
let abs_path = self.absolutize(&file.path);
refresh_buffer(abs_path, cx);
}
}
} else if let Some(entry) = self.entry_for_path(&file.path) {
file.entry_id = Some(entry.id);
file.mtime = entry.mtime;
if buffer_is_clean {
let abs_path = self.absolutize(&file.path);
refresh_buffer(abs_path, cx);
}
file_changed = true;
} else if !file.is_deleted() {
if buffer_is_clean {
cx.emit(editor::buffer::Event::Dirtied);
}
file.entry_id = None;
file_changed = true;
}
if file_changed {
cx.emit(editor::buffer::Event::FileHandleChanged);
}
}
});
} else {
buffers_to_delete.push(*buffer_id);
}
}
for buffer_id in buffers_to_delete {
self.open_buffers.remove(&buffer_id);
}
}
cx.notify();
}
fn is_scanning(&self) -> bool {
@ -463,30 +473,22 @@ impl LocalWorktree {
}
}
fn load(&self, path: &Path, cx: &mut ModelContext<Worktree>) -> Task<Result<String>> {
fn load(&self, path: &Path, cx: &mut ModelContext<Worktree>) -> Task<Result<(File, String)>> {
let handle = cx.handle();
let path = Arc::from(path);
let abs_path = self.absolutize(&path);
let background_snapshot = self.background_snapshot.clone();
let load = cx.background().spawn(async move {
let mut file = fs::File::open(&abs_path)?;
let mut text = String::new();
file.read_to_string(&mut text)?;
// Eagerly populate the snapshot with an updated entry for the loaded file
refresh_entry(&background_snapshot, path, &abs_path)?;
Result::<_, anyhow::Error>::Ok(text)
});
cx.spawn(|this, mut cx| async move {
let text = load.await?;
this.update(&mut cx, |this, _| {
let mut file = smol::fs::File::open(&abs_path).await?;
let mut text = String::new();
file.read_to_string(&mut text).await?;
// Eagerly populate the snapshot with an updated entry for the loaded file
let entry = refresh_entry(&background_snapshot, path, &abs_path)?;
this.update(&mut cx, |this, cx| {
let this = this.as_local_mut().unwrap();
this.snapshot = this.background_snapshot.lock().clone();
this.poll_snapshot(cx);
});
Ok(text)
Ok((File::new(entry.id, handle, entry.path, entry.mtime), text))
})
}
@ -494,59 +496,49 @@ impl LocalWorktree {
&self,
buffer: ModelHandle<Buffer>,
path: impl Into<Arc<Path>>,
content: Rope,
text: Rope,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<File>> {
let handle = cx.handle();
let path = path.into();
let save = self.save(path.clone(), content, cx);
let save = self.save(path, text, cx);
cx.spawn(|this, mut cx| async move {
save.await?;
this.update(&mut cx, |this, _| {
if let Some(this) = this.as_local_mut() {
this.open_buffers.insert(buffer.id(), buffer.downgrade());
}
});
Ok(File::new(handle, path))
let entry = save.await?;
this.update(&mut cx, |this, cx| {
this.as_local_mut()
.unwrap()
.open_buffers
.insert(buffer.id(), buffer.downgrade());
Ok(File::new(entry.id, cx.handle(), entry.path, entry.mtime))
})
})
}
pub fn save(
fn save(
&self,
path: impl Into<Arc<Path>>,
text: Rope,
cx: &mut ModelContext<Worktree>,
) -> Task<Result<()>> {
) -> Task<Result<Entry>> {
let path = path.into();
let abs_path = self.absolutize(&path);
let background_snapshot = self.background_snapshot.clone();
let save = {
let path = path.clone();
cx.background().spawn(async move {
let save = cx.background().spawn(async move {
let buffer_size = text.summary().bytes.min(10 * 1024);
let file = fs::File::create(&abs_path)?;
let mut writer = io::BufWriter::with_capacity(buffer_size, &file);
let file = smol::fs::File::create(&abs_path).await?;
let mut writer = smol::io::BufWriter::with_capacity(buffer_size, file);
for chunk in text.chunks() {
writer.write_all(chunk.as_bytes())?;
writer.write_all(chunk.as_bytes()).await?;
}
writer.flush()?;
// Eagerly populate the snapshot with an updated entry for the saved file
refresh_entry(&background_snapshot, path.clone(), &abs_path)?;
Ok::<_, anyhow::Error>(())
})
};
cx.spawn(|worktree, mut cx| async move {
save.await?;
worktree.update(&mut cx, |this, _| {
let this = this.as_local_mut().unwrap();
this.snapshot = this.background_snapshot.lock().clone();
writer.flush().await?;
refresh_entry(&background_snapshot, path.clone(), &abs_path)
});
Ok(())
cx.spawn(|this, mut cx| async move {
let entry = save.await?;
this.update(&mut cx, |this, cx| {
this.as_local_mut().unwrap().poll_snapshot(cx);
});
Ok(entry)
})
}
@ -600,6 +592,32 @@ impl LocalWorktree {
}
}
pub fn refresh_buffer(abs_path: PathBuf, cx: &mut ModelContext<Buffer>) {
cx.spawn(|buffer, mut cx| async move {
let new_text = cx
.background()
.spawn(async move {
let mut file = smol::fs::File::open(&abs_path).await?;
let mut text = String::new();
file.read_to_string(&mut text).await?;
Ok::<_, anyhow::Error>(text.into())
})
.await;
match new_text {
Err(error) => log::error!("error refreshing buffer after file changed: {}", error),
Ok(new_text) => {
buffer
.update(&mut cx, |buffer, cx| {
buffer.set_text_from_disk(new_text, cx)
})
.await;
}
}
})
.detach()
}
impl Deref for LocalWorktree {
type Target = Snapshot;
@ -636,8 +654,9 @@ impl RemoteWorktree {
.map(|c| c.to_ascii_lowercase())
.collect();
let mut entries = SumTree::new();
entries.extend(
worktree.entries.into_iter().filter_map(|entry| {
let mut paths_by_id = rpds::HashTrieMapSync::default();
for entry in worktree.entries {
if let Some(mtime) = entry.mtime {
let kind = if entry.is_dir {
EntryKind::Dir
} else {
@ -645,23 +664,24 @@ impl RemoteWorktree {
char_bag.extend(entry.path.chars().map(|c| c.to_ascii_lowercase()));
EntryKind::File(char_bag)
};
if let Some(mtime) = entry.mtime {
Some(Entry {
let path: Arc<Path> = Arc::from(Path::new(&entry.path));
entries.push(
Entry {
id: entry.id as usize,
kind,
path: Path::new(&entry.path).into(),
path: path.clone(),
inode: entry.inode,
mtime: mtime.into(),
is_symlink: entry.is_symlink,
is_ignored: entry.is_ignored,
})
} else {
log::warn!("missing mtime in worktree entry message");
None
}
}),
},
&(),
);
paths_by_id.insert_mut(entry.id as usize, path);
} else {
log::warn!("missing mtime in remote worktree entry {:?}", entry.path);
}
}
let snapshot = Snapshot {
id: cx.model_id(),
scan_id: 0,
@ -670,6 +690,7 @@ impl RemoteWorktree {
root_char_bag,
ignores: Default::default(),
entries,
paths_by_id,
removed_entry_ids: Default::default(),
next_entry_id: Default::default(),
};
@ -711,7 +732,10 @@ impl RemoteWorktree {
if let Some(existing_buffer) = existing_buffer {
Ok(existing_buffer)
} else {
let file = File::new(handle, Path::new(&path).into());
let entry = this
.read_with(&cx, |tree, _| tree.entry_for_path(&path).cloned())
.ok_or_else(|| anyhow!("file does not exist"))?;
let file = File::new(entry.id, handle, entry.path, entry.mtime);
let language = language_registry.select_language(&path).cloned();
let response = rpc
.request(proto::OpenBuffer {
@ -744,6 +768,7 @@ pub struct Snapshot {
root_char_bag: CharBag,
ignores: HashMap<Arc<Path>, (Arc<Gitignore>, usize)>,
entries: SumTree<Entry>,
paths_by_id: rpds::HashTrieMapSync<usize, Arc<Path>>,
removed_entry_ids: HashMap<u64, usize>,
next_entry_id: Arc<AtomicUsize>,
}
@ -787,25 +812,6 @@ impl Snapshot {
&self.root_name
}
fn path_is_pending(&self, path: impl AsRef<Path>) -> bool {
if self.entries.is_empty() {
return true;
}
let path = path.as_ref();
let mut cursor = self.entries.cursor::<_, ()>();
if cursor.seek(&PathSearch::Exact(path), Bias::Left, &()) {
let entry = cursor.item().unwrap();
if entry.path.as_ref() == path {
return matches!(entry.kind, EntryKind::PendingDir);
}
}
if let Some(entry) = cursor.prev_item() {
matches!(entry.kind, EntryKind::PendingDir) && path.starts_with(entry.path.as_ref())
} else {
false
}
}
fn entry_for_path(&self, path: impl AsRef<Path>) -> Option<&Entry> {
let mut cursor = self.entries.cursor::<_, ()>();
if cursor.seek(&PathSearch::Exact(path.as_ref()), Bias::Left, &()) {
@ -815,11 +821,16 @@ impl Snapshot {
}
}
fn entry_for_id(&self, id: usize) -> Option<&Entry> {
let path = self.paths_by_id.get(&id)?;
self.entry_for_path(path)
}
pub fn inode_for_path(&self, path: impl AsRef<Path>) -> Option<u64> {
self.entry_for_path(path.as_ref()).map(|e| e.inode())
}
fn insert_entry(&mut self, mut entry: Entry) -> bool {
fn insert_entry(&mut self, mut entry: Entry) -> Entry {
if !entry.is_dir() && entry.path().file_name() == Some(&GITIGNORE) {
let (ignore, err) = Gitignore::new(self.abs_path.join(entry.path()));
if let Some(err) = err {
@ -832,7 +843,9 @@ impl Snapshot {
}
self.reuse_entry_id(&mut entry);
self.entries.insert_or_replace(entry, &())
self.entries.insert_or_replace(entry.clone(), &());
self.paths_by_id.insert_mut(entry.id, entry.path.clone());
entry
}
fn populate_dir(
@ -860,6 +873,7 @@ impl Snapshot {
for mut entry in entries {
self.reuse_entry_id(&mut entry);
self.paths_by_id.insert_mut(entry.id, entry.path.clone());
edits.push(Edit::Insert(entry));
}
self.entries.edit(edits, &());
@ -889,6 +903,7 @@ impl Snapshot {
.entry(entry.inode)
.or_insert(entry.id);
*removed_entry_id = cmp::max(*removed_entry_id, entry.id);
self.paths_by_id.remove_mut(&entry.id);
}
if path.file_name() == Some(&GITIGNORE) {
@ -924,64 +939,6 @@ impl Snapshot {
ignore_stack
}
fn diff(&mut self, old: &Self) -> Diff {
let mut new = self.entries.cursor::<(), ()>().peekable();
let mut old = old.entries.cursor::<(), ()>().peekable();
let mut diff = Diff::default();
let mut removed = HashMap::new();
let mut added = HashMap::new();
loop {
match (new.peek().copied(), old.peek().copied()) {
(Some(new_entry), Some(old_entry)) => match new_entry.path.cmp(&old_entry.path) {
cmp::Ordering::Equal => {
if new_entry.mtime > old_entry.mtime {
diff.modified.insert(new_entry.path.clone());
}
new.next();
old.next();
}
cmp::Ordering::Less => {
added.insert(new_entry.id, new_entry);
diff.added.insert(new_entry.path.clone());
new.next();
}
cmp::Ordering::Greater => {
removed.insert(&old_entry.path, old_entry);
diff.removed.insert(old_entry.path.clone());
old.next();
}
},
(Some(new_entry), None) => {
added.insert(new_entry.id, new_entry);
diff.added.insert(new_entry.path.clone());
new.next();
}
(None, Some(old_entry)) => {
removed.insert(&old_entry.path, old_entry);
diff.removed.insert(old_entry.path.clone());
old.next();
}
(None, None) => break,
}
}
for (removed_path, removed_entry) in removed {
if let Some(added_entry) = added.remove(&removed_entry.id) {
diff.removed.remove(removed_path);
diff.added.remove(&added_entry.path);
diff.moved
.insert(removed_path.clone(), added_entry.path.clone());
if added_entry.mtime > removed_entry.mtime {
diff.modified.insert(added_entry.path.clone());
}
}
}
diff
}
}
impl fmt::Debug for Snapshot {
@ -996,23 +953,27 @@ impl fmt::Debug for Snapshot {
}
}
#[derive(Clone, Default, Debug, PartialEq)]
pub struct Diff {
pub moved: HashMap<Arc<Path>, Arc<Path>>,
pub removed: HashSet<Arc<Path>>,
pub added: HashSet<Arc<Path>>,
pub modified: HashSet<Arc<Path>>,
}
#[derive(Clone, PartialEq)]
pub struct File {
entry_id: Option<usize>,
worktree: ModelHandle<Worktree>,
pub path: Arc<Path>,
pub mtime: SystemTime,
}
impl File {
pub fn new(worktree: ModelHandle<Worktree>, path: Arc<Path>) -> Self {
Self { worktree, path }
pub fn new(
entry_id: usize,
worktree: ModelHandle<Worktree>,
path: Arc<Path>,
mtime: SystemTime,
) -> Self {
Self {
entry_id: Some(entry_id),
worktree,
path,
mtime,
}
}
pub fn buffer_updated(&self, buffer_id: u64, operation: Operation, cx: &mut MutableAppContext) {
@ -1066,6 +1027,10 @@ impl File {
self.path.clone()
}
pub fn abs_path(&self, cx: &AppContext) -> PathBuf {
self.worktree.read(cx).abs_path.join(&self.path)
}
/// Returns the last component of this handle's absolute path. If this handle refers to the root
/// of its worktree, then this method will return the name of the worktree itself.
pub fn file_name<'a>(&'a self, cx: &'a AppContext) -> Option<OsString> {
@ -1075,25 +1040,17 @@ impl File {
.map(Into::into)
}
pub fn is_deleted(&self, cx: &AppContext) -> bool {
let snapshot = self.worktree.read(cx).snapshot();
snapshot.entry_for_path(&self.path).is_none() && !snapshot.path_is_pending(&self.path)
pub fn is_deleted(&self) -> bool {
self.entry_id.is_none()
}
pub fn exists(&self, cx: &AppContext) -> bool {
!self.is_deleted(cx)
}
pub fn mtime(&self, cx: &AppContext) -> SystemTime {
let snapshot = self.worktree.read(cx).snapshot();
snapshot
.entry_for_path(&self.path)
.map_or(UNIX_EPOCH, |entry| entry.mtime)
pub fn exists(&self) -> bool {
!self.is_deleted()
}
pub fn save(&self, text: Rope, cx: &mut MutableAppContext) -> impl Future<Output = Result<()>> {
self.worktree
.update(cx, |worktree, cx| worktree.save(&self.path(), text, cx))
.update(cx, |worktree, cx| worktree.save(&self.path, text, cx))
}
pub fn worktree_id(&self) -> usize {
@ -1313,7 +1270,7 @@ impl BackgroundScanner {
}
}
if smol::block_on(self.notify.send(ScanState::Idle(None))).is_err() {
if smol::block_on(self.notify.send(ScanState::Idle)).is_err() {
return;
}
@ -1322,13 +1279,11 @@ impl BackgroundScanner {
return false;
}
let prev_snapshot = self.snapshot.lock().clone();
if !self.process_events(events) {
return false;
}
let diff = self.snapshot.lock().diff(&prev_snapshot);
if smol::block_on(self.notify.send(ScanState::Idle(Some(diff)))).is_err() {
if smol::block_on(self.notify.send(ScanState::Idle)).is_err() {
return false;
}
@ -1697,7 +1652,7 @@ impl BackgroundScanner {
}
}
fn refresh_entry(snapshot: &Mutex<Snapshot>, path: Arc<Path>, abs_path: &Path) -> Result<()> {
fn refresh_entry(snapshot: &Mutex<Snapshot>, path: Arc<Path>, abs_path: &Path) -> Result<Entry> {
let root_char_bag;
let next_entry_id;
{
@ -1707,8 +1662,7 @@ fn refresh_entry(snapshot: &Mutex<Snapshot>, path: Arc<Path>, abs_path: &Path) -
}
let entry = fs_entry_for_path(root_char_bag, &next_entry_id, path, abs_path)?
.ok_or_else(|| anyhow!("could not read saved file metadata"))?;
snapshot.lock().insert_entry(entry);
Ok(())
Ok(snapshot.lock().insert_entry(entry))
}
fn fs_entry_for_path(
@ -1775,8 +1729,6 @@ struct UpdateIgnoreStatusJob {
}
pub trait WorktreeHandle {
fn file(&self, path: impl AsRef<Path>) -> File;
#[cfg(test)]
fn flush_fs_events<'a>(
&self,
@ -1785,12 +1737,6 @@ pub trait WorktreeHandle {
}
impl WorktreeHandle for ModelHandle<Worktree> {
fn file(&self, path: impl AsRef<Path>) -> File {
let path = Arc::from(path.as_ref());
let handle = self.clone();
File::new(handle, path)
}
// When the worktree's FS event stream sometimes delivers "redundant" events for FS changes that
// occurred before the worktree was constructed. These events can cause the worktree to perfrom
// extra directory scans, and emit extra scan-state notifications.
@ -2048,12 +1994,12 @@ mod remote {
#[cfg(test)]
mod tests {
use super::*;
use crate::editor::Buffer;
use crate::test::*;
use anyhow::Result;
use rand::prelude::*;
use serde_json::json;
use std::{cell::RefCell, env, fmt::Write, os::unix, rc::Rc, time::SystemTime};
use std::time::UNIX_EPOCH;
use std::{env, fmt::Write, os::unix, time::SystemTime};
#[gpui::test]
async fn test_populate_and_search(mut cx: gpui::TestAppContext) {
@ -2118,34 +2064,30 @@ mod tests {
#[gpui::test]
async fn test_save_file(mut cx: gpui::TestAppContext) {
let app_state = cx.read(build_app_state);
let dir = temp_tree(json!({
"file1": "the old contents",
}));
let tree = cx.add_model(|cx| Worktree::local(dir.path(), cx));
tree.read_with(&cx, |tree, _| tree.as_local().unwrap().scan_complete())
.await;
let path = tree.read_with(&cx, |tree, _| {
assert_eq!(tree.file_count(), 1);
tree.files(0).next().unwrap().path().clone()
});
assert_eq!(path.file_name().unwrap(), "file1");
let buffer = cx.add_model(|cx| Buffer::new(1, "a line of text.\n".repeat(10 * 1024), cx));
tree.update(&mut cx, |tree, cx| {
let text = buffer.read(cx).snapshot().text();
tree.save(&path, text, cx)
let buffer = tree
.update(&mut cx, |tree, cx| {
tree.open_buffer("file1", app_state.language_registry, cx)
})
.await
.unwrap();
let save = buffer.update(&mut cx, |buffer, cx| {
buffer.edit(Some(0..0), "a line of text.\n".repeat(10 * 1024), cx);
buffer.save(cx).unwrap()
});
save.await.unwrap();
let new_text = fs::read_to_string(dir.path().join(path)).unwrap();
let new_text = fs::read_to_string(dir.path().join("file1")).unwrap();
assert_eq!(new_text, buffer.read_with(&cx, |buffer, _| buffer.text()));
}
#[gpui::test]
async fn test_save_in_single_file_worktree(mut cx: gpui::TestAppContext) {
let app_state = cx.read(build_app_state);
let dir = temp_tree(json!({
"file1": "the old contents",
}));
@ -2156,16 +2098,17 @@ mod tests {
.await;
cx.read(|cx| assert_eq!(tree.read(cx).file_count(), 1));
let buffer = cx.add_model(|cx| Buffer::new(1, "a line of text.\n".repeat(10 * 1024), cx));
let file = tree.file("");
cx.update(|cx| {
assert_eq!(file.path().file_name(), None);
let text = buffer.read(cx).snapshot().text();
file.save(text, cx)
let buffer = tree
.update(&mut cx, |tree, cx| {
tree.open_buffer("", app_state.language_registry, cx)
})
.await
.unwrap();
let save = buffer.update(&mut cx, |buffer, cx| {
buffer.edit(Some(0..0), "a line of text.\n".repeat(10 * 1024), cx);
buffer.save(cx).unwrap()
});
save.await.unwrap();
let new_text = fs::read_to_string(file_path).unwrap();
assert_eq!(new_text, buffer.read_with(&cx, |buffer, _| buffer.text()));
@ -2219,10 +2162,10 @@ mod tests {
.await;
cx.read(|cx| {
assert!(!buffer2.read(cx).is_dirty(cx));
assert!(!buffer3.read(cx).is_dirty(cx));
assert!(!buffer4.read(cx).is_dirty(cx));
assert!(!buffer5.read(cx).is_dirty(cx));
assert!(!buffer2.read(cx).is_dirty());
assert!(!buffer3.read(cx).is_dirty());
assert!(!buffer4.read(cx).is_dirty());
assert!(!buffer5.read(cx).is_dirty());
});
tree.flush_fs_events(&cx).await;
@ -2270,10 +2213,10 @@ mod tests {
Path::new("b/c/file5")
);
assert!(!buffer2.read(app).file().unwrap().is_deleted(app));
assert!(!buffer3.read(app).file().unwrap().is_deleted(app));
assert!(!buffer4.read(app).file().unwrap().is_deleted(app));
assert!(buffer5.read(app).file().unwrap().is_deleted(app));
assert!(!buffer2.read(app).file().unwrap().is_deleted());
assert!(!buffer3.read(app).file().unwrap().is_deleted());
assert!(!buffer4.read(app).file().unwrap().is_deleted());
assert!(buffer5.read(app).file().unwrap().is_deleted());
});
}
@ -2316,144 +2259,6 @@ mod tests {
});
}
#[test]
fn test_path_is_pending() {
let mut snapshot = Snapshot {
id: 0,
scan_id: 0,
abs_path: Path::new("").into(),
entries: Default::default(),
removed_entry_ids: Default::default(),
ignores: Default::default(),
root_name: Default::default(),
root_char_bag: Default::default(),
next_entry_id: Default::default(),
};
snapshot.entries.edit(
vec![
Edit::Insert(Entry {
id: 1,
path: Path::new("b").into(),
kind: EntryKind::Dir,
inode: 0,
mtime: UNIX_EPOCH,
is_ignored: false,
is_symlink: false,
}),
Edit::Insert(Entry {
id: 2,
path: Path::new("b/a").into(),
kind: EntryKind::Dir,
inode: 0,
mtime: UNIX_EPOCH,
is_ignored: false,
is_symlink: false,
}),
Edit::Insert(Entry {
id: 3,
path: Path::new("b/c").into(),
kind: EntryKind::PendingDir,
inode: 0,
mtime: UNIX_EPOCH,
is_ignored: false,
is_symlink: false,
}),
Edit::Insert(Entry {
id: 4,
path: Path::new("b/e").into(),
kind: EntryKind::Dir,
inode: 0,
mtime: UNIX_EPOCH,
is_ignored: false,
is_symlink: false,
}),
],
&(),
);
assert!(!snapshot.path_is_pending("b/a"));
assert!(!snapshot.path_is_pending("b/b"));
assert!(snapshot.path_is_pending("b/c"));
assert!(snapshot.path_is_pending("b/c/x"));
assert!(!snapshot.path_is_pending("b/d"));
assert!(!snapshot.path_is_pending("b/e"));
}
#[gpui::test]
async fn test_file_change_events(mut cx: gpui::TestAppContext) {
let dir = temp_tree(json!({
"dir_a": {
"file1": "1",
"file2": "2",
"dir_b": {
"file3": "3",
}
},
"dir_c": {
"dir_d": {
"file4": "4",
"file5": "5",
}
}
}));
let root = dir.path();
let tree = cx.add_model(|cx| Worktree::local(root, cx));
cx.read(|cx| tree.read(cx).as_local().unwrap().scan_complete())
.await;
tree.flush_fs_events(&cx).await;
let events = Rc::new(RefCell::new(Vec::new()));
tree.update(&mut cx, {
let events = events.clone();
|_, cx| {
cx.subscribe(&tree, move |_, event, _| {
events.borrow_mut().push(event.clone());
})
}
});
std::fs::remove_file(root.join("dir_a/file1")).unwrap();
std::fs::rename(root.join("dir_a/file2"), root.join("dir_c/file20")).unwrap();
std::fs::write(root.join("dir_c/dir_d/file4"), "modified 4").unwrap();
std::fs::write(root.join("dir_c/file10"), "hi").unwrap();
std::fs::rename(
root.join("dir_c/dir_d/file5"),
root.join("dir_c/dir_d/file50"),
)
.unwrap();
std::fs::write(root.join("dir_c/dir_d/file50"), "modified after rename").unwrap();
tree.condition(&cx, |_, _| !events.borrow().is_empty())
.await;
assert_eq!(
*events.borrow(),
&[Diff {
moved: vec![
(
Path::new("dir_a/file2").into(),
Path::new("dir_c/file20").into(),
),
(
Path::new("dir_c/dir_d/file5").into(),
Path::new("dir_c/dir_d/file50").into(),
)
]
.into_iter()
.collect(),
added: vec![Path::new("dir_c/file10").into()].into_iter().collect(),
removed: vec![Path::new("dir_a/file1").into()].into_iter().collect(),
modified: vec![
Path::new("dir_c/dir_d/file4").into(),
Path::new("dir_c/dir_d/file50").into()
]
.into_iter()
.collect(),
}]
);
}
#[test]
fn test_random() {
let iterations = env::var("ITERATIONS")
@ -2488,6 +2293,7 @@ mod tests {
scan_id: 0,
abs_path: root_dir.path().into(),
entries: Default::default(),
paths_by_id: Default::default(),
removed_entry_ids: Default::default(),
ignores: Default::default(),
root_name: Default::default(),
@ -2525,6 +2331,7 @@ mod tests {
scan_id: 0,
abs_path: root_dir.path().into(),
entries: Default::default(),
paths_by_id: Default::default(),
removed_entry_ids: Default::default(),
ignores: Default::default(),
root_name: Default::default(),

1
zed/src/worktree/fuzzy.rs
View file

@ -618,6 +618,7 @@ mod tests {
abs_path: PathBuf::new().into(),
ignores: Default::default(),
entries: Default::default(),
paths_by_id: Default::default(),
removed_entry_ids: Default::default(),
root_name: Default::default(),
root_char_bag: Default::default(),