prevent submission of message if waiting on response

TerminalFi · Jul 3, 2024 · 02835a2 · 02835a2
1 parent 491b24b
commit 02835a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/plugin/client.py b/plugin/client.py
@@ -320,6 +320,9 @@ def on_server_notification_async(self, notification) -> None:
                         return
 
                     conversation_manager = WindowConversationManager(window)
+                    if params.get("kind", None) == "end":
+                        conversation_manager.is_waiting = False
+
                     if suggest_title := params.get("suggestedTitle", None):
                         conversation_manager.suggested_title = suggest_title
 

diff --git a/plugin/commands.py b/plugin/commands.py
@@ -258,6 +258,10 @@ def _on_prompt(self, plugin: CopilotPlugin, session: Session, msg: str):
         import uuid
 
         manager = WindowConversationManager(window)
+        if manager.is_waiting:
+            manager.prompt(callback=lambda x: self._on_prompt(plugin, session, x), initial_text=msg)
+            return
+
         template = load_string_template(msg)
         sel = []
         if not (view := find_view_by_id(manager.last_active_view_id)):
@@ -288,7 +292,7 @@ def _on_prompt(self, plugin: CopilotPlugin, session: Session, msg: str):
                 {
                     "conversationId": manager.conversation_id,
                     "message": msg,
-                    "workDoneToken": f"copilot_chat://{manager.window.id()}",  # Not sure where this comes from
+                    "workDoneToken": f"copilot_chat://{manager.window.id()}",
                     "doc": request["doc"],
                     "computeSuggestions": True,
                     "references": [],
@@ -297,6 +301,7 @@ def _on_prompt(self, plugin: CopilotPlugin, session: Session, msg: str):
             ),
             manager.prompt(callback=lambda x: self._on_prompt(plugin, session, x)),
         )
+        manager.is_waiting = True
         manager.update()
 
 

diff --git a/plugin/ui/chat.py b/plugin/ui/chat.py
@@ -23,17 +23,6 @@ class WindowConversationManager:
     # window settings #
     # ------------- #
 
-    @property
-    def is_visible(self) -> bool:
-        """Whether the panel completions is visible."""
-        return get_copilot_setting(
-            self.window, COPILOT_WINDOW_CONVERSATION_SETTINGS_PREFIX, "is_visible_conversation", False
-        )
-
-    @is_visible.setter
-    def is_visible(self, value: bool) -> None:
-        set_copilot_setting(self.window, COPILOT_WINDOW_CONVERSATION_SETTINGS_PREFIX, "is_visible_conversation", value)
-
     @property
     def group_id(self) -> int:
         """The ID of the group which is used to show panel completions."""