xmyshell 0.2.4__tar.gz → 0.2.6__tar.gz

{xmyshell-0.2.4/xmyshell.egg-info → xmyshell-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.4
+Version: 0.2.6
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -164,6 +164,8 @@ The path of config file.
 - `↑↓` -> Navigate through command history.
 - `→` -> Apply selected history entry to the prompt.
 - `Ctrl+R` -> Reverse incremental searching (history).
+- `Ctrl+Z` -> Undo.
+- `Ctrl+Y` -> Redo.
 - `Ctrl+D` -> Exit XmyShell.
 - Auto bracket/parenthesis/quote pairing
 

{xmyshell-0.2.4 → xmyshell-0.2.6}/README.md

@@ -154,6 +154,8 @@ The path of config file.
 - `↑↓` -> Navigate through command history.
 - `→` -> Apply selected history entry to the prompt.
 - `Ctrl+R` -> Reverse incremental searching (history).
+- `Ctrl+Z` -> Undo.
+- `Ctrl+Y` -> Redo.
 - `Ctrl+D` -> Exit XmyShell.
 - Auto bracket/parenthesis/quote pairing
 

{xmyshell-0.2.4 → xmyshell-0.2.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.2.4"
+version = "0.2.6"
 description = "XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime."
 readme = "README.md"
 requires-python = ">=3.12"

{xmyshell-0.2.4 → xmyshell-0.2.6}/xmyshell/completer.py

@@ -1,3 +1,4 @@
+from collections.abc import Generator, Iterable
 import os
 import sys
 import re
@@ -6,7 +7,7 @@ import json
 import keyword
 import pkgutil
 from string import whitespace
-from prompt_toolkit.completion import Completer, Completion
+from prompt_toolkit.completion import CompleteEvent, Completer, Completion
 from prompt_toolkit.document import Document
 from .environment import namespace, aliases
 from .utils import truncate
@@ -335,7 +336,7 @@ class ShellCompleter(Completer):
                     display_meta="alias",
                 )
 
-    def get_completions(self, document: Document, complete_event):
+    def _get_completions(self, document: Document, complete_event) -> Generator[Completion, None, None]:
         text = document.text_before_cursor
         if "=>" in text: return
         segments = re.split(r'\|>|\|', text)
@@ -417,5 +418,15 @@ class ShellCompleter(Completer):
         yield from self._subcommand_completion(lstripped)
         yield from self._path_completions(lstripped)
 
+    def get_completions(self, document: Document, complete_event: CompleteEvent) -> list[Completion]:
+        completions: list[Completion] = list(self._get_completions(document, complete_event))
+        if len(completions) == 1:
+            # Trailing space bypasses prompt_toolkit's `completion_does_nothing`
+            # filter (which hides completions identical to the replaced text) and
+            # doubles as the shell argument separator. Invisible characters would
+            # also bypass the filter, but would corrupt command parsing.
+            completions[0].text = completions[0].text + " "
+        return completions
+
 def completer_init() -> None:
     namespace["shell_completer"] = ShellCompleter()

{xmyshell-0.2.4 → xmyshell-0.2.6}/xmyshell/kernel.py

@@ -58,7 +58,7 @@ def pyeval(cmd_line: str) -> str:
                             val, (str, bytes, bytearray, memoryview)
                         ) and isinstance(val, (Sequence, Generator)):
                             val = shlex.join(str(ele) for ele in val)
-                        result.append(str(val) if val is not None else '')
+                        result.append(str(val).replace("\n", " ") if val is not None else '')
                     except Exception as e:
                         pywarning(f"An error occured when unfolding {expr!r}, using original string instead"
                                   f"\n{type(e).__name__}: {e}")

{xmyshell-0.2.4 → xmyshell-0.2.6}/xmyshell/keybindings.py

@@ -1,22 +1,60 @@
+import time
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.key_binding import KeyBindings, KeyPressEvent
 from prompt_toolkit.selection import SelectionState
 from prompt_toolkit.keys import Keys
 from prompt_toolkit.key_binding.bindings.auto_suggest import load_auto_suggest_bindings
