Merge branch 'main' into update-suggestion

Author: willmcgugan

src/textual/getters.py

@@ -5,12 +5,53 @@
 
 from __future__ import annotations
 
-from typing import Generic, overload
+from typing import TYPE_CHECKING, Generic, TypeVar, overload
 
+from textual._context import NoActiveAppError, active_app
 from textual.css.query import NoMatches, QueryType, WrongType
-from textual.dom import DOMNode
 from textual.widget import Widget
 
+if TYPE_CHECKING:
+    from textual.app import App
+    from textual.dom import DOMNode
+    from textual.message_pump import MessagePump
+
+
+AppType = TypeVar("AppType", bound="App")
+
+
+class app(Generic[AppType]):
+    """Create a property to return the active app.
+
+    Example:
+        ```python
+        class MyWidget(Widget):
+            app = getters.app(MyApp)
+        ```
+
+    Args:
+        app_type: The app class.
+    """
+
+    def __init__(self, app_type: type[AppType]) -> None:
+        self._app_type = app_type
+
+    def __get__(self, obj: MessagePump, obj_type: type[MessagePump]) -> AppType:
+        try:
+            app = active_app.get()
+        except LookupError:
+            from textual.app import App
+
+            node: MessagePump | None = obj
+            while not isinstance(node, App):
+                if node is None:
+                    raise NoActiveAppError()
+                node = node._parent
+            app = node
+
+        assert isinstance(app, self._app_type)
+        return app
+
 
 class query_one(Generic[QueryType]):
     """Create a query one property.
@@ -45,7 +86,7 @@ def on_mount(self) -> None:
     """
 
     selector: str
-    expect_type: type[Widget]
+    expect_type: type["Widget"]
 
     @overload
     def __init__(self, selector: str) -> None:
@@ -72,6 +113,8 @@ def __init__(
         expect_type: type[QueryType] | None = None,
     ) -> None:
         if expect_type is None:
+            from textual.widget import Widget
+
             self.expect_type = Widget
         else:
             self.expect_type = expect_type

src/textual/message_pump.py

@@ -227,29 +227,35 @@ def is_dom_root(self):
         """Is this a root node (i.e. the App)?"""
         return False
 
-    @property
-    def app(self) -> "App[object]":
-        """
-        Get the current app.
+    if TYPE_CHECKING:
+        from textual import getters
 
-        Returns:
-            The current app.
+        app = getters.app(App)
+    else:
 
-        Raises:
-            NoActiveAppError: if no active app could be found for the current asyncio context
-        """
-        try:
-            return active_app.get()
-        except LookupError:
-            from textual.app import App
+        @property
+        def app(self) -> "App[object]":
+            """
+            Get the current app.
+
+            Returns:
+                The current app.
+
+            Raises:
+                NoActiveAppError: if no active app could be found for the current asyncio context
+            """
+            try:
+                return active_app.get()
+            except LookupError:
+                from textual.app import App
 
-            node: MessagePump | None = self
-            while not isinstance(node, App):
-                if node is None:
-                    raise NoActiveAppError()
-                node = node._parent
+                node: MessagePump | None = self
+                while not isinstance(node, App):
+                    if node is None:
+                        raise NoActiveAppError()
+                    node = node._parent
 
-            return node
+                return node
 
     @property
     def is_attached(self) -> bool:

src/textual/widgets/_text_area.py

@@ -1558,11 +1558,9 @@ def edit(self, edit: Edit) -> EditResult:
 
         self._refresh_size()
         edit.after(self)
-
         self._build_highlight_map()
         self.post_message(self.Changed(self))
         self.update_suggestion()
-
         return result
 
     def undo(self) -> None:

tests/test_getters.py

@@ -43,3 +43,19 @@ def compose(self) -> ComposeResult:
 
         with pytest.raises(NoMatches):
             app.label2_missing
+
+
+async def test_app_getter() -> None:
+
+    class MyApp(App):
+        def compose(self) -> ComposeResult:
+            my_widget = MyWidget()
+            my_widget.app
+            yield my_widget
+
+    class MyWidget(Widget):
+        app = getters.app(MyApp)
+
+    app = MyApp()
+    async with app.run_test():
+        assert isinstance(app.query_one(MyWidget).app, MyApp)