xmyshell 0.2.1__tar.gz → 0.2.3__tar.gz

{xmyshell-0.2.1/xmyshell.egg-info → xmyshell-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.1
+Version: 0.2.3
 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

{xmyshell-0.2.1 → xmyshell-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.2.1"
+version = "0.2.3"
 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.1 → xmyshell-0.2.3}/xmyshell/completer.py

@@ -16,7 +16,8 @@ MAX_DISPLAY_LEN = 24
 MAX_META_LEN = 12
 
 BUILTINS = ("cd", "cp", "cat", "echo", "exit", "import", "ls", "print", "pyexec", "pwd", "source",
-            "clear", "grep", "find", "from", "mkdir", "rm", "reload", "mv", "help", "alias", "update")
+            "clear", "grep", "find", "from", "mkdir", "rm", "reload", "mv", "help",
+            "update", "alias", "unalias")
 
 COMMON = (
     "python", "python3", "pip", "pip3", "git", "conda", "uv",
@@ -312,6 +313,28 @@ class ShellCompleter(Completer):
                     display_meta="flag",
                 )
 
+    def _command_completion(self, text):
+        for cmd in self._get_commands():
+            if cmd in aliases: continue
+            if cmd.startswith(text):
+                meta = "command" if cmd in BUILTINS else "program"
+                yield Completion(
+                    cmd,
+                    start_position=-len(text),
+                    display=truncate(cmd, MAX_DISPLAY_LEN),
+                    display_meta=meta,
+                )
+
+    def _alias_completion(self, text):
+        for alias in aliases.keys():
+            if alias.startswith(text):
+                yield Completion(
+                    alias,
+                    start_position=-len(text),
+                    display=truncate(alias, MAX_DISPLAY_LEN),
+                    display_meta="alias",
+                )
+
     def get_completions(self, document: Document, complete_event):
         text = document.text_before_cursor
         if "=>" in text: return
@@ -328,24 +351,8 @@ class ShellCompleter(Completer):
         if " " not in lstripped:
             if len(lstripped) < 1:
                 return
-            for alias in aliases.keys():
-                if alias.startswith(lstripped):
-                    yield Completion(
-                        alias,
-                        start_position=-len(lstripped),
-                        display=truncate(alias, MAX_DISPLAY_LEN),
-                        display_meta="alias",
-                    )
-            for cmd in self._get_commands():
-                if cmd in aliases: return
-                if cmd.startswith(lstripped):
-                    meta = "command" if cmd in BUILTINS else "program"
-                    yield Completion(
-                        cmd,
-                        start_position=-len(lstripped),
-                        display=truncate(cmd, MAX_DISPLAY_LEN),
-                        display_meta=meta,
-                    )
+            yield from self._alias_completion(lstripped)
+            yield from self._command_completion(lstripped)
 
         # special built-ins
         parts = lstripped.split()
@@ -355,6 +362,9 @@ class ShellCompleter(Completer):
                 param_text = lstripped[len(cmd):].lstrip()
                 yield from self._python_completion(param_text)
                 return
+            if cmd == "unalias":
+                param_text = lstripped[len(cmd):].lstrip()
+                yield from self._alias_completion(param_text)
             if cmd == "from":
                 if not lstripped.endswith(parts[-1]):
                     parts.append("")

{xmyshell-0.2.1 → xmyshell-0.2.3}/xmyshell/init.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from .environment import load_init_namespace, init_environ
+from .environment import load_init_namespace, init_environ, aliases
 from .themes import load_theme, THEME_DEFAULT
 from .completer import completer_init
 from .utils import pywarning
@@ -34,4 +34,5 @@ def xmyshell_init() -> None:
 def xmyshell_reload() -> None:
     os.environ.clear()
     os.environ.update(init_environ)
+    aliases.clear()
     xmyshell_load()

{xmyshell-0.2.1 → xmyshell-0.2.3/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.1
+Version: 0.2.3
 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