+from dataclasses import dataclass
 
+@dataclass
+class BufferInfo:
+    text: str
+    cursor_pos: int
+
+    @staticmethod
+    def from_buffer(buffer: Buffer) -> "BufferInfo":
+        return BufferInfo(buffer.text, buffer.cursor_position)
+
+
+MAX_HISTORY_ENTRY = 100
+UNDO_MERGE_TIMEOUT = 0.5
 bindings = KeyBindings()
-_auto_editing = False
+_auto_editing: bool = False
+_previous_text: str = ""
+_last_info: BufferInfo = BufferInfo("", 0)
+_bracket_stack: list[str] = []
+_undo_list: list[BufferInfo] = []
+_redo_list: list[BufferInfo] = []
+_last_edit_time: float = 0
+_last_edit_kind: str | None = None   # "insert" / "delete" / "replace"
+
+
+def on_text_changed(buffer: Buffer) -> None:
+    global _last_info
+    if not _auto_editing:
+        _redo_list.clear()
+        if not _should_merge(buffer):
+            _undo_list.append(_last_info)
+        _last_info = BufferInfo.from_buffer(buffer)
+
+
+def clean_buffer() -> None:
+    global _auto_editing, _previous_text, _last_info, _last_edit_time, _last_edit_kind
+    _auto_editing = False
+    _previous_text = ""
+    _last_info = BufferInfo("", 0)
+    _bracket_stack.clear()
+    _undo_list.clear()
+    _redo_list.clear()
+    _last_edit_time = 0
+    _last_edit_kind = None
 
-def buffer_get_stack(buffer) -> list[str]:
-    if not hasattr(buffer, '_bracket_stack'):
-        buffer._bracket_stack = []
-    return buffer._bracket_stack
 
-def is_cursor_before_right(buffer, char) -> bool:
+def is_cursor_before_right(buffer: Buffer, char) -> bool:
     pos = buffer.cursor_position
     return pos < len(buffer.text) and buffer.text[pos] == char
 
-def should_completion(buffer) -> bool:
+def should_completion(buffer: Buffer) -> bool:
     pos = buffer.cursor_position
     return pos >= len(buffer.text) or buffer.text[pos].isspace() or buffer.text[pos] in ")]}>\"\'"
 
@@ -40,8 +78,9 @@ def _(event: KeyPressEvent) -> None:
         _auto_editing = True
         buffer.insert_text('()')
         buffer.cursor_left()
-        buffer_get_stack(buffer).append('(')
+        _bracket_stack.append('(')
         _auto_editing = False
+        on_text_changed(buffer)
     else:
         buffer.insert_text('(')
 
@@ -65,8 +104,9 @@ def _(event: KeyPressEvent) -> None:
         _auto_editing = True
         buffer.insert_text('[]')
         buffer.cursor_left()
-        buffer_get_stack(buffer).append('[')
+        _bracket_stack.append('[')
         _auto_editing = False
+        on_text_changed(buffer)
     else:
         buffer.insert_text('[')
 
@@ -90,8 +130,9 @@ def _(event: KeyPressEvent) -> None:
         _auto_editing = True
         buffer.insert_text('{}')
         buffer.cursor_left()
-        buffer_get_stack(buffer).append('{')
+        _bracket_stack.append('{')
         _auto_editing = False
+        on_text_changed(buffer)
     else:
         buffer.insert_text('{')
 
@@ -99,7 +140,7 @@ def _(event: KeyPressEvent) -> None:
 def _(event: KeyPressEvent) -> None:
     global _auto_editing
     buffer = event.current_buffer
-    stack = buffer_get_stack(buffer)
+    stack = _bracket_stack
     if stack and stack[-1] == '(' and is_cursor_before_right(buffer, ')'):
         _auto_editing = True
         buffer.cursor_right()
@@ -112,7 +153,7 @@ def _(event: KeyPressEvent) -> None:
 def _(event: KeyPressEvent) -> None:
     global _auto_editing
     buffer = event.current_buffer
