euporie 2.8.0__py3-none-any.whl → 2.8.5__py3-none-any.whl

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__)
 
@@ -377,9 +376,9 @@ class FileBrowserControl(UIControl):
         self.dir = path or UPath(".")
         self.hovered: int | None = None
         self.selected: int | None = None
-        self._dir_cache: FastDictCache[
-            tuple[Path], list[tuple[bool, Path]]
-        ] = FastDictCache(get_value=self.load_path, size=1)
+        self._dir_cache: FastDictCache[tuple[Path], list[tuple[bool, Path]]] = (
+            FastDictCache(get_value=self.load_path, size=1)
+        )
         self.on_select = Event(self, on_select)
         self.on_chdir = Event(self, on_chdir)
         self.on_open = Event(self, on_open)
@@ -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
@@ -236,6 +237,7 @@ class Button:
 
     def default_mouse_handler(self, mouse_event: MouseEvent) -> NotImplementedOrNone:
         """Handle mouse events."""
+        app = get_app()
         if self.disabled():
             return NotImplemented
         if mouse_event.button == MouseButton.LEFT:
@@ -249,16 +251,15 @@ class Button:
                 ):
                     y_min, x_min = min(render_info._rowcol_to_yx.values())
                     y_max, x_max = max(render_info._rowcol_to_yx.values())
-                    get_app().mouse_limits = WritePosition(
+                    app.mouse_limits = WritePosition(
                         xpos=x_min,
                         ypos=y_min,
-                        width=x_max - x_min,
-                        height=y_max - y_min,
+                        width=x_max - x_min + 1,
+                        height=y_max - y_min + 1,
                     )
                 self.on_mouse_down.fire()
 
                 if not self.has_focus():
-                    app = get_app()
                     app.layout.focus(self)
                     # Invalidate the app - we don't do it by returning None so the
                     # event can bubble
@@ -269,7 +270,7 @@ class Button:
                     return None
 
             elif mouse_event.event_type == MouseEventType.MOUSE_UP:
-                get_app().mouse_limits = None
+                app.mouse_limits = None
                 if self.selected:
                     self.selected = False
                     self.on_click.fire()
@@ -280,11 +281,12 @@ class Button:
                 if (info := self.window.render_info) is not None and (
                     info._x_offset + mouse_event.position.x,
                     info._y_offset + mouse_event.position.y,
-                ) != get_app().mouse_position:
+                ) != app.mouse_position:
+                    app.mouse_limits = None
                     self.selected = False
                 return None
 
-        get_app().mouse_limits = None
+        app.mouse_limits = None
         self.selected = False
         return NotImplemented
 
@@ -727,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:
@@ -955,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

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import logging
+from functools import lru_cache
 from typing import TYPE_CHECKING
 
 from prompt_toolkit.auto_suggest import AutoSuggest, DynamicAutoSuggest
