Merge branch 'main' into fix-selection-list-update-indexes-after-opti…

…on-removed

CHANGELOG.md

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fixed `SelectionList` issues after removing an option https://github.com/Textualize/textual/pull/4464
+- Fixed `ListView` bugs with the initial index https://github.com/Textualize/textual/pull/4452
+
+### Changed
+
+- When displaying a message using `App.exit()`, the console no longer highlights things such as numbers.
 
 ## [0.58.1] - 2024-05-01
 
@@ -19,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Fixed intermittent issue with scrolling to focus https://github.com/Textualize/textual/commit/567caf8acb196260adf6a0a6250e3ff5093056d0
 - Fixed issue with scrolling to center https://github.com/Textualize/textual/pull/4469
 
+
 ## [0.58.0] - 2024-04-25
 
 ### Fixed

docs/widgets/text_area.md

@@ -481,7 +481,7 @@ We can freely edit the text, and the syntax highlighting will update immediately
 Recall that we map names (like `@heading`) from the tree-sitter highlight query to Rich style objects inside the `TextAreaTheme.syntax_styles` dictionary.
 If you notice some highlights are missing after registering a language, the issue may be:
 
-1. The current `TextAreaTheme` doesn't contain a mapping for the name in the highlight query. Adding a new to `syntax_styles` should resolve the issue.
+1. The current `TextAreaTheme` doesn't contain a mapping for the name in the highlight query. Adding a new key-value pair to `syntax_styles` should resolve the issue.
 2. The highlight query doesn't assign a name to the pattern you expect to be highlighted. In this case you'll need to update the highlight query to assign to the name.
 
 !!! tip

src/textual/app.py

@@ -453,7 +453,7 @@ def __init__(
             soft_wrap=False,
         )
         self._workers = WorkerManager(self)
-        self.error_console = Console(markup=False, stderr=True)
+        self.error_console = Console(markup=False, highlight=False, stderr=True)
         self.driver_class = driver_class or self.get_driver_class()
         self._screen_stacks: dict[str, list[Screen[Any]]] = {"_default": []}
         """A stack of screens per mode."""

src/textual/css/scalar.py

@@ -12,15 +12,15 @@
 
 
 class ScalarError(Exception):
-    pass
+    """Base class for exceptions raised by the Scalar class."""
 
 
 class ScalarResolveError(ScalarError):
-    pass
+    """Raised for errors resolving scalars (unlikely to occur in practice)."""
 
 
 class ScalarParseError(ScalarError):
-    pass
+    """Raised when a scalar couldn't be parsed from a string."""
 
 
 @unique

src/textual/widgets/_list_view.py

@@ -119,9 +119,10 @@ def __init__(
         )
         # Set the index to the given initial index, or the first available index after.
         self._index = _widget_navigation.find_next_enabled(
-            self._nodes,
-            anchor=initial_index - 1 if initial_index is not None else None,
+            children,
+            anchor=initial_index if initial_index is not None else None,
             direction=1,
+            with_anchor=True,
         )
 
     def _on_mount(self, _: Mount) -> None:

tests/listview/test_listview_initial_index.py

@@ -0,0 +1,42 @@
+import pytest
+
+from textual.app import App, ComposeResult
+from textual.widgets import Label, ListItem, ListView
+
+
+@pytest.mark.parametrize(
+    "initial_index,expected_index",
+    [
+        (0, 1),
+        (1, 1),
+        (2, 4),
+        (3, 4),
+        (4, 4),
+        (5, 5),
+        (6, 7),
+        (7, 7),
+        (8, 1),
+    ],
+)
+async def test_listview_initial_index(initial_index, expected_index) -> None:
+    """Regression test for https://github.com/Textualize/textual/issues/4449"""
+
+    class ListViewDisabledItemsApp(App[None]):
+        def compose(self) -> ComposeResult:
+            yield ListView(
+                ListItem(Label("0"), disabled=True),
+                ListItem(Label("1")),
+                ListItem(Label("2"), disabled=True),
+                ListItem(Label("3"), disabled=True),
+                ListItem(Label("4")),
+                ListItem(Label("5")),
+                ListItem(Label("6"), disabled=True),
+                ListItem(Label("7")),
+                ListItem(Label("8"), disabled=True),
+                initial_index=initial_index,
+            )
+
+    app = ListViewDisabledItemsApp()
+    async with app.run_test() as pilot:
+        list_view = pilot.app.query_one(ListView)
+        assert list_view._index == expected_index

tests/listview/test_listview_navigation.py

@@ -35,7 +35,6 @@ async def test_keyboard_navigation_with_disabled_items() -> None:
             await pilot.press("up")
 
     assert app.highlighted == [
-        None,
         "1",
         "4",
         "5",