-    stack = buffer_get_stack(buffer)
+    stack = _bracket_stack
     if stack and stack[-1] == '[' and is_cursor_before_right(buffer, ']'):
         _auto_editing = True
         buffer.cursor_right()
@@ -125,7 +166,7 @@ def _(event: KeyPressEvent) -> None:
 def _(event: KeyPressEvent) -> None:
     global _auto_editing
     buffer = event.current_buffer
-    stack = buffer_get_stack(buffer)
+    stack = _bracket_stack
     if stack and stack[-1] == '{' and is_cursor_before_right(buffer, '}'):
         _auto_editing = True
         buffer.cursor_right()
@@ -150,7 +191,7 @@ def _(event: KeyPressEvent) -> None:
         )
         buffer.selection_state.shift_mode = True
         return
-    stack = buffer_get_stack(buffer)
+    stack = _bracket_stack
     if stack and stack[-1] == '"' and is_cursor_before_right(buffer, '"'):
         _auto_editing = True
         buffer.cursor_right()
@@ -171,6 +212,7 @@ def _(event: KeyPressEvent) -> None:
         buffer.cursor_left()
         stack.append('"')
         _auto_editing = False
+        on_text_changed(buffer)
     else:
         buffer.insert_text('"')
 
@@ -190,7 +232,7 @@ def _(event: KeyPressEvent) -> None:
         )
         buffer.selection_state.shift_mode = True
         return
-    stack = buffer_get_stack(buffer)
+    stack = _bracket_stack
     if stack and stack[-1] == "'" and is_cursor_before_right(buffer, "'"):
         _auto_editing = True
         buffer.cursor_right()
@@ -203,6 +245,7 @@ def _(event: KeyPressEvent) -> None:
         buffer.cursor_left()
         stack.append("'")
         _auto_editing = False
+        on_text_changed(buffer)
     else:
         buffer.insert_text("'")
 
@@ -216,12 +259,11 @@ def _(event: KeyPressEvent) -> None:
     if buffer.selection_state:
         start = min(buffer.cursor_position, buffer.selection_state.original_cursor_position)
         end = max(buffer.cursor_position, buffer.selection_state.original_cursor_position)
-        _auto_editing = True
         buffer.text = buffer.text[:start] + buffer.text[end:]
         buffer.cursor_position = start
         buffer.selection_state = None
-        buffer_get_stack(buffer).clear()
-        _auto_editing = False
+        _bracket_stack.clear()
+        buffer.start_completion()
         return
 
     if pos > 0 and pos < len(text):
@@ -232,7 +274,7 @@ def _(event: KeyPressEvent) -> None:
            (left == '{' and right == '}') or \
            (left == '"' and right == '"') or \
            (left == "'" and right == "'"):
-            stack = buffer_get_stack(buffer)
+            stack = _bracket_stack
             _auto_editing = True
             if stack and stack[-1] == left:
                 stack.pop()
@@ -242,20 +284,76 @@ def _(event: KeyPressEvent) -> None:
             return
 
     buffer.delete_before_cursor()
+    buffer.start_completion()
 
 def on_cursor_position_changed(buffer: Buffer) -> None:
-    global _auto_editing
+    global _auto_editing, _last_info, _previous_text
+
     if _auto_editing:
-        buffer._previous_text = buffer.text  # type: ignore
+        _previous_text = buffer.text
         return
 
-    if not hasattr(buffer, '_previous_text'):
-        buffer._previous_text = buffer.text  # type: ignore
-        return
+    _last_info = BufferInfo.from_buffer(buffer)
 
-    if buffer.text != buffer._previous_text: # type: ignore
-        buffer._previous_text = buffer.text  # type: ignore
+    if buffer.text != _previous_text:
+        _previous_text = buffer.text
         return
 
     # Any cursor movement without editing will clear the stack
