More robust status notifications

[rust.git] / crates / rust-analyzer / src / op_queue.rs

diff --git a/crates/rust-analyzer/src/op_queue.rs b/crates/rust-analyzer/src/op_queue.rs
index 51d66f4b37723ab17999ced30fbd04cf0e8614de..1d612a9337642eef9ec231fbc703e4ae3d08d007 100644 (file)
--- a/crates/rust-analyzer/src/op_queue.rs
+++ b/crates/rust-analyzer/src/op_queue.rs
@@ -1,25 +1,43 @@
-//! Bookkeeping to make sure only one long-running operation is executed.
+//! Bookkeeping to make sure only one long-running operation is being executed
+//! at a time.
 
-#[derive(Default)]
-pub(crate) struct OpQueue {
-    op_scheduled: bool,
+pub(crate) struct OpQueue<Args, Output> {
+    op_requested: Option<Args>,
     op_in_progress: bool,
+    last_op_result: Output,
 }
 
-impl OpQueue {
-    pub(crate) fn request_op(&mut self) {
-        self.op_scheduled = true;
+impl<Args, Output: Default> Default for OpQueue<Args, Output> {
+    fn default() -> Self {
+        Self { op_requested: None, op_in_progress: false, last_op_result: Default::default() }
     }
-    pub(crate) fn should_start_op(&mut self) -> bool {
-        if !self.op_in_progress && self.op_scheduled {
-            self.op_in_progress = true;
-            self.op_scheduled = false;
-            return true;
+}
+
+impl<Args, Output> OpQueue<Args, Output> {
+    pub(crate) fn request_op(&mut self, data: Args) {
+        self.op_requested = Some(data);
+    }
+    pub(crate) fn should_start_op(&mut self) -> Option<Args> {
+        if self.op_in_progress {
+            return None;
         }
-        false
+        self.op_in_progress = self.op_requested.is_some();
+        self.op_requested.take()
     }
-    pub(crate) fn op_completed(&mut self) {
+    pub(crate) fn op_completed(&mut self, result: Output) {
         assert!(self.op_in_progress);
         self.op_in_progress = false;
+        self.last_op_result = result;
+    }
+
+    #[allow(unused)]
+    pub(crate) fn last_op_result(&self) -> &Output {
+        &self.last_op_result
+    }
+    pub(crate) fn op_in_progress(&self) -> bool {
+        self.op_in_progress
+    }
+    pub(crate) fn op_requested(&self) -> bool {
+        self.op_requested.is_some()
     }
 }