euporie 2.8.4__py3-none-any.whl → 2.8.6__py3-none-any.whl

euporie/core/widgets/dialog.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import logging
-import traceback
 from abc import ABCMeta, abstractmethod
 from functools import partial
 from pathlib import Path
@@ -34,26 +33,26 @@ from prompt_toolkit.layout.screen import WritePosition
 from prompt_toolkit.mouse_events import MouseButton, MouseEventType
 from prompt_toolkit.widgets.base import Label
 
-from euporie.core.app import get_app
+from euporie.core.app.current import get_app
 from euporie.core.border import (
     FullLine,
     LowerLeftHalfLine,
     UpperRightHalfLine,
 )
 from euporie.core.commands import add_cmd
-from euporie.core.filters import tab_has_focus
+from euporie.core.filters import tab_can_save
 from euporie.core.ft.utils import FormattedTextAlign, align, lex
 from euporie.core.key_binding.registry import register_bindings
 from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.layout.decor import FocusedStyle
-from euporie.core.tabs.base import Tab
 from euporie.core.widgets.decor import Border, Shadow
 from euporie.core.widgets.file_browser import FileBrowser
 from euporie.core.widgets.forms import Button, LabelledWidget, Select, Text
 from euporie.core.widgets.layout import Box
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Hashable
+    from collections.abc import Hashable
+    from typing import Any, Callable
 
     from prompt_toolkit.buffer import Buffer
     from prompt_toolkit.data_structures import Point
@@ -64,9 +63,9 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.layout import FocusableElement
     from prompt_toolkit.mouse_events import MouseEvent
 
-    from euporie.core.app import BaseApp
-    from euporie.core.tabs.base import KernelTab
-    from euporie.core.widgets.file_browser import FileBrowserControl
+    from euporie.core.app.app import BaseApp
+    from euporie.core.tabs.base import Tab
+    from euporie.core.tabs.kernel import KernelTab
 
 log = logging.getLogger(__name__)
 
@@ -139,8 +138,12 @@ class DialogTitleControl(UIControl):
                             dl_width, max_y
                         ).preferred
                         # Calculate new dialog position
-                        new_x = max(1, min(gx - self.drag_start.x, max_x - dl_width))
-                        new_y = max(1, min(gy - self.drag_start.y, max_y - dl_height))
+                        new_x = max(
+                            1, min(gx - self.drag_start.x, max_x - dl_width + 1)
+                        )
+                        new_y = max(
+                            1, min(gy - self.drag_start.y, max_y - dl_height + 1)
+                        )
                         # Move dialog
                         self.dialog.left = new_x - 1
                         self.dialog.top = new_y - 1
@@ -409,7 +412,7 @@ class AboutDialog(Dialog):
     @add_cmd()
     def _about() -> None:
         """Show the about dialog."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         if dialog := get_app().dialogs.get("about"):
             dialog.toggle()
@@ -498,12 +501,13 @@ class OpenFileDialog(FileDialog):
 
         self.tab_dd = tab_dd = Dropdown(options=[])
 
-        def _update_options(fb: FileBrowserControl) -> None:
-            tabs = get_app().get_file_tabs(path) if (path := fb.path).is_file() else []
+        def _update_options(path: Path) -> None:
+            tabs = get_app().get_file_tabs(path) if path.is_file() else []
             tab_dd.options = tabs
             tab_dd.labels = [tab.name for tab in tabs]
 
-        self.file_browser.control.on_select += _update_options
+        self.file_browser.control.on_select += lambda fb: _update_options(fb.path)
+        self.filepath.buffer.on_text_changed += lambda b: _update_options(Path(b.text))
 
         if isinstance(self.body, HSplit):
             self.body.children.append(
@@ -543,7 +547,7 @@ class OpenFileDialog(FileDialog):
                     self.file_browser.control.dir = path
                 elif path.is_file():
                     self.hide()
-                    self.app.open_file(path, tab_class=self.tab_dd.value)
+                    self.app.open_file(path, tab_class=self.tab_dd.value.tab_class)
                 return
             else:
                 self.show(
@@ -556,7 +560,7 @@ class OpenFileDialog(FileDialog):
     @add_cmd(menu_title="Open File…")
     def _open_file() -> None:
         """Open a file."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         if dialog := get_app().dialogs.get("open-file"):
             dialog.show()