@@ -48,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 (
@@ -70,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
@@ -88,15 +88,30 @@ 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__)
 
 
+@lru_cache
+def _get_lexer(highlight: bool, lexer: Lexer | None, language: str) -> Lexer:
+    """Determine which lexer should be used for syntax highlighting."""
+    if not highlight:
+        return SimpleLexer()
+    elif lexer is not None:
+        return lexer
+    try:
+        pygments_lexer_class = get_lexer_by_name(language).__class__
+    except ClassNotFound:
+        return SimpleLexer()
+    else:
+        return PygmentsLexer(pygments_lexer_class, sync_from_start=False)
+
+
 class KernelInput(TextArea):
     """Kernel input text areas.
 
@@ -129,7 +144,7 @@ class KernelInput(TextArea):
         scrollbar: FilterOrBool = True,
         style: str = "class:kernel-input",
         search_field: SearchToolbar | None = None,
-        preview_search: FilterOrBool = True,
+        preview_search: FilterOrBool = False,
         prompt: AnyFormattedText = "",
         input_processors: list[Processor] | None = None,
         name: str = "",
@@ -182,14 +197,6 @@ class KernelInput(TextArea):
         self._language = language
         self.lexer = lexer
 
-        def _get_lexer() -> Lexer:
-            try:
-                pygments_lexer_class = get_lexer_by_name(self.language).__class__
-            except ClassNotFound:
-                return SimpleLexer()
-            else:
-                return PygmentsLexer(pygments_lexer_class, sync_from_start=False)
-
         self.formatters = formatters if formatters is not None else []
         self._diagnostics = diagnostics or Report()
         self.inspector = inspector
@@ -228,7 +235,8 @@ class KernelInput(TextArea):
 
         # Set extra key-bindings
         widgets_key_bindings = load_registered_bindings(
-            "euporie.core.widgets.inputs.KernelInput"
+            "euporie.core.widgets.inputs.KernelInput",
+            config=app.config,
         )
         if key_bindings:
             widgets_key_bindings = merge_key_bindings(
@@ -240,7 +248,11 @@ class KernelInput(TextArea):
 
         self.control = BufferControl(
             buffer=self.buffer,
-            lexer=DynamicLexer(lambda: self.lexer or _get_lexer()),
+            lexer=DynamicLexer(
+                lambda: _get_lexer(
+                    app.config.syntax_highlighting, self.lexer, self.language
+                )
+            ),
             input_processors=[
                 ConditionalProcessor(
                     DiagnosticProcessor(_get_diagnostics),
@@ -283,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()]
@@ -353,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
 
@@ -414,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
@@ -480,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:
@@ -490,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()
 
@@ -498,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()
 
@@ -506,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,12 +35,13 @@ 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
     from prompt_toolkit.key_binding.key_bindings import (
-        KeyBindings,
+        KeyBindingsBase,
         NotImplementedOrNone,
     )
     from prompt_toolkit.layout.containers import AnyContainer, Container, _Split
@@ -84,7 +85,7 @@ class Box:
         style: str = "",
         char: None | str | Callable[[], str] = None,
         modal: bool = False,
-        key_bindings: KeyBindings | None = None,
+        key_bindings: KeyBindingsBase | None = None,
     ) -> None:
         """Initialize this widget."""
         if padding is None:
@@ -117,7 +118,7 @@ class Box:
             height=height,
             style=style,
             modal=modal,
-            key_bindings=None,
+            key_bindings=key_bindings,
         )
 
     def __pt_container__(self) -> Container:
@@ -155,7 +156,7 @@ class ConditionalSplit:
         return self._cache.get(vertical, partial(self.load_container, vertical))
 
     def __pt_container__(self) -> AnyContainer:
-        """Return a dymanic container."""
+        """Return a dynamic container."""
         return DynamicContainer(self.container)
 
 
@@ -287,7 +288,7 @@ class TabBarControl(UIControl):
 
     def is_focusable(self) -> bool:
         """Tell whether this user control is focusable."""
-        return True
+        return False
 
     def create_content(self, width: int, height: int) -> UIContent:
         """Generate the formatted text fragments which make the controls output."""

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__)
@@ -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.
@@ -408,8 +408,6 @@ class MenuBar:
             """Close the current menu."""
             if self.selected_menu:
                 self.selected_menu = self.selected_menu[:-1]
-                log.debug(self.selected_menu)
-                log.debug(self.last_focused)
                 self.refocus()
 
         # Add global CUA menu shortcut
@@ -516,20 +514,24 @@ class MenuBar:
         focused = self.focused()
 
         # This is called during the rendering. When we discover that this
-        # widget doesn't have the focus anymore. Reset menu state.
+        # widget doesn't have the focus anymore, reset the menu state.
         if not focused:
             self.selected_menu = []
 
         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 = []
-                self.selected_menu = [index]
+                else:
+                    self.selected_menu = [index]
                 self.refocus()
                 return None
+
             return NotImplemented
 
         results: StyleAndTextTuples = []

euporie/core/widgets/pager.py

@@ -9,16 +9,12 @@ from typing import TYPE_CHECKING, NamedTuple
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
-    DynamicContainer,
 )
 from prompt_toolkit.layout.dimension import Dimension
 
+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.convert.formats import BASE64_FORMATS
-from euporie.core.convert.mime import MIME_FORMATS
 from euporie.core.convert.registry import find_route
-from euporie.core.current import get_app
 from euporie.core.filters import pager_has_focus
 from euporie.core.key_binding.registry import (
     load_registered_bindings,
@@ -67,6 +63,10 @@ class PagerOutputDataElement(CellOutputDataElement):
             metadata: Any metadata relating to the data
             parent: The parent container the output-element is attached to
         """
