shutdown procedures

Author: willmcgugan

src/textual/app.py

@@ -108,20 +108,31 @@ async def _process_messages(self) -> None:
             log.exception("error starting application mode")
             raise
         try:
-            self.refresh()
+            # self.refresh()
             await super().process_messages()
         finally:
             try:
                 driver.stop_application_mode()
             finally:
                 loop.remove_signal_handler(signal.SIGINT)
 
-        await asyncio.gather(*(child.close_messages() for child in self.children))
-        self.children.clear()
+        if self.children:
+
+            async def close_all() -> None:
+                for child in self.children:
+                    await child.close_messages()
+                await asyncio.gather(*(child.task for child in self.children))
+
+            try:
+                await asyncio.wait_for(close_all(), timeout=5)
+            except asyncio.TimeoutError:
+                raise
+
+            self.children.clear()
 
     async def add(self, child: MessagePump) -> None:
         self.children.add(child)
-        asyncio.create_task(child.process_messages())
+        child.start_messages()
         await child.post_message(events.Created(sender=self))
 
     def refresh(self) -> None:

src/textual/message_pump.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-from typing import NamedTuple
+from typing import Any, Coroutine, Awaitable, NamedTuple
 import asyncio
-from asyncio import PriorityQueue, QueueEmpty
+from asyncio import Event, PriorityQueue, Task, QueueEmpty
 
 import logging
 
@@ -57,6 +57,12 @@ def __init__(self, queue_size: int = 10, parent: MessagePump | None = None) -> N
         self._closed: bool = False
         self._disabled_messages: set[type[Message]] = set()
         self._pending_message: MessageQueueItem | None = None
+        self._task: Task | None = None
+
+    @property
+    def task(self) -> Task:
+        assert self._task is not None
+        return self._task
 
     def set_parent(self, parent: MessagePump) -> None:
         self._parent = parent
@@ -133,9 +139,16 @@ def set_interval(
         asyncio.get_event_loop().create_task(timer.run())
         return timer
 
-    async def close_messages(self) -> None:
+    async def close_messages(self, wait: bool = False) -> None:
+        """Close message queue, and optionally wait for queue to finish processing."""
         self._closing = True
         await self._message_queue.put(None)
+        if wait and self._task is not None:
+            await self._task
+
+    def start_messages(self) -> None:
+        task = asyncio.create_task(self.process_messages())
+        self._task = task
 
     async def process_messages(self) -> None:
         """Process messages until the queue is closed."""

src/textual/view.py

@@ -29,7 +29,6 @@ class NoWidget(Exception):
     pass
 
 
-@rich_repr
 class View(ABC, MessagePump):
     @property
     def app(self) -> "App":
@@ -45,10 +44,6 @@ def __rich_console__(
         return
         yield
 
-    def __rich_repr__(self) -> RichReprResult:
-        return
-        yield
-
     @abstractmethod
     async def mount(self, widget: Widget, *, slot: str = "main") -> None:
         ...
@@ -61,6 +56,7 @@ async def forward_input_event(self, event: events.Event) -> None:
         pass
 
 
+@rich_repr
 class LayoutView(View):
     layout: Layout