@@ -565,7 +569,7 @@ class OpenFileDialog(FileDialog):
 
     register_bindings(
         {
-            "euporie.core.app.BaseApp": {
+            "euporie.core.app.app:BaseApp": {
                 "open-file": "c-o",
             }
         }
@@ -598,11 +602,11 @@ class SaveAsDialog(FileDialog):
     @staticmethod
     @add_cmd(
         menu_title="Save As…",
-        filter=tab_has_focus,
+        filter=tab_can_save,
     )
     def _save_as() -> None:
         """Save the current file at a new location."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         app = get_app()
         if dialog := app.dialogs.get("save-as"):
@@ -612,7 +616,7 @@ class SaveAsDialog(FileDialog):
 
     register_bindings(
         {
-            "euporie.core.app.BaseApp": {
+            "euporie.core.app.app:BaseApp": {
                 "save-as": ("A-s"),
             }
         }
@@ -773,6 +777,8 @@ class ErrorDialog(Dialog):
 
     def load(self, exception: Exception | None = None, when: str = "") -> None:
         """Load dialog body & buttons."""
+        import traceback
+
         from euporie.core.margins import MarginContainer, ScrollbarMargin
         from euporie.core.widgets.formatted_text_area import FormattedTextArea
         from euporie.core.widgets.forms import Checkbox
@@ -798,7 +804,7 @@ class ErrorDialog(Dialog):
                             ("bold", f" when {when}" if when else ""),
                             ("bold", ":"),
                             ("", "\n\n"),
-                            ("fg:ansired", exception.__repr__()),
+                            ("fg:ansired", repr(exception)),
                             ("", "\n"),
                         ],
                     )
@@ -828,7 +834,36 @@ class ErrorDialog(Dialog):
         def _copy_traceback() -> None:
             self.app.clipboard.set_data(ClipboardData(tb_text))
 
-        self.buttons = {"Close": None, "Copy Traceback": _copy_traceback}
+        def _report() -> None:
+            import webbrowser
+            from importlib.metadata import metadata
+            from urllib.parse import urlencode, urlparse, urlunparse
+
+            data = metadata("euporie")
+            if issue_url := dict(
+                x.split(", ", 1) for x in data.json["project_url"]
+            ).get("Issues"):
+                parsed_url = urlparse(issue_url)
+                url = urlunparse(
+                    parsed_url._replace(
+                        path=f"{parsed_url.path.rstrip('/')}/new"
+                    )._replace(
+                        query=urlencode(
+                            {
+                                "title": f"Error: {exception!r}",
+                                "body": "(Please describe what you did)\n\n"
+                                f"## Traceback\n\n```python\n{tb_text}\n```\n",
+                            }
+                        )
+                    )
+                )
+                webbrowser.open(url, new=2, autoraise=True)
+
+        self.buttons = {
+            "Report on GitHub": _report,
+            "Copy Traceback": _copy_traceback,
+            "Close": None,
+        }
 
 
 class UnsavedDialog(Dialog):
@@ -859,6 +894,8 @@ class UnsavedDialog(Dialog):
             tab.save(cb=partial(tab.close, cb))
 
         def no_cb() -> None:
+            from euporie.core.tabs.base import Tab
+
             assert tab is not None
             self.hide()
             Tab.close(tab, cb)
@@ -903,7 +940,7 @@ class ShortcutsDialog(Dialog):
 
     def format_key_info(self) -> StyleAndTextTuples:
         """Generate a table with the current key bindings."""
-        import importlib
+        import pkgutil
         from textwrap import dedent
 
         from prompt_toolkit.formatted_text.base import to_formatted_text
@@ -920,9 +957,7 @@ class ShortcutsDialog(Dialog):
 
         for group, bindings in BINDINGS.items():
             if any(not get_cmd(cmd_name).hidden() for cmd_name in bindings):
-                mod_name, cls_name = group.rsplit(".", maxsplit=1)
-                mod = importlib.import_module(mod_name)
-                app_cls = getattr(mod, cls_name)
+                app_cls = pkgutil.resolve_name(group)
                 section_title = (
                     dedent(app_cls.__doc__).strip().split("\n")[0].rstrip(".")
                 )
@@ -965,7 +1000,7 @@ class ShortcutsDialog(Dialog):
     @add_cmd()
     def _keyboard_shortcuts() -> None:
         """Display details of registered key-bindings in a dialog."""
-        from euporie.core.current import get_app
+        from euporie.core.app.current import get_app
 
         if dialog := get_app().dialogs.get("shortcuts"):
             dialog.toggle()

euporie/core/widgets/display.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 from functools import partial
 from math import ceil
@@ -16,9 +17,9 @@ from prompt_toolkit.layout.controls import GetLinePrefixCallable, UIContent, UIC
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.utils import Event, to_str
 
+from euporie.core.app.current import get_app
 from euporie.core.commands import add_cmd
 from euporie.core.convert.datum import Datum
-from euporie.core.current import get_app
 from euporie.core.filters import display_has_focus, scrollable
 from euporie.core.ft.utils import wrap
 from euporie.core.graphics import GraphicProcessor
@@ -28,10 +29,10 @@ from euporie.core.key_binding.registry import (
 )
 from euporie.core.layout.containers import VSplit, Window
 from euporie.core.margins import MarginContainer, ScrollbarMargin
-from euporie.core.utils import run_in_thread_with_context
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Iterable
+    from collections.abc import Iterable
+    from typing import Any, Callable
 
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text import StyleAndTextTuples
@@ -157,7 +158,7 @@ class DisplayControl(UIControl):
             extend=not self.dont_extend_width(),
         )
         if width and height:
-            key = Datum.add_size(datum, Size(self.height, self.width))
+            key = Datum.add_size(datum, Size(height, width))
             ft = [(f"[Graphic_{key}]", ""), *ft]
         lines = list(split_lines(ft))
         if wrap_lines and width:
@@ -194,13 +195,14 @@ class DisplayControl(UIControl):
         )
 
     def render(self) -> None:
-        """Render the HTML DOM in a thread."""
+        """Render the content in a thread."""
         datum = self.datum
         wrap_lines = self.wrap_lines()
 
-        max_cols, aspect = self.datum.cell_size()
-        cols = min(max_cols, self.width) if max_cols else self.width
-        rows = ceil(cols * aspect) if aspect else self.height
+        cols = self.preferred_width(self.width)
+        rows = self.preferred_height(
+            self.width, self.height, wrap_lines=wrap_lines, get_line_prefix=None
+        )
 
         def _render() -> None:
             cp = self.color_palette
@@ -215,7 +217,7 @@ class DisplayControl(UIControl):
         if not self.rendering:
             self.rendering = True
             if self.threaded:
-                run_in_thread_with_context(_render)
+                get_app().create_background_task(asyncio.to_thread(_render))
             else:
                 _render()
 
@@ -224,12 +226,7 @@ class DisplayControl(UIControl):
 
     def preferred_width(self, max_available_width: int) -> int | None:
         """Calculate and return the preferred width of the control."""
-        max_cols, aspect = self.datum.cell_size()
-        if max_cols:
-            return min(max_cols, max_available_width)
-        return self._max_line_width_cache[
-            self.datum, max_available_width, None, self.wrap_lines()
-        ]
+        return max_available_width
 
     def preferred_height(
         self,

euporie/core/widgets/file_browser.py

@@ -20,9 +20,8 @@ from prompt_toolkit.mouse_events import MouseButton, MouseEvent, MouseEventType
 from prompt_toolkit.utils import Event
 from upath import UPath
 
-from euporie.core.app import get_app
+from euporie.core.app.current import get_app
 from euporie.core.border import InsetGrid
-from euporie.core.config import add_setting
 from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.layout.decor import FocusedStyle
 from euporie.core.margins import MarginContainer, ScrollbarMargin
@@ -41,7 +40,7 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.dimension import AnyDimension
     from upath.core import PT
 
-    from euporie.core.widgets.status import StatusBarFields
+    from euporie.core.bars.status import StatusBarFields
 
 log = logging.getLogger(__name__)
 
@@ -704,23 +703,3 @@ class FileBrowser:
     def __pt_status__(self) -> StatusBarFields:
         """Show the selected or hovered path in the statusbar."""
         return self.control.__pt_status__()
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="show_file_icons",
-        flags=["--show-file-icons"],
-        type_=bool,
-        title="File icons",
-        help_="Show file icons in the file manager",
-        default=False,
-        schema={
-            "type": "boolean",
-        },
-        description="""
-            Whether file icons should be shown in the file manager.
-
-            These icons exist in the unicode private use area, and may require custom
-            fonts such as ``awesome-terminal-fonts`` or ``nerdfonts`` to be installed.
-        """,
-    )

euporie/core/widgets/forms.py

@@ -8,7 +8,7 @@ from abc import ABCMeta, abstractmethod
 from collections import deque
 from functools import partial
 from math import ceil, floor
-from typing import TYPE_CHECKING, Dict, cast
+from typing import TYPE_CHECKING, cast
 from weakref import finalize
 
 from prompt_toolkit.buffer import ValidationState
@@ -47,8 +47,8 @@ from prompt_toolkit.utils import Event
 from prompt_toolkit.validation import Validator
 from prompt_toolkit.widgets.base import TextArea
 
+from euporie.core.app.current import get_app
 from euporie.core.border import InsetGrid
-from euporie.core.current import get_app
 from euporie.core.data_structures import DiBool
 from euporie.core.ft.utils import FormattedTextAlign, align
 from euporie.core.margins import MarginContainer, ScrollbarMargin
@@ -56,7 +56,8 @@ from euporie.core.widgets.decor import Border, Shadow
 from euporie.core.widgets.layout import Box, ConditionalSplit
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Sequence
+    from collections.abc import Sequence
+    from typing import Any, Callable
 
     from prompt_toolkit.buffer import Buffer, BufferAcceptHandler
     from prompt_toolkit.completion.base import Completer
@@ -728,9 +729,11 @@ class Label:
         value = self.value
         data = value() if callable(value) else value
         if self.html():
+            from prompt_toolkit.formatted_text.utils import to_plain_text
+
             from euporie.core.ft.html import HTML
 
-            return HTML(data, collapse_root_margin=True, fill=False)
+            return HTML(to_plain_text(data), collapse_root_margin=True, fill=False)
         return data
 
     def __pt_container__(self) -> AnyContainer:
@@ -956,7 +959,7 @@ class Progress:
         return self.container
 
 
-class SizedMask(Dict[int, bool]):
+class SizedMask(dict[int, bool]):
     """Mask with restricted number of True items."""
 
     def __init__(self, size: int | None = None) -> None:

euporie/core/widgets/inputs.py

@@ -49,9 +49,8 @@ from prompt_toolkit.widgets import TextArea
 from prompt_toolkit.widgets.toolbars import SearchToolbar
 from pygments.lexers import ClassNotFound, get_lexer_by_name
 
+from euporie.core.app.current import get_app
 from euporie.core.commands import add_cmd
-from euporie.core.config import add_setting
-from euporie.core.current import get_app
 from euporie.core.diagnostics import Report
 from euporie.core.filters import buffer_is_code, scrollable
 from euporie.core.key_binding.registry import (
@@ -71,10 +70,10 @@ from euporie.core.processors import (
     ShowTrailingWhiteSpaceProcessor,
 )
 from euporie.core.suggest import ConditionalAutoSuggestAsync
-from euporie.core.widgets.pager import PagerState
 
 if TYPE_CHECKING:
-    from typing import Callable, Sequence
+    from collections.abc import Sequence
+    from typing import Callable
 
     from prompt_toolkit.buffer import BufferAcceptHandler
     from prompt_toolkit.filters import Filter, FilterOrBool
@@ -89,10 +88,10 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.margins import Margin
     from prompt_toolkit.lexers.base import Lexer
 
+    from euporie.core.bars.status import StatusBarFields
     from euporie.core.format import Formatter
     from euporie.core.inspection import Inspector
-    from euporie.core.tabs.base import KernelTab
-    from euporie.core.widgets.status import StatusBarFields
+    from euporie.core.tabs.kernel import KernelTab
 
 
 log = logging.getLogger(__name__)
@@ -296,7 +295,7 @@ class KernelInput(TextArea):
                     diagnostics=_get_diagnostics,
                     show_diagnostics=to_filter(show_diagnostics),
                 ),
-                app.config.filter("line_numbers") & self.buffer.multiline,
+                app.config.filters.line_numbers & self.buffer.multiline,
             ),
         ]
         right_margins = [OverflowMargin()]
@@ -366,6 +365,8 @@ class KernelInput(TextArea):
 
     async def inspect(self, auto: bool = False) -> None:
         """Get contextual help for the current cursor position in the current cell."""
+        from euporie.core.widgets.pager import PagerState
+
         if self.inspector is None:
             return
 
@@ -427,64 +428,6 @@ class KernelInput(TextArea):
         """Return the widget's container."""
         return self.container
 
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="line_numbers",
-        flags=["--line-numbers"],
-        type_=bool,
-        help_="Show or hide line numbers",
-        default=True,
-        description="""
-            Whether line numbers are shown by default.
-        """,
-        hooks=[lambda x: get_app().refresh()],
-    )
-
-    add_setting(
-        name="autoformat",
-        flags=["--autoformat"],
-        type_=bool,
-        help_="Automatically re-format code cells when run",
-        default=False,
-        description="""
-            Whether to automatically reformat code cells before they are run.
-        """,
-    )
-
-    add_setting(
-        name="autocomplete",
-        flags=["--autocomplete"],
-        type_=bool,
-        help_="Provide completions suggestions automatically",
-        default=False,
-        description="""
-            Whether to automatically suggestion completions while typing in code cells.
-        """,
-    )
-
-    add_setting(
-        name="autosuggest",
-        flags=["--autosuggest"],
-        type_=bool,
-        help_="Provide line completion suggestions",
-        default=True,
-        description="""
-            Whether to automatically suggestion line content while typing in code cells.
-        """,
-    )
-
-    add_setting(
-        name="autoinspect",
-        flags=["--autoinspect"],
-        type_=bool,
-        help_="Display contextual help automatically",
-        default=False,
-        description="""
-            Whether to automatically display contextual help when navigating through code cells.
-        """,
-    )
-
     # ################################### Commands ####################################
 
     @staticmethod
@@ -493,7 +436,7 @@ class KernelInput(TextArea):
     )
     async def _show_contextual_help() -> None:
         """Display contextual help."""