+        from euporie.core.convert.datum import Datum
+        from euporie.core.convert.formats import BASE64_FORMATS
+        from euporie.core.convert.mime import MIME_FORMATS
+
         # Get internal format
         format_ = "ansi"
         mime_path = PurePath(mime)
@@ -106,6 +106,7 @@ class PagerOutput(CellOutput):
         Returns:
             A :class:`PagerOutputDataElement` container for the currently selected mime-type.
         """
+        self._selected_mime = None
         return PagerOutputDataElement(
             mime=self.selected_mime,
             data=self.data[self.selected_mime],
@@ -138,15 +139,12 @@ class Pager:
                         collapse=False,
                         style="class:pager.border",
                     ),
-                    Box(
-                        DynamicContainer(lambda: self.output),
-                        padding=0,
-                        padding_left=1,
-                    ),
+                    Box(self.output, padding=0, padding_left=1),
                 ],
                 style="class:pager",
                 key_bindings=load_registered_bindings(
-                    "euporie.core.widgets.pager.Pager"
+                    "euporie.core.widgets.pager.Pager",
+                    config=get_app().config,
                 ),
                 height=height,
             ),

euporie/core/widgets/palette.py

@@ -14,15 +14,15 @@ from prompt_toolkit.layout.containers import ScrollOffsets
 from prompt_toolkit.layout.controls import UIContent, UIControl
 from prompt_toolkit.mouse_events import MouseEvent, MouseEventType
 
+from euporie.core.app.current import get_app
+from euporie.core.bars.status import StatusContainer
 from euporie.core.commands import Command, add_cmd, commands
-from euporie.core.current import get_app
 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.margins import MarginContainer, ScrollbarMargin
 from euporie.core.widgets.dialog import Dialog
 from euporie.core.widgets.forms import Text
-from euporie.core.widgets.status import StatusContainer
 
 if TYPE_CHECKING:
     from prompt_toolkit.buffer import Buffer
@@ -31,8 +31,8 @@ if TYPE_CHECKING:
     from prompt_toolkit.key_binding.key_processor import KeyPressEvent
     from prompt_toolkit.layout.controls import GetLinePrefixCallable
 
-    from euporie.core.app import BaseApp
-    from euporie.core.widgets.status import StatusBarFields
+    from euporie.core.app.app import BaseApp
+    from euporie.core.bars.status import StatusBarFields
 
 log = logging.getLogger(__name__)
 
@@ -242,7 +242,7 @@ class CommandPalette(Dialog):
         regex = re.compile(
             "(?=({}))".format(".*?".join(map(re.escape, buffer.text))), re.IGNORECASE
         )
-        for cmd in commands.values():
+        for cmd in set(commands.values()):
             if not cmd.hidden():
                 matches = list(regex.finditer(cmd.title))
                 if matches:
@@ -298,7 +298,7 @@ class CommandPalette(Dialog):
 
     register_bindings(
         {
-            "euporie.core.app.BaseApp": {
+            "euporie.core.app.app:BaseApp": {
                 "show-command-palette": "c-@",
             }
         }