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

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

@ -7,7 +7,7 @@ use gpui::{
};
use language::{Diagnostic, File as _};
use postage::watch;
use project::{ProjectPath, Worktree};
use project::{File, ProjectPath, Worktree};
use std::fmt::Write;
use std::path::Path;
use text::{Point, Selection};
@ -66,8 +66,8 @@ impl ItemHandle for BufferItemHandle {
}
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
self.0.read(cx).file(cx).map(|f| ProjectPath {
worktree_id: f.worktree_id(),
File::from_dyn(self.0.read(cx).file(cx)).map(|f| ProjectPath {
worktree_id: f.worktree_id(cx),
path: f.path().clone(),
})
}
@ -111,8 +111,8 @@ impl ItemView for Editor {
}
fn project_path(&self, cx: &AppContext) -> Option<ProjectPath> {
self.buffer().read(cx).file(cx).map(|file| ProjectPath {
worktree_id: file.worktree_id(),
File::from_dyn(self.buffer().read(cx).file(cx)).map(|file| ProjectPath {
worktree_id: file.worktree_id(cx),
path: file.path().clone(),
})
}