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

Remove worktree_path from File struct

Browse source
This commit is contained in:
Nathan Sobo 2022-01-22 14:29:36 -07:00
parent 2a6f06f18a
commit e2a2073bdb
5 changed files with 35 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/editor/src/items.rs
View file

@ -126,7 +126,7 @@ impl ItemView for Editor {
.buffer() .buffer()
.read(cx) .read(cx)
.file(cx) .file(cx)
.and_then(|file| file.file_name()); .and_then(|file| file.file_name(cx));
if let Some(name) = filename { if let Some(name) = filename {
name.to_string_lossy().into() name.to_string_lossy().into()
} else { } else {

18
crates/language/src/buffer.rs
View file

@ -162,15 +162,15 @@ pub trait File {
fn path(&self) -> &Arc<Path>; fn path(&self) -> &Arc<Path>;
/// Returns the absolute path of this file. /// Returns the absolute path of this file.
fn abs_path(&self) -> Option<PathBuf>; fn abs_path(&self, cx: &AppContext) -> Option<PathBuf>;
/// Returns the path of this file relative to the worktree's parent directory (this means it /// Returns the path of this file relative to the worktree's parent directory (this means it
/// includes the name of the worktree's root folder). /// includes the name of the worktree's root folder).
fn full_path(&self) -> PathBuf; fn full_path(&self, cx: &AppContext) -> PathBuf;
/// Returns the last component of this handle's absolute path. If this handle refers to the root /// 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. /// of its worktree, then this method will return the name of the worktree itself.
fn file_name(&self) -> Option<OsString>; fn file_name(&self, cx: &AppContext) -> Option<OsString>;
fn is_deleted(&self) -> bool; fn is_deleted(&self) -> bool;
@ -457,7 +457,7 @@ impl Buffer {
if let Some(LanguageServerState { server, .. }) = self.language_server.as_ref() { if let Some(LanguageServerState { server, .. }) = self.language_server.as_ref() {
let server = server.clone(); let server = server.clone();
let abs_path = file.abs_path().unwrap(); let abs_path = file.abs_path(cx).unwrap();
let version = self.version(); let version = self.version();
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
let edits = server let edits = server
@ -619,7 +619,7 @@ impl Buffer {
None None
}; };
self.update_language_server(); self.update_language_server(cx);
} }
pub fn did_save( pub fn did_save(
@ -643,7 +643,7 @@ impl Buffer {
lsp::DidSaveTextDocumentParams { lsp::DidSaveTextDocumentParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path( uri: lsp::Url::from_file_path(
self.file.as_ref().unwrap().abs_path().unwrap(), self.file.as_ref().unwrap().abs_path(cx).unwrap(),
) )
.unwrap(), .unwrap(),
}, },
@ -1226,7 +1226,7 @@ impl Buffer {
self.set_active_selections(Arc::from([]), cx); self.set_active_selections(Arc::from([]), cx);
} }
fn update_language_server(&mut self) { fn update_language_server(&mut self, cx: &AppContext) {
let language_server = if let Some(language_server) = self.language_server.as_mut() { let language_server = if let Some(language_server) = self.language_server.as_mut() {
language_server language_server
} else { } else {
@ -1236,7 +1236,7 @@ impl Buffer {
.file .file
.as_ref() .as_ref()
.map_or(Path::new("/").to_path_buf(), |file| { .map_or(Path::new("/").to_path_buf(), |file| {
file.abs_path().unwrap() file.abs_path(cx).unwrap()
}); });
let version = post_inc(&mut language_server.next_version); let version = post_inc(&mut language_server.next_version);
@ -1381,7 +1381,7 @@ impl Buffer {
} }
self.reparse(cx); self.reparse(cx);
self.update_language_server(); self.update_language_server(cx);
cx.emit(Event::Edited); cx.emit(Event::Edited);
if !was_dirty { if !was_dirty {

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

@ -624,7 +624,7 @@ impl Project {
) -> Option<()> { ) -> Option<()> {
let (path, full_path) = { let (path, full_path) = {
let file = buffer.read(cx).file()?; let file = buffer.read(cx).file()?;
(file.path().clone(), file.full_path()) (file.path().clone(), file.full_path(cx))
}; };
// If the buffer has a language, set it and start/assign the language server // If the buffer has a language, set it and start/assign the language server
@ -938,7 +938,7 @@ impl Project {
let buffer_abs_path; let buffer_abs_path;
if let Some(file) = File::from_dyn(buffer.file()) { if let Some(file) = File::from_dyn(buffer.file()) {
worktree = file.worktree.clone(); worktree = file.worktree.clone();
buffer_abs_path = file.abs_path(); buffer_abs_path = file.abs_path(cx);
} else { } else {
return Task::ready(Err(anyhow!("buffer does not belong to any worktree"))); return Task::ready(Err(anyhow!("buffer does not belong to any worktree")));
}; };
@ -1168,7 +1168,6 @@ impl Project {
) { ) {
let local = worktree_handle.read(cx).is_local(); let local = worktree_handle.read(cx).is_local();
let snapshot = worktree_handle.read(cx).snapshot(); let snapshot = worktree_handle.read(cx).snapshot();
let worktree_path = snapshot.abs_path();
let mut buffers_to_delete = Vec::new(); let mut buffers_to_delete = Vec::new();
for (buffer_id, buffer) in &self.open_buffers { for (buffer_id, buffer) in &self.open_buffers {
if let OpenBuffer::Loaded(buffer) = buffer { if let OpenBuffer::Loaded(buffer) = buffer {
@ -1185,7 +1184,6 @@ impl Project {
{ {
File { File {
is_local: local, is_local: local,
worktree_path: worktree_path.clone(),
entry_id: Some(entry.id), entry_id: Some(entry.id),
mtime: entry.mtime, mtime: entry.mtime,
path: entry.path.clone(), path: entry.path.clone(),
@ -1196,7 +1194,6 @@ impl Project {
{ {
File { File {
is_local: local, is_local: local,
worktree_path: worktree_path.clone(),
entry_id: Some(entry.id), entry_id: Some(entry.id),
mtime: entry.mtime, mtime: entry.mtime,
path: entry.path.clone(), path: entry.path.clone(),
@ -1205,7 +1202,6 @@ impl Project {
} else { } else {
File { File {
is_local: local, is_local: local,
worktree_path: worktree_path.clone(),
entry_id: None, entry_id: None,
path: old_file.path().clone(), path: old_file.path().clone(),
mtime: old_file.mtime(), mtime: old_file.mtime(),
@ -2185,7 +2181,7 @@ mod tests {
cx.update(|cx| { cx.update(|cx| {
let target_buffer = definition.target_buffer.read(cx); let target_buffer = definition.target_buffer.read(cx);
assert_eq!( assert_eq!(
target_buffer.file().unwrap().abs_path(), target_buffer.file().unwrap().abs_path(cx),
Some(dir.path().join("a.rs")) Some(dir.path().join("a.rs"))
); );
assert_eq!(definition.target_range.to_offset(target_buffer), 9..10); assert_eq!(definition.target_range.to_offset(target_buffer), 9..10);

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

@ -631,7 +631,6 @@ impl LocalWorktree {
fn load(&self, path: &Path, cx: &mut ModelContext<Worktree>) -> Task<Result<(File, String)>> { fn load(&self, path: &Path, cx: &mut ModelContext<Worktree>) -> Task<Result<(File, String)>> {
let handle = cx.handle(); let handle = cx.handle();
let path = Arc::from(path); let path = Arc::from(path);
let worktree_path = self.abs_path.clone();
let abs_path = self.absolutize(&path); let abs_path = self.absolutize(&path);
let background_snapshot = self.background_snapshot.clone(); let background_snapshot = self.background_snapshot.clone();
let fs = self.fs.clone(); let fs = self.fs.clone();
@ -644,7 +643,6 @@ impl LocalWorktree {
File { File {
entry_id: Some(entry.id), entry_id: Some(entry.id),
worktree: handle, worktree: handle,
worktree_path,
path: entry.path, path: entry.path,
mtime: entry.mtime, mtime: entry.mtime,
is_local: true, is_local: true,
@ -664,19 +662,16 @@ impl LocalWorktree {
let text = buffer.as_rope().clone(); let text = buffer.as_rope().clone();
let version = buffer.version(); let version = buffer.version();
let save = self.save(path, text, cx); let save = self.save(path, text, cx);
cx.spawn(|this, mut cx| async move { let handle = cx.handle();
cx.as_mut().spawn(|mut cx| async move {
let entry = save.await?; let entry = save.await?;
let file = this.update(&mut cx, |this, cx| { let file = File {
let this = this.as_local_mut().unwrap(); entry_id: Some(entry.id),
File { worktree: handle,
entry_id: Some(entry.id), path: entry.path,
worktree: cx.handle(), mtime: entry.mtime,
worktree_path: this.abs_path.clone(), is_local: true,
path: entry.path, };
mtime: entry.mtime,
is_local: true,
}
});
buffer_handle.update(&mut cx, |buffer, cx| { buffer_handle.update(&mut cx, |buffer, cx| {
buffer.did_save(version, file.mtime, Some(Box::new(file)), cx); buffer.did_save(version, file.mtime, Some(Box::new(file)), cx);
@ -811,7 +806,6 @@ impl RemoteWorktree {
let replica_id = self.replica_id; let replica_id = self.replica_id;
let project_id = self.project_id; let project_id = self.project_id;
let remote_worktree_id = self.id(); let remote_worktree_id = self.id();
let root_path = self.snapshot.abs_path.clone();
let path: Arc<Path> = Arc::from(path); let path: Arc<Path> = Arc::from(path);
let path_string = path.to_string_lossy().to_string(); let path_string = path.to_string_lossy().to_string();
cx.spawn_weak(move |this, mut cx| async move { cx.spawn_weak(move |this, mut cx| async move {
@ -834,7 +828,6 @@ impl RemoteWorktree {
let file = File { let file = File {
entry_id: Some(entry.id), entry_id: Some(entry.id),
worktree: this.clone(), worktree: this.clone(),
worktree_path: root_path,
path: entry.path, path: entry.path,
mtime: entry.mtime, mtime: entry.mtime,
is_local: false, is_local: false,
@ -1354,7 +1347,6 @@ pub struct File {
pub path: Arc<Path>, pub path: Arc<Path>,
pub mtime: SystemTime, pub mtime: SystemTime,
pub(crate) entry_id: Option<usize>, pub(crate) entry_id: Option<usize>,
pub(crate) worktree_path: Arc<Path>,
pub(crate) is_local: bool, pub(crate) is_local: bool,
} }
@ -1367,17 +1359,17 @@ impl language::File for File {
&self.path &self.path
} }
fn abs_path(&self) -> Option<PathBuf> { fn abs_path(&self, cx: &AppContext) -> Option<PathBuf> {
if self.is_local { if self.is_local {
Some(self.worktree_path.join(&self.path)) Some(self.worktree.read(cx).abs_path().join(&self.path))
} else { } else {
None None
} }
} }
fn full_path(&self) -> PathBuf { fn full_path(&self, cx: &AppContext) -> PathBuf {
let mut full_path = PathBuf::new(); let mut full_path = PathBuf::new();
if let Some(worktree_name) = self.worktree_path.file_name() { if let Some(worktree_name) = self.worktree.read(cx).abs_path().file_name() {
full_path.push(worktree_name); full_path.push(worktree_name);
} }
full_path.push(&self.path); full_path.push(&self.path);
@ -1386,10 +1378,10 @@ impl language::File for File {
/// Returns the last component of this handle's absolute path. If this handle refers to the root /// 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. /// of its worktree, then this method will return the name of the worktree itself.
fn file_name<'a>(&'a self) -> Option<OsString> { fn file_name<'a>(&'a self, cx: &AppContext) -> Option<OsString> {
self.path self.path
.file_name() .file_name()
.or_else(|| self.worktree_path.file_name()) .or_else(|| self.worktree.read(cx).abs_path().file_name())
.map(Into::into) .map(Into::into)
} }

7
crates/rpc/proto/zed.proto
View file

@ -270,6 +270,13 @@ message Worktree {
bool weak = 5; bool weak = 5;
} }
message File {
uint64 worktree_id = 1;
uint64 entry_id = 2;
string path = 3;
Timestamp mtime = 4;
}
message Entry { message Entry {
uint64 id = 1; uint64 id = 1;
bool is_dir = 2; bool is_dir = 2;