mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-08 19:43:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Run subscription/observation callbacks in the order they were added

Browse source 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2021-08-25 17:35:27 +02:00
parent 1aa1e6c6ab
commit 897826f710
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gpui/src/app.rs
View file

@ -18,7 +18,7 @@ use smol::prelude::*;
use std::{ use std::{
any::{type_name, Any, TypeId}, any::{type_name, Any, TypeId},
cell::RefCell, cell::RefCell,
collections::{hash_map::Entry, HashMap, HashSet, VecDeque}, collections::{hash_map::Entry, BTreeMap, HashMap, HashSet, VecDeque},
fmt::{self, Debug}, fmt::{self, Debug},
hash::{Hash, Hasher}, hash::{Hash, Hasher},
marker::PhantomData, marker::PhantomData,
@ -652,8 +652,8 @@ pub struct MutableAppContext {
next_entity_id: usize, next_entity_id: usize,
next_window_id: usize, next_window_id: usize,
next_subscription_id: usize, next_subscription_id: usize,
subscriptions: Arc<Mutex<HashMap<usize, HashMap<usize, SubscriptionCallback>>>>, subscriptions: Arc<Mutex<HashMap<usize, BTreeMap<usize, SubscriptionCallback>>>>,
observations: Arc<Mutex<HashMap<usize, HashMap<usize, ObservationCallback>>>>, observations: Arc<Mutex<HashMap<usize, BTreeMap<usize, ObservationCallback>>>>,
presenters_and_platform_windows: presenters_and_platform_windows:
HashMap<usize, (Rc<RefCell<Presenter>>, Box<dyn platform::Window>)>, HashMap<usize, (Rc<RefCell<Presenter>>, Box<dyn platform::Window>)>,
debug_elements_callbacks: HashMap<usize, Box<dyn Fn(&AppContext) -> crate::json::Value>>, debug_elements_callbacks: HashMap<usize, Box<dyn Fn(&AppContext) -> crate::json::Value>>,
@ -2967,12 +2967,12 @@ pub enum Subscription {
Subscription { Subscription {
id: usize, id: usize,
entity_id: usize, entity_id: usize,
subscriptions: Option<Weak<Mutex<HashMap<usize, HashMap<usize, SubscriptionCallback>>>>>, subscriptions: Option<Weak<Mutex<HashMap<usize, BTreeMap<usize, SubscriptionCallback>>>>>,
}, },
Observation { Observation {
id: usize, id: usize,
entity_id: usize, entity_id: usize,
observations: Option<Weak<Mutex<HashMap<usize, HashMap<usize, ObservationCallback>>>>>, observations: Option<Weak<Mutex<HashMap<usize, BTreeMap<usize, ObservationCallback>>>>>,
}, },
} }
@ -3200,7 +3200,7 @@ mod tests {
assert_eq!(handle_1.read(cx).events, vec![7]); assert_eq!(handle_1.read(cx).events, vec![7]);
handle_2.update(cx, |_, c| c.emit(5)); handle_2.update(cx, |_, c| c.emit(5));
assert_eq!(handle_1.read(cx).events, vec![7, 10, 5]); assert_eq!(handle_1.read(cx).events, vec![7, 5, 10]);
} }
#[crate::test(self)] #[crate::test(self)]
@ -3240,7 +3240,7 @@ mod tests {
model.count = 5; model.count = 5;
c.notify() c.notify()
}); });
assert_eq!(handle_1.read(cx).events, vec![7, 10, 5]) assert_eq!(handle_1.read(cx).events, vec![7, 5, 10])
} }
#[crate::test(self)] #[crate::test(self)]
@ -3462,10 +3462,10 @@ mod tests {
assert_eq!(handle_1.read(cx).events, vec![7]); assert_eq!(handle_1.read(cx).events, vec![7]);
handle_2.update(cx, |_, c| c.emit(5)); handle_2.update(cx, |_, c| c.emit(5));
assert_eq!(handle_1.read(cx).events, vec![7, 10, 5]); assert_eq!(handle_1.read(cx).events, vec![7, 5, 10]);
handle_3.update(cx, |_, c| c.emit(9)); handle_3.update(cx, |_, c| c.emit(9));
assert_eq!(handle_1.read(cx).events, vec![7, 10, 5, 9]); assert_eq!(handle_1.read(cx).events, vec![7, 5, 10, 9]);
} }
#[crate::test(self)] #[crate::test(self)]