mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-10-25 16:09:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Format including missing formatting changes from previous PR

Browse source
This commit is contained in:
Keith Simmons 2022-03-11 15:38:01 -08:00
parent 16afb3d5b1
commit c50be72214
2 changed files with 44 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/editor/src/element.rs
View file

@ -1467,7 +1467,11 @@ mod tests {
let (window_id, editor) = cx.add_window(Default::default(), |cx| {
Editor::new(EditorMode::Full, buffer, None, settings.1, None, cx)
});
let element = EditorElement::new(editor.downgrade(), editor.read(cx).style(cx), CursorShape::Bar);
let element = EditorElement::new(
editor.downgrade(),
editor.read(cx).style(cx),
CursorShape::Bar,
);
let layouts = editor.update(cx, |editor, cx| {
let snapshot = editor.snapshot(cx);

74
crates/gpui/src/app.rs
View file

@ -758,7 +758,8 @@ pub struct MutableAppContext {
next_subscription_id: usize,
frame_count: usize,
subscriptions: Arc<Mutex<HashMap<usize, BTreeMap<usize, Option<SubscriptionCallback>>>>>,
global_subscriptions: Arc<Mutex<HashMap<TypeId, BTreeMap<usize, Option<GlobalSubscriptionCallback>>>>>,
global_subscriptions:
Arc<Mutex<HashMap<TypeId, BTreeMap<usize, Option<GlobalSubscriptionCallback>>>>>,
observations: Arc<Mutex<HashMap<usize, BTreeMap<usize, Option<ObservationCallback>>>>>,
release_observations: Arc<Mutex<HashMap<usize, BTreeMap<usize, ReleaseObservationCallback>>>>,
presenters_and_platform_windows:
@ -1726,7 +1727,8 @@ impl MutableAppContext {
if let Some(mut callback) = callback {
let alive = callback(payload.as_ref(), self);
if alive {
match self.subscriptions
match self
.subscriptions
.lock()
.entry(entity_id)
.or_default()
@ -1734,10 +1736,10 @@ impl MutableAppContext {
{
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(Some(callback));
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -1752,18 +1754,19 @@ impl MutableAppContext {
for (id, callback) in callbacks {
if let Some(mut callback) = callback {
callback(payload.as_ref(), self);
match self.global_subscriptions
match self
.global_subscriptions
.lock()
.entry(type_id)
.or_default()
.entry(id)
.entry(id)
{
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(Some(callback));
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -1778,18 +1781,19 @@ impl MutableAppContext {
if let Some(mut callback) = callback {
let alive = callback(self);
if alive {
match self.observations
match self
.observations
.lock()
.entry(observed_id)
.or_default()
.entry(id)
.entry(id)
{
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(Some(callback));
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -1818,18 +1822,19 @@ impl MutableAppContext {
if let Some(mut callback) = callback {
let alive = callback(self);
if alive {
match self.observations
match self
.observations
.lock()
.entry(observed_view_id)
.or_default()
.entry(id)
.entry(id)
{
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(Some(callback));
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -3857,18 +3862,21 @@ pub enum Subscription {
Subscription {
id: usize,
entity_id: usize,
subscriptions: Option<Weak<Mutex<HashMap<usize, BTreeMap<usize, Option<SubscriptionCallback>>>>>>,
subscriptions:
Option<Weak<Mutex<HashMap<usize, BTreeMap<usize, Option<SubscriptionCallback>>>>>>,
},
GlobalSubscription {
id: usize,
type_id: TypeId,
subscriptions:
Option<Weak<Mutex<HashMap<TypeId, BTreeMap<usize, Option<GlobalSubscriptionCallback>>>>>>,
subscriptions: Option<
Weak<Mutex<HashMap<TypeId, BTreeMap<usize, Option<GlobalSubscriptionCallback>>>>>,
>,
},
Observation {
id: usize,
entity_id: usize,
observations: Option<Weak<Mutex<HashMap<usize, BTreeMap<usize, Option<ObservationCallback>>>>>>,
observations:
Option<Weak<Mutex<HashMap<usize, BTreeMap<usize, Option<ObservationCallback>>>>>>,
},
ReleaseObservation {
id: usize,
@ -3914,10 +3922,10 @@ impl Drop for Subscription {
{
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(None);
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -3927,18 +3935,13 @@ impl Drop for Subscription {
subscriptions,
} => {
if let Some(subscriptions) = subscriptions.as_ref().and_then(Weak::upgrade) {
match subscriptions
.lock()
.entry(*type_id)
.or_default()
.entry(*id)
{
match subscriptions.lock().entry(*type_id).or_default().entry(*id) {
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(None);
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -3956,10 +3959,10 @@ impl Drop for Subscription {
{
collections::btree_map::Entry::Vacant(entry) => {
entry.insert(None);
},
}
collections::btree_map::Entry::Occupied(entry) => {
entry.remove();
},
}
}
}
}
@ -4606,8 +4609,10 @@ mod tests {
let events = events.clone();
cx.subscribe_global(move |e: &GlobalEvent, _| {
events.borrow_mut().push(("Inner", e.clone()));
}).detach();
}).detach();
})
.detach();
})
.detach();
}
cx.update(|cx| {
@ -4800,7 +4805,6 @@ mod tests {
assert_eq!(*events.borrow(), [1]);
// Global Events
#[derive(Clone, Debug, Eq, PartialEq)]
struct GlobalEvent(u64);