-    buffer_get_stack(buffer).clear()
+    _bracket_stack.clear()
+
+
+def _reset_undo_merge() -> None:
+    global _last_edit_time, _last_edit_kind
+    _last_edit_time = 0.0
+    _last_edit_kind = None
+
+
+def _should_merge(buffer: Buffer) -> bool:
+    global _last_edit_time, _last_edit_kind
+
+    old_text = _last_info.text
+    new_text = buffer.text
+    if len(new_text) > len(old_text):
+        kind = "insert"
+    elif len(new_text) < len(old_text):
+        kind = "delete"
+    else:
+        kind = "replace"
+
+    now = time.monotonic()
+    same_kind = (kind == _last_edit_kind)
+    in_time = (now - _last_edit_time) <= UNDO_MERGE_TIMEOUT
+
+    _last_edit_time = now
+    _last_edit_kind = kind
+
+    return same_kind and in_time
+
+@bindings.add(Keys.ControlZ)
+def _(event: KeyPressEvent) -> None:
+    global _auto_editing, _last_info
+    _auto_editing = True
+    buffer = event.current_buffer
+    if _undo_list:
+        _redo_list.append(BufferInfo.from_buffer(buffer))
+        info = _undo_list.pop()
+        buffer.text = info.text
+        buffer._set_cursor_position(info.cursor_pos)
+    _auto_editing = False
+    _last_info = BufferInfo.from_buffer(buffer)
+    _reset_undo_merge()
+
+@bindings.add(Keys.ControlY)
+def _(event: KeyPressEvent) -> None:
+    global _auto_editing, _last_info
+    _auto_editing = True
+    buffer = event.current_buffer
+    if _redo_list:
+        _undo_list.append(BufferInfo.from_buffer(buffer))
+        info = _redo_list.pop()
+        buffer.text = info.text
+        buffer._set_cursor_position(info.cursor_pos)
+    _auto_editing = False
+    _last_info = BufferInfo.from_buffer(buffer)
+    _reset_undo_merge()

{xmyshell-0.2.4 → xmyshell-0.2.6}/xmyshell/main.py

@@ -8,7 +8,7 @@ from prompt_toolkit.history import FileHistory
 from prompt_toolkit.auto_suggest import AutoSuggestFromHistory
 from .meta import WELCOME_MESSAGE
 from .environment import namespace
-from .keybindings import bindings, on_cursor_position_changed
+from .keybindings import bindings, on_cursor_position_changed, on_text_changed, clean_buffer
 from .init import xmyshell_init
 from .kernel import pyeval, xmyshell
 from .lexer import XmyShellLexer
@@ -29,6 +29,7 @@ def xmyshell_main() -> None:
         lexer=XmyShellLexer(),
     )
     session.default_buffer.on_cursor_position_changed += on_cursor_position_changed
+    session.default_buffer.on_text_changed += on_text_changed
 
     try:
         while True:
@@ -43,6 +44,7 @@ def xmyshell_main() -> None:
                 start_time = time_ns()
                 namespace["exit_code"] = xmyshell(cmd_line)
                 namespace["exec_duration"] = time_ns() - start_time
+                clean_buffer()
             except KeyboardInterrupt:
                 print("Ctrl-C")
             except EOFError:

{xmyshell-0.2.4 → xmyshell-0.2.6}/xmyshell/meta.py

@@ -64,4 +64,6 @@ Keyboard Shortcuts:
   ↑↓      -  Navigate through command history.
   →       -  Apply selected history entry to the prompt.
   Ctrl+R  -  Reverse incremental searching (history).
+  Ctrl+Z  -  Undo.
+  Ctrl+Y  -  Redo.
   Ctrl+D  -  Exit XmyShell."""

{xmyshell-0.2.4 → xmyshell-0.2.6/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.4
+Version: 0.2.6
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
@@ -164,6 +164,8 @@ The path of config file.
 - `↑↓` -> Navigate through command history.
 - `→` -> Apply selected history entry to the prompt.
 - `Ctrl+R` -> Reverse incremental searching (history).
+- `Ctrl+Z` -> Undo.
+- `Ctrl+Y` -> Redo.
 - `Ctrl+D` -> Exit XmyShell.
 - Auto bracket/parenthesis/quote pairing