Refactor CommandIsExecuting to have a single variant

3 files changed, 25 insertions, 82 deletions

diff --git a/src/common/command_is_executing.rs b/src/common/command_is_executing.rs
index fdce0429..ad032557 100644
--- a/src/common/command_is_executing.rs
+++ b/src/common/command_is_executing.rs
@@ -3,71 +3,31 @@ use std::sync::{Arc, Condvar, Mutex};
 
 #[derive(Clone)]
 pub struct CommandIsExecuting {
-    opening_new_pane: Arc<(Mutex<bool>, Condvar)>,
-    closing_pane: Arc<(Mutex<bool>, Condvar)>,
-    updating_tabs: Arc<(Mutex<bool>, Condvar)>,
+    input_thread: Arc<(Mutex<bool>, Condvar)>,
 }
 
 impl CommandIsExecuting {
     pub fn new() -> Self {
         CommandIsExecuting {
-            opening_new_pane: Arc::new((Mutex::new(false), Condvar::new())),
-            closing_pane: Arc::new((Mutex::new(false), Condvar::new())),
-            updating_tabs: Arc::new((Mutex::new(false), Condvar::new())),
+            input_thread: Arc::new((Mutex::new(false), Condvar::new())),
         }
     }
-    pub fn closing_pane(&mut self) {
-        let (lock, _cvar) = &*self.closing_pane;
-        let mut closing_pane = lock.lock().unwrap();
-        *closing_pane = true;
+    pub fn blocking_input_thread(&mut self) {
+        let (lock, _cvar) = &*self.input_thread;
+        let mut input_thread = lock.lock().unwrap();
+        *input_thread = true;
     }
-    pub fn done_closing_pane(&mut self) {
-        let (lock, cvar) = &*self.closing_pane;
-        let mut closing_pane = lock.lock().unwrap();
-        *closing_pane = false;
+    pub fn unblock_input_thread(&mut self) {
+        let (lock, cvar) = &*self.input_thread;
+        let mut input_thread = lock.lock().unwrap();
+        *input_thread = false;
         cvar.notify_all();
     }
-    pub fn opening_new_pane(&mut self) {
-        let (lock, _cvar) = &*self.opening_new_pane;
-        let mut opening_new_pane = lock.lock().unwrap();
-        *opening_new_pane = true;
-    }
-    pub fn done_opening_new_pane(&mut self) {
-        let (lock, cvar) = &*self.opening_new_pane;
-        let mut opening_new_pane = lock.lock().unwrap();
-        *opening_new_pane = false;
-        cvar.notify_all();
-    }
-    pub fn updating_tabs(&mut self) {
-        let (lock, _cvar) = &*self.updating_tabs;
-        let mut updating_tabs = lock.lock().unwrap();
-        *updating_tabs = true;
-    }
-    pub fn done_updating_tabs(&self) {
-        let (lock, cvar) = &*self.updating_tabs;
-        let mut updating_tabs = lock.lock().unwrap();
-        *updating_tabs = false;
-        cvar.notify_one();
-    }
-    pub fn wait_until_pane_is_closed(&self) {
-        let (lock, cvar) = &*self.closing_pane;
-        let mut closing_pane = lock.lock().unwrap();
-        while *closing_pane {
-            closing_pane = cvar.wait(closing_pane).unwrap();
-        }
-    }
-    pub fn wait_until_new_pane_is_opened(&self) {
-        let (lock, cvar) = &*self.opening_new_pane;
-        let mut opening_new_pane = lock.lock().unwrap();
-        while *opening_new_pane {
-            opening_new_pane = cvar.wait(opening_new_pane).unwrap();
-        }
-    }
-    pub fn wait_until_tabs_are_updated(&self) {
-        let (lock, cvar) = &*self.updating_tabs;
-        let mut updating_tabs = lock.lock().unwrap();
-        while *updating_tabs {
-            updating_tabs = cvar.wait(updating_tabs).unwrap();
+    pub fn wait_until_input_thread_is_unblocked(&self) {
+        let (lock, cvar) = &*self.input_thread;
+        let mut input_thread = lock.lock().unwrap();
+        while *input_thread {
+            input_thread = cvar.wait(input_thread).unwrap();
         }
     }
 }
diff --git a/src/common/errors.rs b/src/common/errors.rs
index a96a5354..0b91a09d 100644
--- a/src/common/errors.rs
+++ b/src/common/errors.rs
@@ -323,9 +323,7 @@ impl From<&PluginInstruction> for PluginContext {
 pub enum ClientContext {
     Exit,
     Error,
-    DoneClosingPane,
-    DoneOpeningNewPane,
-    DoneUpdatingTabs,
+    UnblockInputThread,
     Render,
 }
 
@@ -335,9 +333,7 @@ impl From<&ClientInstruction> for ClientContext {
             ClientInstruction::Exit => ClientContext::Exit,
             ClientInstruction::Error(_) => ClientContext::Error,
             ClientInstruction::Render(_) => ClientContext::Render,
-            ClientInstruction::DoneClosingPane => ClientContext::DoneClosingPane,
-            ClientInstruction::DoneOpeningNewPane => ClientContext::DoneOpeningNewPane,
-            ClientInstruction::DoneUpdatingTabs => ClientContext::DoneUpdatingTabs,
+            ClientInstruction::UnblockInputThread => ClientContext::UnblockInputThread,
         }
     }
 }
@@ -353,9 +349,7 @@ pub enum ServerContext {
     Action,
     Render,
     TerminalResize,
-    DoneClosingPane,
-    DoneOpeningNewPane,
-    DoneUpdatingTabs,
+    UnblockInputThread,
     ClientExit,
 }
 
@@ -370,9 +364,7 @@ impl From<&ServerInstruction> for ServerContext {
             ServerInstruction::Action(_) => ServerContext::Action,
             ServerInstruction::TerminalResize(_) => ServerContext::TerminalResize,
             ServerInstruction::Render(_) => ServerContext::Render,
-            ServerInstruction::DoneClosingPane => ServerContext::DoneClosingPane,
-            ServerInstruction::DoneOpeningNewPane => ServerContext::DoneOpeningNewPane,
-            ServerInstruction::DoneUpdatingTabs => ServerContext::DoneUpdatingTabs,
+            ServerInstruction::UnblockInputThread => ServerContext::UnblockInputThread,
             ServerInstruction::ClientExit => ServerContext::ClientExit,
         }
     }
diff --git a/src/common/input/handler.rs b/src/common/input/handler.rs
index 509b77fa..64e4fbe3 100644
--- a/src/common/input/handler.rs
+++ b/src/common/input/handler.rs
@@ -114,27 +114,18 @@ impl InputHandler {
                 self.os_input
                     .send_to_server(ServerInstruction::Action(action.clone()));
             }
-            Action::NewPane(_) => {
-                self.command_is_executing.opening_new_pane();
-                self.os_input
-                    .send_to_server(ServerInstruction::Action(action));
-                self.command_is_executing.wait_until_new_pane_is_opened();
-            }
-            Action::CloseFocus => {
-                self.command_is_executing.closing_pane();
-                self.os_input
-                    .send_to_server(ServerInstruction::Action(action));
-                self.command_is_executing.wait_until_pane_is_closed();
-            }
-            Action::NewTab
+            Action::CloseFocus
+            | Action::NewPane(_)
+            | Action::NewTab
             | Action::GoToNextTab
             | Action::GoToPreviousTab
             | Action::CloseTab
             | Action::GoToTab(_) => {
-                self.command_is_executing.updating_tabs();
+                self.command_is_executing.blocking_input_thread();
                 self.os_input
                     .send_to_server(ServerInstruction::Action(action));
-                self.command_is_executing.wait_until_tabs_are_updated();
+                self.command_is_executing
+                    .wait_until_input_thread_is_unblocked();
             }
             _ => self
                 .os_input