xmyshell 0.2.6__tar.gz → 0.2.8__tar.gz

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

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

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

@@ -134,7 +134,7 @@ class ShellCompleter(Completer):
                     if len(matches) >= max_results:
                         break
 
-            for item in matches:
+            for item in sorted(matches):
                 full = os.path.join(dirname, item)
                 is_dir = os.path.isdir(full)
                 name = item + ("/" if is_dir else "")
@@ -172,6 +172,44 @@ class ShellCompleter(Completer):
                 )
 
     def _python_completion(self, text: str):
+
+        def _in_string(text: str) -> str | None:
+            i, n = 0, len(text)
+            quote = ''
+            content_start = 0
+
+            while i < n:
+                c = text[i]
+                if not quote:
+                    if c in ('"', "'"):
+                        if text[i:i+3] in ('"""', "'''"):
+                            quote = text[i:i+3]
+                            i += 3
+                        else:
+                            quote = c
+                            i += 1
+                        content_start = i
+                        continue
+                    i += 1
+                else:
+                    if c == '\\':
+                        i += 2
+                        continue
+                    if text.startswith(quote, i):
+                        i += len(quote)
+                        quote = ''
+                        continue
+                    i += 1
+
+            if not quote:
+                return None
+            return text[content_start:]
+
+        string = _in_string(text)
+        if string:
+            yield from self._path_completions(string)
+            return
+
         if text and text[-1].isspace():
             return
         last_token = text.split()[-1] if text.split() else ''
@@ -425,7 +463,13 @@ class ShellCompleter(Completer):
             # 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 + " "
+            completion = completions[0]
+            text_before_cursor = document.text_before_cursor
+            replaced_text = text_before_cursor[
+                len(text_before_cursor) + completion.start_position :
+            ]
+            if replaced_text == completion.text:
+                completion.text = completion.text + " "
         return completions
 
 def completer_init() -> None:

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

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