xmyshell 0.2.16__tar.gz → 0.2.18__tar.gz

{xmyshell-0.2.16/xmyshell.egg-info → xmyshell-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.16
+Version: 0.2.18
 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
@@ -163,6 +163,15 @@ The exit code of the last command.
 - `exec_duration`
 The duration which last command took.
 
+- `last_error`
+The error raised from last Python operation (if exists).
+
+- `last_traceback`
+The traceback of last Python operation (if exists).
+
+- `ans`
+The result from last print command.
+
 - `SHOW_WELCOME`
 Toggle whether to show welcome message when staring.
 

{xmyshell-0.2.16 → xmyshell-0.2.18}/README.md

@@ -153,6 +153,15 @@ The exit code of the last command.
 - `exec_duration`
 The duration which last command took.
 
+- `last_error`
+The error raised from last Python operation (if exists).
+
+- `last_traceback`
+The traceback of last Python operation (if exists).
+
+- `ans`
+The result from last print command.
+
 - `SHOW_WELCOME`
 Toggle whether to show welcome message when staring.
 

{xmyshell-0.2.16 → xmyshell-0.2.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.2.16"
+version = "0.2.18"
 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.16 → xmyshell-0.2.18}/xmyshell/environment.py

@@ -43,6 +43,7 @@ _init_namespace: dict[str, Any] = {
     "exec_duration": 0,
     "last_error": None,
     "last_traceback": None,
+    "ans": None,
     "shell_prompt": "",
     "shell_rprompt": "",
     "prompt_placeholder": "",

{xmyshell-0.2.16 → xmyshell-0.2.18}/xmyshell/kernel.py

@@ -189,10 +189,10 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
                 result = eval(expr, dict(os.environ), namespace)
                 print(result)
                 namespace["last_error"] = None
+                namespace["ans"] = result
                 return 0
             except Exception as e:
                 import traceback
-
                 namespace["last_error"] = e
                 namespace["last_traceback"] = traceback.format_exc()
                 pyerror(f"{type(e).__name__}: {e}")

{xmyshell-0.2.16 → xmyshell-0.2.18}/xmyshell/main.py

@@ -19,7 +19,6 @@ from .keybindings import (
 )
 from .init import xmyshell_init
 from .kernel import pyeval, xmyshell
-from .lexer import XmyShellLexer
 from .injection import inject
 
 def xmyshell_main() -> None:
@@ -35,7 +34,6 @@ def xmyshell_main() -> None:
         complete_in_thread=True,
         complete_while_typing=True,
         key_bindings=bindings,
-        lexer=XmyShellLexer(),
     )
     session.default_buffer.on_cursor_position_changed += on_cursor_position_changed
     session.default_buffer.on_text_changed += on_text_changed

{xmyshell-0.2.16 → xmyshell-0.2.18}/xmyshell/meta.py

@@ -57,6 +57,9 @@ Helper Functions:
 Built-in variables:
   exit_code       -  The exit code of the last command.
   exec_duration   -  The duration which last command took.
+  last_error      -  The error raised from last Python operation (if exists).
+  last_traceback  -  The traceback of last Python operation (if exists).
+  ans             -  The result from last print command.
   HOME_DIR        -  The home directory, similar to "~".
   PROFILE         -  The path of config file.
   SHOW_WELCOME    -  Toggle whether to show welcome message.

{xmyshell-0.2.16 → xmyshell-0.2.18/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.16
+Version: 0.2.18
 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
@@ -163,6 +163,15 @@ The exit code of the last command.
 - `exec_duration`
 The duration which last command took.
 
+- `last_error`
+The error raised from last Python operation (if exists).
+
+- `last_traceback`
+The traceback of last Python operation (if exists).
+
+- `ans`
+The result from last print command.
+
 - `SHOW_WELCOME`
 Toggle whether to show welcome message when staring.
 

{xmyshell-0.2.16 → xmyshell-0.2.18}/xmyshell.egg-info/SOURCES.txt

@@ -9,7 +9,6 @@ xmyshell/init.py
 xmyshell/injection.py
 xmyshell/kernel.py
 xmyshell/keybindings.py
-xmyshell/lexer.py
 xmyshell/main.py
 xmyshell/meta.py
 xmyshell/themes.py

xmyshell-0.2.16/xmyshell/lexer.py

@@ -1,259 +0,0 @@
-import re
-import keyword
-import inspect
-from collections.abc import Callable
-from prompt_toolkit.lexers import Lexer
-from prompt_toolkit.formatted_text import FormattedText
-from .environment import namespace
-
-def _is_number_literal(s: str) -> bool:
-    try:
-        import ast  # lazy
-        result = ast.literal_eval(s)
-        return isinstance(result, (int, float, complex))
-    except (ValueError, SyntaxError):
-        return False
-
-def _shell_split_keep_sep(text: str) -> list[str]:
-    parts: list[str] = []
-    quote: str | None = None
-    i = 0
-    n = len(text)
-    seg_start = 0
-
-    def flush(end: int) -> None:
-        nonlocal seg_start
-        if end > seg_start:
-            parts.append(text[seg_start:end])
-        seg_start = end
-
-    while i < n:
-        ch = text[i]
-        if quote is None:
-            if ch in " \t":
-                flush(i)
-                j = i
-                while j < n and text[j] in " \t":
-                    j += 1
-                parts.append(text[i:j])
-                seg_start = j
-                i = j
-                continue
-            elif ch == "\\" and i + 1 < n:
-                i += 2
-                continue
-            elif ch in ("'", '"'):
-                quote = ch
-        else:
-            if ch == quote:
-                quote = None
-            elif ch == "\\" and quote == '"' and i + 1 < n:
-                i += 2
-                continue
-        i += 1
-    flush(n)
-    return parts
-
-def _split_with_braces_and_pipes(line: str) -> list[str]:
-    parts = []
-    outer_buf = []
-    inner_buf = []
-    depth = 0
-    i = 0
-    n = len(line)
-
-    while i < n:
-        ch = line[i]
-
-        if i + 1 < n and ((ch == '{' and line[i+1] == '{') or (ch == '}' and line[i+1] == '}')):
-            seq = line[i:i+2]
-            if depth == 0:
-                outer_buf.extend(seq)
-            else:
-                inner_buf.extend(seq)
-            i += 2
-            continue
-
-        if ch == '{':
-            if depth == 0:
-                if outer_buf:
-                    parts.append(''.join(outer_buf))
-                    outer_buf = []
-                parts.append('{')
-                depth = 1
-                inner_buf = []
-            else:
-                inner_buf.append(ch)
-                depth += 1
-            i += 1
-
-        elif ch == '}':
-            if depth == 0:
-                outer_buf.append(ch)
-            else:
-                depth -= 1
-                if depth == 0:
-                    parts.append(''.join(inner_buf))
-                    parts.append('}')
-                    inner_buf = []
-                else:
-                    inner_buf.append(ch)
-            i += 1
-
-        elif ch == '|':
-            if depth == 0:
-                if outer_buf:
-                    parts.append(''.join(outer_buf))
-                    outer_buf = []
-                parts.append('|')
-            else:
-                inner_buf.append(ch)
-            i += 1
-
-        else:
-            if depth == 0:
-                outer_buf.append(ch)
-            else:
-                inner_buf.append(ch)
-            i += 1
-
-    if outer_buf:
-        parts.append(''.join(outer_buf))
-
-    if depth > 0 and inner_buf:
-        parts.append(''.join(inner_buf))
-
-    return parts
-
-def _lex_cmd(cmd: str, first_word: bool = True) -> list[tuple[str, str]]:
-    parts: list[str] = _shell_split_keep_sep(cmd)
-    result: list[tuple[str, str]] = []
-    for part in parts:
-        if part == "":
-            continue
-        if part.isspace():
-            result.append(("", part))
-            continue
-        if first_word:
-            result.append(("ansigreen bold", part))
-            first_word = False
-            continue
-        if part.startswith("-"):
-            result.append(("ansibrightblue", part))
-            continue
-        # if part in keyword.kwlist:
-        #     result.append(("ansibrightmagenta bold", part))
-        #     continue
-        if _is_number_literal(part):
-            result.append(("ansibrightblue", part))
-            continue
-        result.append(("", part))
-    return result
-
-
-STYLE_KEYWORD = "ansibrightmagenta bold"
-STYLE_NUMBER = "ansiblue"
-STYLE_VARIABLE = "ansibrightcyan"
-STYLE_FUNCTION = "ansibrightblue"
-STYLE_CLASS = "ansibrightred"
-
-TOKEN_PATTERN = re.compile(r'[a-zA-Z_]\w*|\d+\.?\d*')
-
-def _lex_python(text: str) -> list[tuple[str, str]]:
-    result = []
-    pos = 0
-
-    for match in TOKEN_PATTERN.finditer(text):
-        start, end = match.span()
-        if start > pos:
-            result.append(("", text[pos:start]))
-
-        token = match.group()
-
-        if token.isdigit() or (token.replace('.', '').isdigit() and token.count('.') <= 1):
-            result.append((STYLE_NUMBER, token))
-        elif keyword.iskeyword(token):
-            result.append((STYLE_KEYWORD, token))
-        else:
-            if token in namespace:
-                obj = namespace[token]
-                if inspect.isclass(obj):
-                    style = STYLE_CLASS
-                elif callable(obj):
-                    style = STYLE_FUNCTION
-                else:
-                    style = STYLE_VARIABLE
-            else:
-                style = STYLE_VARIABLE
-            result.append((style, token))
-
-        pos = end
-
-    if pos < len(text):
-        result.append(("", text[pos:]))
-
-    return result
-
-def _lex_sh(line: str) -> list[tuple[str, str]]:
-    result: list[tuple[str, str]] = []
-    parts: list[str] = _split_with_braces_and_pipes(line)
-    in_expr: bool = False
-    first_word: bool = True
-    for part in parts:
-        if part.startswith("|"):
-            first_word = True
-            result.append(("ansicyan", part))
-        elif part == "{":
-            result.append(("ansimagenta", "{"))
-            in_expr = True
-            first_word = False
-        elif part == "}":
-            result.append(("ansimagenta", "}"))
-            in_expr = False
-        elif in_expr:
-            result.extend(_lex_python(part))
-        else:
-            result.extend(_lex_cmd(part, first_word))
-    return result
-
-def _lex_line(line: str) -> list[tuple[str, str]]:
-
-    result: list[tuple[str, str]] = []
-
-    target_var = None
-    if "=>" in line:
-        line, target_var = line.split("=>", 1)
-
-    leading_spaces = line[:len(line) - len(line.lstrip())]
-    _splited = line.lstrip().split(None, 1)
-    _cmd = _splited[0] if _splited else ""
-    if _cmd in ["pyexec", "print", "pwd", "help"]:
-        sh_cmd = None
-        if "|>" in line:
-            line, sh_cmd = line.split("|>", 1)
-        result.append(("", leading_spaces))
-        result.append(("ansigreen bold", _cmd))
-        result.extend(_lex_python(line[len(leading_spaces) + len(_cmd):]))
-        if sh_cmd is not None:
-            result.append(("ansiblue", "|>"))
-            result.extend(_lex_sh(sh_cmd))
-    else:
-        result.extend(_lex_sh(line))
-
-    if target_var is not None:
-        result.append(("ansiblue", "=>"))
-        result.append(("ansibrightcyan", target_var))
-
-    return result
-
-
-class XmyShellLexer(Lexer):
-    def lex_document(self, document) -> Callable[[int], FormattedText]:
-        def _lex(line_number: int) -> FormattedText:
-            lines = document.text.splitlines()
-            if line_number >= len(lines):
-                return FormattedText([("", "")])
-            line = lines[line_number]
-            return FormattedText(_lex_line(line))
-
-        return _lex