xmyshell 0.2.13__tar.gz → 0.2.15__tar.gz

{xmyshell-0.2.13/xmyshell.egg-info → xmyshell-0.2.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.13
+Version: 0.2.15
 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.13 → xmyshell-0.2.15}/pyproject.toml

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

@@ -158,7 +158,10 @@ class ShellCompleter(Completer):
         in_string = in_string or last.startswith('"') or last.startswith("'")
         last = last.lstrip('"\'')
         if last == '~': return  # don't remove this
-        path = os.path.expanduser(last)
+        try:
+            path = os.path.expanduser(shlex.split(last)[0])
+        except (ValueError, IndexError):
+            path = os.path.expanduser(last)
         dirname = os.path.dirname(path) or "."
         prefix = os.path.basename(path).strip('"\'')
 
@@ -338,7 +341,10 @@ class ShellCompleter(Completer):
         yield from self._environment_completion(text)
 
     def _subcommand_completion(self, text: str):
-        parts = text.split()
+        try:
+            parts = shlex.split(text)
+        except ValueError:
+            parts = text.split()
         if not parts: return
         sub_cmd = COMMAND_TREE.get(parts[0])
         if not sub_cmd: return
@@ -362,7 +368,7 @@ class ShellCompleter(Completer):
 
         for name in sorted(sub_cmd.keys()):
             if name == "_global" or name == "_flags": continue
-            if name in parts: continue
+            if name in parts[:-1]: continue
             if name.startswith(last_word):
                 yield Completion(
                     name,
@@ -372,7 +378,7 @@ class ShellCompleter(Completer):
                 )
 
         for name in sorted(sub_cmd.get("_flags") or set()):
-            if name in parts: continue
+            if name in parts[:-1]: continue
             if name.startswith(last_word):
                 yield Completion(
                     name,
@@ -382,7 +388,7 @@ class ShellCompleter(Completer):
                 )
 
         for name in sorted(global_flags):
-            if name in parts: continue
+            if name in parts[:-1]: continue
             if name.startswith(last_word):
                 yield Completion(
                     name,