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

Remove worktree-specific methods from language::File trait

Browse source 
Use downcasting instead for accessing worktree-specific state of the Files.

This will allow us to introduce a WorktreeId type and use that everywhere
for identifying worktrees. It also just removes some unnecessary coupling
between the language crate and the worktree.
This commit is contained in:
Max Brunsfeld 2022-01-03 17:57:26 -08:00 • committed by Antonio Scandurra
parent 8270e8e758
commit 7f8e76e0f1
3 changed files with 23 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -619,9 +619,9 @@ impl Worktree {
for (buffer_id, buffer) in open_buffers {
if let Some(buffer) = buffer.upgrade(cx) {
buffer.update(cx, |buffer, cx| {
if let Some(old_file) = buffer.file() {
if let Some(old_file) = File::from_dyn(buffer.file()) {
let new_file = if let Some(entry) = old_file
.entry_id()
.entry_id
.and_then(|entry_id| self.entry_for_id(entry_id))
{
File {
@ -1108,12 +1108,12 @@ impl LocalWorktree {
path: &Path,
cx: &mut ModelContext<Worktree>,
) -> Option<ModelHandle<Buffer>> {
let worktree_id = self.id();
let handle = cx.handle();
let mut result = None;
self.open_buffers.retain(|_buffer_id, buffer| {
if let Some(buffer) = buffer.upgrade(cx.as_ref()) {
if let Some(file) = buffer.read(cx.as_ref()).file() {
if file.worktree_id() == worktree_id && file.path().as_ref() == path {
if let Some(buffer) = buffer.upgrade(cx) {
if let Some(file) = File::from_dyn(buffer.read(cx).file()) {
if file.worktree == handle && file.path().as_ref() == path {
result = Some(buffer);
}
}
@ -1446,8 +1446,8 @@ impl RemoteWorktree {
let mut existing_buffer = None;
self.open_buffers.retain(|_buffer_id, buffer| {
if let Some(buffer) = buffer.upgrade(cx.as_ref()) {
if let Some(file) = buffer.read(cx.as_ref()).file() {
if file.worktree_id() == handle.id() && file.path().as_ref() == path {
if let Some(file) = File::from_dyn(buffer.read(cx).file()) {
if file.worktree == handle && file.path().as_ref() == path {
existing_buffer = Some(buffer);
}
}
@ -1958,14 +1958,6 @@ pub struct File {
}
impl language::File for File {
fn worktree_id(&self) -> usize {
self.worktree.id()
}
fn entry_id(&self) -> Option<usize> {
self.entry_id
}
fn mtime(&self) -> SystemTime {
self.mtime
}
@ -2094,15 +2086,21 @@ impl language::File for File {
});
}
fn boxed_clone(&self) -> Box<dyn language::File> {
Box::new(self.clone())
}
fn as_any(&self) -> &dyn Any {
self
}
}
impl File {
pub fn from_dyn(file: Option<&dyn language::File>) -> Option<&Self> {
file.and_then(|f| f.as_any().downcast_ref())
}
pub fn worktree_id(&self, cx: &AppContext) -> usize {
self.worktree.read(cx).id()
}
}
#[derive(Clone, Debug)]
pub struct Entry {
pub id: usize,