From 44b43849613a52cee8dc98ea3068095416b201c2 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Wed, 1 Sep 2021 23:33:25 -0400
Subject: [PATCH] wip: more scheduler work

---
 packages/core/.vscode/settings.json |  2 +-
 packages/core/src/diff.rs           |  2 +-
 packages/core/src/scheduler.rs      | 16 +++++++++-------
 packages/core/src/virtual_dom.rs    |  6 +++++-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/core/.vscode/settings.json b/packages/core/.vscode/settings.json
index 1c68f97cc..79505b018 100644
--- a/packages/core/.vscode/settings.json
+++ b/packages/core/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-  "rust-analyzer.inlayHints.enable": true
+  "rust-analyzer.inlayHints.enable": false
 }
diff --git a/packages/core/src/diff.rs b/packages/core/src/diff.rs
index e9c4e46cb..089c4fa5d 100644
--- a/packages/core/src/diff.rs
+++ b/packages/core/src/diff.rs
@@ -153,7 +153,7 @@ impl<'bump> DiffMachine<'bump> {
         }
     }
 
-    pub fn diff_scope(&'bump mut self, id: ScopeId) {
+    pub fn diff_scope(&mut self, id: ScopeId) {
         if let Some(component) = self.vdom.get_scope_mut(id) {
             let (old, new) = (component.frames.wip_head(), component.frames.fin_head());
             self.stack.push(DiffInstruction::DiffNode { new, old });
diff --git a/packages/core/src/scheduler.rs b/packages/core/src/scheduler.rs
index dfa90bb56..14465d656 100644
--- a/packages/core/src/scheduler.rs
+++ b/packages/core/src/scheduler.rs
@@ -335,20 +335,20 @@ impl Scheduler {
     ///
     /// Will use the standard priority-based scheduling, batching, etc, but just won't interact with the async reactor.
     pub fn work_sync<'a>(&'a mut self) -> Vec<Mutations<'a>> {
-        let mut committed_mutations = Vec::<Mutations<'static>>::new();
+        let mut committed_mutations = Vec::new();
 
-        // Internalize any pending work since the last time we ran
         self.manually_poll_events();
 
         if !self.has_any_work() {
             self.pool.clean_up_garbage();
+            return committed_mutations;
         }
 
-        while self.has_any_work() {
-            // do work
+        self.consume_pending_events();
 
-            // Create work from the pending event queue
-            self.consume_pending_events();
+        while self.has_any_work() {
+            self.shift_priorities();
+            self.work_on_current_lane(&mut || false, &mut committed_mutations);
         }
 
         committed_mutations
@@ -419,7 +419,9 @@ impl Scheduler {
         committed_mutations
     }
 
-    // returns true if the lane is finished
+    /// Load the current lane, and work on it, periodically checking in if the deadline has been reached.
+    ///
+    /// Returns true if the lane is finished before the deadline could be met.
     pub fn work_on_current_lane(
         &mut self,
         deadline_reached: &mut impl FnMut() -> bool,
diff --git a/packages/core/src/virtual_dom.rs b/packages/core/src/virtual_dom.rs
index af1c9536f..b43907ea2 100644
--- a/packages/core/src/virtual_dom.rs
+++ b/packages/core/src/virtual_dom.rs
@@ -228,6 +228,9 @@ impl VirtualDom {
         unsafe { std::mem::transmute(diff_machine.mutations) }
     }
 
+    /// Compute a manual diff of the VirtualDOM between states.
+    ///
+    /// This can be useful when state inside the DOM is remotely changed from the outside, but not propogated as an event.
     pub fn diff<'s>(&'s mut self) -> Mutations<'s> {
         let cur_component = self
             .scheduler
@@ -236,7 +239,8 @@ impl VirtualDom {
             .expect("The base scope should never be moved");
 
         if cur_component.run_scope(&self.scheduler.pool) {
-            let mut diff_machine = DiffMachine::new(Mutations::new(), todo!());
+            let mut diff_machine: DiffMachine<'s> =
+                DiffMachine::new(Mutations::new(), &mut self.scheduler.pool);
             diff_machine.diff_scope(self.base_scope);
             diff_machine.mutations
         } else {