error messages

Author: willmcgugan

src/textual/css/query.py

@@ -242,7 +242,7 @@ def first(
             if expect_type is not None:
                 if not isinstance(first, expect_type):
                     raise WrongType(
-                        f"Query value is wrong type; expected {expect_type}, got {type(first)}"
+                        f"Query value is the wrong type; expected {expect_type}, found {first}"
                     )
             return first
         else:
@@ -324,7 +324,7 @@ def last(
         last = self.nodes[-1]
         if expect_type is not None and not isinstance(last, expect_type):
             raise WrongType(
-                f"Query value is wrong type; expected {expect_type}, got {type(last)}"
+                f"Query value is the wrong type; expected {expect_type}, found {last}"
             )
         return last
 

src/textual/getters.py

@@ -181,7 +181,6 @@ def __get__(
             raise NoMatches(f"No child found with id={self.child_id!r}")
         if not isinstance(child, self.expect_type):
             raise WrongType(
-                f"Child with id={id!r} is wrong type; expected {self.expect_type}, got"
-                f" {type(child)}"
+                f"Child with id={id!r} is the wrong type; expected type {self.expect_type}, found {child}"
             )
         return child

src/textual/widget.py

@@ -1005,8 +1005,7 @@ def get_child_by_id(
             return child
         if not isinstance(child, expect_type):
             raise WrongType(
-                f"Child with id={id!r} is wrong type; expected {expect_type}, got"
-                f" {type(child)}"
+                f"Child with id={id!r} is the wrong type; expected type {expect_type}, found {child}"
             )
         return child
 
@@ -1042,8 +1041,7 @@ def get_widget_by_id(
         widget = self.query_one(f"#{id}")
         if expect_type is not None and not isinstance(widget, expect_type):
             raise WrongType(
-                f"Descendant with id={id!r} is wrong type; expected {expect_type},"
-                f" got {type(widget)}"
+                f"Descendant with id={id!r} is the wrong type; expected {expect_type}, found {widget}"
             )
         return widget