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

euporie/core/widgets/_settings.py

@@ -0,0 +1,188 @@
+"""Defines widget settings."""
+
+from prompt_toolkit.filters import buffer_has_focus
+
+from euporie.core.app.current import get_app
+from euporie.core.config import add_setting
+
+# euporie.core.widgets.cell_outputs:CellOutputArea
+
+add_setting(
+    name="wrap_cell_outputs",
+    group="euporie.core.widgets.cell_outputs",
+    title="wrap cell outputs",
+    flags=["--wrap-cell-outputs"],
+    type_=bool,
+    help_="Wrap cell output text.",
+    default=False,
+    schema={"type": "boolean"},
+    description="""
+        Whether text-based cell outputs should be wrapped.
+    """,
+    cmd_filter=~buffer_has_focus,
+)
+
+# euporie,core.widgets.file_browser:FileBrowser
+
+add_setting(
+    name="show_file_icons",
+    group="euporie.core.widgets.file_browser",
+    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.inputs:KernelInput
+
+add_setting(
+    name="line_numbers",
+    group="euporie.core.widgets.inputs",
+    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",
+    group="euporie.core.widgets.inputs",
+    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",
+    group="euporie.core.widgets.inputs",
+    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",
+    group="euporie.core.widgets.inputs",
+    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",
+    group="euporie.core.widgets.inputs",
+    flags=["--autoinspect"],
+    type_=bool,
+    help_="Display contextual help automatically",
+    default=False,
+    description="""
+        Whether to automatically display contextual help when navigating through code cells.
+    """,
+)
+
+
+# euporie.core.bars.status:StatusBar
+
+add_setting(
+    name="show_status_bar",
+    group="euporie.core.bars.status",
+    flags=["--show-status-bar"],
+    type_=bool,
+    title="status bar",
+    help_="Show the status bar",
+    default=True,
+    schema={
+        "type": "boolean",
+    },
+    description="""
+        Whether the status bar should be shown at the bottom of the screen.
+    """,
+)
+
+# euporie.core.widgets.decor:
+
+add_setting(
+    name="show_shadows",
+    group="euporie.core.widgets.decor",
+    flags=["--show-shadows"],
+    type_=bool,
+    help_="Show or hide shadows under menus and dialogs",
+    default=True,
+    description="""
+        Sets whether shadows are shown under dialogs and popup-menus.
+    """,
+)
+
+# euporie.core.widgets.cell
+
+add_setting(
+    name="show_cell_borders",
+    group="euporie.core.widgets.cell",
+    title="cell borders",
+    flags=["--show-cell-borders"],
+    type_=bool,
+    help_="Show or hide cell borders.",
+    default=False,
+    schema={
+        "type": "boolean",
+    },
+    description="""
+        Whether cell borders should be drawn for unselected cells.
+    """,
+)
+
+add_setting(
+    name="external_editor",
+    group="euporie.core.widgets.cell",
+    flags=["--external-editor"],
+    type_=str,
+    help_="Set the external editor to use.",
+    default=None,
+    description="""
+        A command to run when editing cells externally. The following strings in
+        the command will be replaced with values which locate the cell being
+        edited:
+
+        * ``{top}``
+        * ``{left}``
+        * ``{bottom}``
+        * ``{right}``
+        * ``{width}``
+        * ``{height}``
+
+        This is useful if you run euporie inside a tmux session, and wish to launch
+        your editor in a pop-up pane. This can be achieved by setting this parameter
+        to something like the following:
+
+        .. code-block::
+
+           "tmux display-popup -x {left} -y {bottom} -w {width} -h {height} -B -E micro"
+
+    """,
+)

euporie/core/widgets/cell.py

@@ -17,6 +17,7 @@ from prompt_toolkit.completion.base import (
     _MergedCompleter,
 )
 from prompt_toolkit.document import Document
+from prompt_toolkit.filters.app import is_searching
 from prompt_toolkit.filters.base import Condition
 from prompt_toolkit.layout.containers import (
     ConditionalContainer,
@@ -26,10 +27,9 @@ from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.layout.dimension import Dimension
 from prompt_toolkit.utils import Event
 
+from euporie.core.app.current import get_app
 from euporie.core.border import NoLine, ThickLine, ThinLine
 from euporie.core.completion import DeduplicateCompleter, LspCompleter
-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 multiple_cells_selected
 from euporie.core.format import LspFormatter
@@ -48,7 +48,7 @@ if TYPE_CHECKING:
 
     from prompt_toolkit.buffer import Buffer
     from prompt_toolkit.completion.base import Completer
-    from prompt_toolkit.formatted_text.base import OneStyleAndTextTuple
+    from prompt_toolkit.formatted_text.base import StyleAndTextTuples
 
     from euporie.core.format import Formatter
     from euporie.core.inspection import Inspector
@@ -163,6 +163,11 @@ class Cell:
             """Respond to cursor movements."""
             # Tell the scrolling container to scroll the cursor into view on the next render
             weak_self.kernel_tab.page.scroll_to_cursor = True
+            if not is_searching():
+                if not self.selected:
+                    weak_self.kernel_tab.select(self.index, scroll=True)
+                if not weak_self.kernel_tab.in_edit_mode():
+                    weak_self.kernel_tab.enter_edit_mode()
 
         # Now we generate the main container used to represent a kernel_tab cell
 
@@ -213,6 +218,23 @@ class Cell:
 
             return _inner
 
+        # @lru_cache(maxsize=None)
+        # def _cell_border_char(
+        #     name: str,
+        #     show_cell_borders: bool,
+        #     focused: bool,
+        #     selected: bool,
+        #     multiple_cells_selected: bool,
+        # ) -> str:
+        #     if show_cell_borders or selected:
+        #         if focused and multiple_cells_selected:
+        #             grid = ThickLine.outer
+        #         else:
+        #             grid = ThinLine.outer
+        #     else:
+        #         grid = NoLine.grid
+        #     return getattr(grid, name.upper())
+
         self.control = Window(
             FormattedTextControl(
                 border_char("TOP_LEFT"),
@@ -228,36 +250,11 @@ class Cell:
         fill = partial(Window, style="class:border")
 
         # Create textbox for standard input
-        def _send_input(buf: Buffer) -> bool:
-            return False
-
         self.stdin_box = StdInput(weak_self.kernel_tab)
 
-        top_border = VSplit(
-            [
-                self.control,
-                ConditionalContainer(
-                    content=fill(
-                        char=border_char("TOP_MID"),
-                        width=lambda: len(weak_self.prompt),
-                        height=1,
-                    ),
-                    filter=show_prompt,
-                ),
-                ConditionalContainer(
-                    content=fill(width=1, height=1, char=border_char("TOP_SPLIT")),
-                    filter=show_prompt,
-                ),
-                fill(char=border_char("TOP_MID"), height=1),
-                fill(width=1, height=1, char=border_char("TOP_RIGHT")),
-            ],
-            height=1,
-        )
-
         input_row = ConditionalContainer(
             VSplit(
                 [
-                    fill(width=1, char=border_char("MID_LEFT")),
                     ConditionalContainer(
                         content=Window(
                             FormattedTextControl(
@@ -270,63 +267,44 @@ class Cell:
                                     ("", "\n ", lambda e: NotImplemented),
                                 ]
                             ),
-                            width=lambda: len(weak_self.prompt),
+                            width=lambda: len(weak_self.prompt) + 1,
                             height=Dimension(preferred=1),
                             style="class:input,prompt",
                         ),
                         filter=show_prompt,
                     ),
-                    ConditionalContainer(
-                        fill(width=1, char=border_char("MID_SPLIT")),
-                        filter=show_prompt,
-                    ),
                     ConditionalContainer(self.input_box, filter=~source_hidden),
                     ConditionalContainer(
                         Window(
                             FormattedTextControl(
-                                [
-                                    cast(
-                                        "OneStyleAndTextTuple",
+                                cast(
+                                    "StyleAndTextTuples",
+                                    [
+                                        (
+                                            "class:cell,show,inputs,border",
+                                            "▏",
+                                            on_click(self.show_input),
+                                        ),
                                         (
                                             "class:cell,show,inputs",
-                                            " … ",
+                                            "…",
                                             on_click(self.show_input),
                                         ),
-                                    )
-                                ]
+                                        (
+                                            "class:cell,show,inputs,border",
+                                            "▕",
+                                            on_click(self.show_input),
+                                        ),
+                                    ],
+                                )
                             )
                         ),
                         filter=source_hidden,
                     ),
-                    fill(width=1, char=border_char("MID_RIGHT")),
                 ],
             ),
             filter=show_input,
         )
-        middle_line = ConditionalContainer(
-            content=VSplit(
-                [
-                    fill(width=1, height=1, char=border_char("SPLIT_LEFT")),
-                    ConditionalContainer(
-                        content=fill(
-                            char=border_char("SPLIT_MID"),
-                            width=lambda: len(weak_self.prompt),
-                        ),
-                        filter=show_prompt,
-                    ),
-                    ConditionalContainer(
-                        content=fill(
-                            width=1, height=1, char=border_char("SPLIT_SPLIT")
-                        ),
-                        filter=show_prompt,
-                    ),
-                    fill(char=border_char("SPLIT_MID")),
-                    fill(width=1, height=1, char=border_char("SPLIT_RIGHT")),
-                ],
-                height=1,
-            ),
-            filter=(show_input & show_output) | self.stdin_box.visible,
-        )
 
         outputs_hidden = Condition(
             lambda: weak_self.json["metadata"]
@@ -338,7 +316,6 @@ class Cell:
         output_row = ConditionalContainer(
             VSplit(
                 [
-                    fill(width=1, char=border_char("MID_LEFT")),
                     ConditionalContainer(
                         content=Window(
                             FormattedTextControl(
@@ -351,20 +328,12 @@ class Cell:
                                     ("", "\n ", lambda e: NotImplemented),
                                 ],
                             ),
-                            width=lambda: len(weak_self.prompt),
+                            width=lambda: len(weak_self.prompt) + 1,
                             height=Dimension(preferred=1),
                             style="class:output,prompt",
                         ),
                         filter=show_prompt,
                     ),
-                    ConditionalContainer(
-                        content=fill(width=1, char=border_char("MID_SPLIT")),
-                        filter=show_prompt,
-                    ),
-                    ConditionalContainer(
-                        fill(width=1, char=border_char("MID_MID")),
-                        filter=~show_prompt,
-                    ),
                     HSplit(
                         [
                             ConditionalContainer(
@@ -374,51 +343,38 @@ class Cell:
                             ConditionalContainer(
                                 Window(
                                     FormattedTextControl(
-                                        [
-                                            cast(
-                                                "OneStyleAndTextTuple",
+                                        cast(
+                                            "StyleAndTextTuples",
+                                            [
+                                                (
+                                                    "class:cell,show,outputs,border",
+                                                    "▏",
+                                                    on_click(self.show_output),
+                                                ),
                                                 (
                                                     "class:cell,show,outputs",
-                                                    " … ",
+                                                    "…",
+                                                    on_click(self.show_output),
+                                                ),
+                                                (
+                                                    "class:cell,show,outputs,border",
+                                                    "▕",
                                                     on_click(self.show_output),
                                                 ),
-                                            ),
-                                        ]
+                                            ],
+                                        )
                                     )
                                 ),
                                 filter=outputs_hidden,
                             ),
                             self.stdin_box,
-                        ]
+                        ],
                     ),
-                    ConditionalContainer(
-                        fill(width=1, char=border_char("MID_MID")),
-                        filter=~show_prompt,
-                    ),
-                    fill(width=1, char=border_char("MID_RIGHT")),
                 ],
+                width=Dimension(min=1),
             ),
             filter=show_output | self.stdin_box.visible,
         )
-        bottom_border = VSplit(
-            [
-                fill(width=1, height=1, char=border_char("BOTTOM_LEFT")),
-                ConditionalContainer(
-                    content=fill(
-                        char=border_char("BOTTOM_MID"),
-                        width=lambda: len(weak_self.prompt),
-                    ),
-                    filter=show_prompt,
-                ),
-                ConditionalContainer(
-                    content=fill(width=1, height=1, char=border_char("BOTTOM_SPLIT")),
-                    filter=show_prompt,
-                ),
-                fill(char=border_char("BOTTOM_MID")),
-                fill(width=1, height=1, char=border_char("BOTTOM_RIGHT")),
-            ],
-            height=1,
-        )
 
         def _style() -> str:
             """Calculate the cell's style given its state."""
@@ -432,11 +388,32 @@ class Cell:
 
         self.container = HSplit(
             [
-                top_border,
-                input_row,
-                middle_line,
-                output_row,
-                bottom_border,
+                VSplit(
+                    [
+                        self.control,
+                        fill(char=border_char("TOP_MID"), height=1),
+                        fill(width=1, height=1, char=border_char("TOP_RIGHT")),
+                    ],
+                    height=1,
+                ),
+                VSplit(
+                    [
+                        fill(width=1, char=border_char("MID_LEFT")),
+                        HSplit(
+                            [input_row, output_row],
+                            padding=lambda: 1 if show_input() and show_output() else 0,
+                        ),
+                        fill(width=1, char=border_char("MID_RIGHT")),
+                    ]
+                ),
+                VSplit(
+                    [
+                        fill(width=1, height=1, char=border_char("BOTTOM_LEFT")),
+                        fill(char=border_char("BOTTOM_MID")),
+                        fill(width=1, height=1, char=border_char("BOTTOM_RIGHT")),
+                    ],
+                    height=1,
+                ),
             ],
             style=_style,
         )
@@ -604,7 +581,6 @@ class Cell:
         """Determine the current cell type."""
         return self.json.get("cell_type", "code")
 
-    @property
     def suffix(self) -> str:
         """Return the file suffix matching the current cell type."""
         cell_type = self.cell_type
@@ -720,6 +696,8 @@ class Cell:
         self.input_box.control._fragment_cache.clear()
         # Trigger callbacks
         self.on_change()
+        # Flag notebook as modified
+        self.kernel_tab.dirty = True
 
     @property
     def path(self) -> Path:
@@ -787,7 +765,7 @@ class Cell:
         """Set the execution count of the cell."""
         self.json["execution_count"] = n
 
-    def add_output(self, output_json: dict[str, Any]) -> None:
+    def add_output(self, output_json: dict[str, Any], own: bool) -> None:
         """Add a new output to the cell."""
         # Clear the output if we were previously asked to
         if self.clear_outputs_on_output:
@@ -947,49 +925,3 @@ class Cell:
     def close(self) -> None:
         """Signal that the cell is no longer present in the notebook."""
         self.on_close()
-
-    # ################################### Settings ####################################
-
-    add_setting(
-        name="show_cell_borders",
-        title="cell borders",
-        flags=["--show-cell-borders"],
-        type_=bool,
-        help_="Show or hide cell borders.",
-        default=False,
-        schema={
-            "type": "boolean",
-        },
-        description="""
-            Whether cell borders should be drawn for unselected cells.
-        """,
-    )
-
-    add_setting(
-        name="external_editor",
-        flags=["--external-editor"],
-        type_=str,
-        help_="Set the external editor to use.",
-        default=None,
-        description="""
-            A command to run when editing cells externally. The following strings in
-            the command will be replaced with values which locate the cell being
-            edited:
-
-            * ``{top}``
-            * ``{left}``
-            * ``{bottom}``
-            * ``{right}``
-            * ``{width}``
-            * ``{height}``
-
-            This is useful if you run euporie inside a tmux session, and wish to launch
-            your editor in a pop-up pane. This can be achieved by setting this parameter
-            to something like the following:
-
-            .. code-block::
-
-               "tmux display-popup -x {left} -y {bottom} -w {width} -h {height} -B -E micro"
-
-        """,
-    )