-        from euporie.core.tabs.base import KernelTab
+        from euporie.core.tabs.kernel import KernelTab
 
         tab = get_app().tab
         if isinstance(tab, KernelTab) and (input_box := tab.current_input) is not None:
@@ -503,7 +446,7 @@ class KernelInput(TextArea):
     @add_cmd(filter=buffer_is_code & buffer_has_focus)
     def _history_prev() -> None:
         """Get the previous history entry."""
-        from euporie.core.app import get_app
+        from euporie.core.app.current import get_app
 
         get_app().current_buffer.history_backward()
 
@@ -511,7 +454,7 @@ class KernelInput(TextArea):
     @add_cmd(filter=buffer_is_code & buffer_has_focus)
     def _history_next() -> None:
         """Get the next history entry."""
-        from euporie.core.app import get_app
+        from euporie.core.app.current import get_app
 
         get_app().current_buffer.history_forward()
 
@@ -519,8 +462,8 @@ class KernelInput(TextArea):
     @add_cmd()
     def _reformat_input() -> None:
         """Format the contents of the current input field."""
-        from euporie.core.app import get_app
-        from euporie.core.tabs.base import KernelTab
+        from euporie.core.app.current import get_app
+        from euporie.core.tabs.kernel import KernelTab
 
         if (
             (tab := get_app().tab)

euporie/core/widgets/layout.py

@@ -35,7 +35,8 @@ from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.widgets.decor import Border
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Sequence
+    from collections.abc import Sequence
+    from typing import Any, Callable
 
     from prompt_toolkit.filters import FilterOrBool
     from prompt_toolkit.formatted_text.base import AnyFormattedText, StyleAndTextTuples

euporie/core/widgets/logo.py

@@ -0,0 +1,49 @@
+"""Defines a logo widget."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Callable
+
+from prompt_toolkit.layout.containers import WindowAlign
+from prompt_toolkit.layout.controls import FormattedTextControl
+
+from euporie.core import __logo__
+from euporie.core.filters import has_tabs
+from euporie.core.layout.containers import Window
+
+if TYPE_CHECKING:
+    from typing import Any
+
+    from prompt_toolkit.filters import FilterOrBool
+    from prompt_toolkit.layout.controls import UIControl
+    from prompt_toolkit.layout.dimension import AnyDimension
+
+
+class Logo(Window):
+    """A widget to display the application's logo."""
+
+    def __init__(
+        self,
+        content: UIControl | None = None,
+        height: AnyDimension = 1,
+        width: AnyDimension = 3,
+        style: str | Callable[[], str] = "class:menu,logo",
+        dont_extend_width: FilterOrBool = True,
+        align: WindowAlign | Callable[[], WindowAlign] = WindowAlign.CENTER,
+        **kwargs: Any,
+    ) -> None:
+        """Create a new window with defaults specified."""
+        if content is None:
+            content = FormattedTextControl(
+                [("", f" {__logo__} ")],
+                focusable=~has_tabs,
+                show_cursor=False,
+            )
+        super().__init__(
+            content=content,
+            height=height,
+            width=width,
+            style=style,
+            dont_extend_width=dont_extend_width,
+            **kwargs,
+        )

euporie/core/widgets/menu.py

@@ -37,14 +37,15 @@ from prompt_toolkit.layout.utils import explode_text_fragments
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 from prompt_toolkit.utils import get_cwidth
 
+from euporie.core.app.current import get_app
+from euporie.core.bars.status import StatusContainer
 from euporie.core.border import OuterHalfGrid
-from euporie.core.current import get_app
 from euporie.core.layout.containers import HSplit, VSplit, Window
 from euporie.core.widgets.decor import Shadow
-from euporie.core.widgets.status import StatusContainer
 
 if TYPE_CHECKING:
-    from typing import Any, Callable, Iterable, Sequence
+    from collections.abc import Iterable, Sequence
+    from typing import Any, Callable
 
     from prompt_toolkit.filters import Filter, FilterOrBool
     from prompt_toolkit.formatted_text.base import (
@@ -57,10 +58,10 @@ if TYPE_CHECKING:
     from prompt_toolkit.layout.containers import AnyContainer
     from prompt_toolkit.layout.controls import UIControl
 
-    from euporie.core.app import BaseApp
+    from euporie.core.app.app import BaseApp
+    from euporie.core.bars.status import StatusBarFields
     from euporie.core.border import GridStyle
     from euporie.core.commands import Command
-    from euporie.core.widgets.status import StatusBarFields
 
 
 log = logging.getLogger(__name__)
@@ -149,7 +150,7 @@ class MenuItem:
         """Create a menu item from a command."""
         return cls(
             formatted_text=command.menu_title,
-            handler=command.menu_handler,
+            handler=command.run,
             shortcut=command.key_str,
             disabled=~command.filter,
             hidden=command.hidden,
@@ -326,7 +327,6 @@ class MenuBar:
         def _cancel(event: KeyPressEvent) -> None:
             """Leave menu."""
             self.selected_menu = []
-            log.debug(self.last_focused)
             self.refocus()
 
         # Sub menu navigation.
@@ -521,7 +521,9 @@ class MenuBar:
         def mouse_handler(index: int, mouse_event: MouseEvent) -> NotImplementedOrNone:
             focused = self.focused()
             hover = mouse_event.event_type == MouseEventType.MOUSE_MOVE
-            if mouse_event.event_type == MouseEventType.MOUSE_DOWN or hover and focused:
+            if mouse_event.event_type == MouseEventType.MOUSE_DOWN or (
+                hover and focused
+            ):
                 # Toggle focus.
                 if not hover and focused and self.selected_menu == [index]:
                     self.selected_menu = []