mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-26 00:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #104 from zed-industries/double-buffer

Browse source 
Avoid adding the same entry when concurrently opening it more than once
This commit is contained in:
Antonio Scandurra 2021-07-08 17:51:19 +02:00 committed by GitHub
commit f1ce507ed4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 83 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

125
zed/src/workspace.rs
View file

@ -501,7 +501,8 @@ impl Workspace {
let buffer_view =
cx.add_view(|cx| Editor::for_buffer(buffer.clone(), self.settings.clone(), cx));
self.items.push(ItemHandle::downgrade(&buffer));
self.add_item_view(Box::new(buffer_view), cx);
self.active_pane()
.add_item_view(Box::new(buffer_view), cx.as_mut());
}
#[must_use]
@ -510,38 +511,8 @@ impl Workspace {
entry: (usize, Arc<Path>),
cx: &mut ViewContext<Self>,
) -> Option<Task<()>> {
// If the active pane contains a view for this file, then activate
// that item view.
if self
.active_pane()
.update(cx, |pane, cx| pane.activate_entry(entry.clone(), cx))
{
return None;
}
// Otherwise, if this file is already open somewhere in the workspace,
// then add another view for it.
let settings = self.settings.clone();
let mut view_for_existing_item = None;
self.items.retain(|item| {
if item.alive(cx.as_ref()) {
if view_for_existing_item.is_none()
&& item
.file(cx.as_ref())
.map_or(false, |file| file.entry_id() == entry)
{
view_for_existing_item = Some(
item.add_view(cx.window_id(), settings.clone(), cx.as_mut())
.unwrap(),
);
}
true
} else {
false
}
});
if let Some(view) = view_for_existing_item {
self.add_item_view(view, cx);
let pane = self.active_pane().clone();
if self.activate_or_open_existing_entry(entry.clone(), &pane, cx) {
return None;
}
@ -575,6 +546,8 @@ impl Workspace {
.detach();
}
let pane = pane.downgrade();
let settings = self.settings.clone();
let mut watch = self.loading_items.get(&entry).unwrap().clone();
Some(cx.spawn(|this, mut cx| async move {
@ -587,23 +560,71 @@ impl Workspace {
this.update(&mut cx, |this, cx| {
this.loading_items.remove(&entry);
match load_result {
Ok(item) => {
let weak_item = item.downgrade();
let view = weak_item
.add_view(cx.window_id(), settings, cx.as_mut())
.unwrap();
this.items.push(weak_item);
this.add_item_view(view, cx);
}
Err(error) => {
log::error!("error opening item: {}", error);
if let Some(pane) = pane.upgrade(&cx) {
match load_result {
Ok(item) => {
// By the time loading finishes, the entry could have been already added
// to the pane. If it was, we activate it, otherwise we'll store the
// item and add a new view for it.
if !this.activate_or_open_existing_entry(entry, &pane, cx) {
let weak_item = item.downgrade();
let view = weak_item
.add_view(cx.window_id(), settings, cx.as_mut())
.unwrap();
this.items.push(weak_item);
pane.add_item_view(view, cx.as_mut());
}
}
Err(error) => {
log::error!("error opening item: {}", error);
}
}
}
})
}))
}
fn activate_or_open_existing_entry(
&mut self,
entry: (usize, Arc<Path>),
pane: &ViewHandle<Pane>,
cx: &mut ViewContext<Self>,
) -> bool {
// If the pane contains a view for this file, then activate
// that item view.
if pane.update(cx, |pane, cx| pane.activate_entry(entry.clone(), cx)) {
return true;
}
// Otherwise, if this file is already open somewhere in the workspace,
// then add another view for it.
let settings = self.settings.clone();
let mut view_for_existing_item = None;
self.items.retain(|item| {
if item.alive(cx.as_ref()) {
if view_for_existing_item.is_none()
&& item
.file(cx.as_ref())
.map_or(false, |file| file.entry_id() == entry)
{
view_for_existing_item = Some(
item.add_view(cx.window_id(), settings.clone(), cx.as_mut())
.unwrap(),
);
}
true
} else {
false
}
});
if let Some(view) = view_for_existing_item {
pane.add_item_view(view, cx.as_mut());
true
} else {
false
}
}
pub fn active_item(&self, cx: &ViewContext<Self>) -> Option<Box<dyn ItemViewHandle>> {
self.active_pane().read(cx).active_item()
}
@ -796,7 +817,7 @@ impl Workspace {
self.activate_pane(new_pane.clone(), cx);
if let Some(item) = pane.read(cx).active_item() {
if let Some(clone) = item.clone_on_split(cx.as_mut()) {
self.add_item_view(clone, cx);
new_pane.add_item_view(clone, cx.as_mut());
}
}
self.center
@ -820,15 +841,6 @@ impl Workspace {
pub fn active_pane(&self) -> &ViewHandle<Pane> {
&self.active_pane
}
fn add_item_view(&self, item: Box<dyn ItemViewHandle>, cx: &mut ViewContext<Self>) {
let active_pane = self.active_pane();
item.set_parent_pane(&active_pane, cx.as_mut());
active_pane.update(cx, |pane, cx| {
let item_idx = pane.add_item(item, cx);
pane.activate_item(item_idx, cx);
});
}
}
impl Entity for Workspace {
@ -1030,8 +1042,7 @@ mod tests {
);
});
// Open the third entry twice concurrently. Two pane items
// are added.
// Open the third entry twice concurrently. Only one pane item is added.
let (t1, t2) = workspace.update(&mut cx, |w, cx| {
(
w.open_entry(file3.clone(), cx).unwrap(),
@ -1051,7 +1062,7 @@ mod tests {
.iter()
.map(|i| i.entry_id(cx).unwrap())
.collect::<Vec<_>>();
assert_eq!(pane_entries, &[file1, file2, file3.clone(), file3]);
assert_eq!(pane_entries, &[file1, file2, file3]);
});
}

16
zed/src/workspace/pane.rs
View file

@ -5,7 +5,7 @@ use gpui::{
elements::*,
geometry::{rect::RectF, vector::vec2f},
keymap::Binding,
AppContext, Border, Entity, MutableAppContext, Quad, View, ViewContext,
AppContext, Border, Entity, MutableAppContext, Quad, View, ViewContext, ViewHandle,
};
use postage::watch;
use std::{cmp, path::Path, sync::Arc};
@ -382,3 +382,17 @@ impl View for Pane {
self.focus_active_item(cx);
}
}
pub trait PaneHandle {
fn add_item_view(&self, item: Box<dyn ItemViewHandle>, cx: &mut MutableAppContext);
}
impl PaneHandle for ViewHandle<Pane> {
fn add_item_view(&self, item: Box<dyn ItemViewHandle>, cx: &mut MutableAppContext) {
item.set_parent_pane(self, cx);
self.update(cx, |pane, cx| {
let item_idx = pane.add_item(item, cx);
pane.activate_item(item_idx, cx);
});
}
}