avrae-ls 0.7.0__py3-none-any.whl → 0.7.1__py3-none-any.whl

avrae_ls/__main__.py

@@ -202,11 +202,17 @@ def _print_test_results(results: Iterable[AliasTestResult], workspace_root: Path
             passed += 1
             continue
         if res.error:
-            if res.error_line is not None:
-                alias_name = res.case.alias_path.name
-                print(f"  Error (line {res.error_line} {alias_name}): {res.error}")
+            if res.error_line is not None and res.error_col is not None:
+                label = f"  Execution Error (line {res.error_line} col {res.error_col})"
+            elif res.error_line is not None:
+                label = f"  Execution Error (line {res.error_line})"
             else:
-                print(f"  Error: {res.error}")
+                label = "  Execution Error"
+            print(_colorize_error_line(label))
+            print(f"    {res.error}")
+            if res.stdout:
+                print(f"  Stdout: {res.stdout.strip()}")
+            continue
         if res.details:
             print(f"  {res.details}")
         expected_val, actual_val = _summarize_mismatch(res.case.expected, res.actual)
@@ -262,6 +268,12 @@ def _colorize_diff_line(line: str) -> str:
     return line
 
 
+def _colorize_error_line(line: str) -> str:
+    if not sys.stdout.isatty():
+        return line
+    return f"\x1b[31m{line}\x1b[0m"
+
+
 def _print_labeled_value(label: str, value: str) -> None:
     lines = value.splitlines() or [""]
     if len(lines) == 1:

avrae_ls/alias_preview.py

@@ -18,6 +18,7 @@ class RenderedAlias:
     error: Optional[BaseException]
     last_value: Any | None = None
     error_line: int | None = None
+    error_col: int | None = None
 
 
 @dataclass
@@ -81,18 +82,43 @@ def _line_index_for_offset(text: str, offset: int) -> int:
     return text.count("\n", 0, offset)
 
 
-def _error_line_for_match(
+def _error_position_for_match(
     body: str, match: re.Match[str], error: BaseException, line_offset: int
-) -> int | None:
+) -> tuple[int | None, int | None]:
     base_line = _line_index_for_offset(body, match.start(1))
-    lineno = getattr(error, "lineno", None)
-    if isinstance(lineno, int) and lineno > 0 and getattr(error, "text", None) is not None:
-        line_index = base_line + (lineno - 1)
+    base_line_start = body.rfind("\n", 0, match.start(1))
+    base_col = match.start(1) - (base_line_start + 1 if base_line_start != -1 else 0)
+    line_in_code: int | None = None
+    col_in_code: int | None = None
+    node = getattr(error, "node", None)
+    if node is not None:
+        node_line = getattr(node, "lineno", None)
+        if isinstance(node_line, int) and node_line > 0:
+            line_in_code = node_line
+        node_col = getattr(node, "col_offset", None)
+        if isinstance(node_col, int) and node_col >= 0:
+            col_in_code = node_col
+    if line_in_code is None:
+        lineno = getattr(error, "lineno", None)
+        if isinstance(lineno, int) and lineno > 0:
+            line_in_code = lineno
+        offset = getattr(error, "offset", None)
+        if isinstance(offset, int) and offset > 0:
+            col_in_code = offset - 1
+    if line_in_code is not None:
+        line_index = base_line + (line_in_code - 1)
     else:
         code = match.group(1)
         leading_newlines = len(code) - len(code.lstrip("\n"))
         line_index = base_line + leading_newlines
-    return line_index + line_offset + 1
+        col_in_code = 0 if col_in_code is None else col_in_code
+    if col_in_code is None:
+        col_in_code = 0
+    if line_in_code is None or line_in_code == 1:
+        col_index = base_col + col_in_code
+    else:
+        col_index = col_in_code
+    return line_index + line_offset + 1, col_index + 1
 
 
 async def render_alias_command(
@@ -110,6 +136,7 @@ async def render_alias_command(
     last_value = None
     error: BaseException | None = None
     error_line: int | None = None
+    error_col: int | None = None
 
     pos = 0
     matches: list[tuple[str, re.Match[str]]] = []
@@ -134,7 +161,7 @@ async def render_alias_command(
                 stdout_parts.append(result.stdout)
             if result.error:
                 error = result.error
-                error_line = _error_line_for_match(body, match, result.error, line_offset)
+                error_line, error_col = _error_position_for_match(body, match, result.error, line_offset)
                 break
             last_value = result.value
             if result.value is not None:
@@ -156,6 +183,7 @@ async def render_alias_command(
         error=error,
         last_value=last_value,
         error_line=error_line,
+        error_col=error_col,
     )
 
 

avrae_ls/alias_tests.py

@@ -43,6 +43,7 @@ class AliasTestResult:
     error: str | None = None
     details: str | None = None
     error_line: int | None = None
+    error_col: int | None = None
 
 
 def discover_test_files(
@@ -161,6 +162,7 @@ async def run_alias_test(case: AliasTestCase, builder: ContextBuilder, executor:
             stdout=rendered.stdout,
             error=str(rendered.error),
             error_line=rendered.error_line,
+            error_col=rendered.error_col,
         )
 
     preview = simulate_command(rendered.command)
@@ -173,7 +175,15 @@ async def run_alias_test(case: AliasTestCase, builder: ContextBuilder, executor:
             error=preview.validation_error,
         )
 
-    actual = preview.preview if preview.preview is not None else rendered.last_value
+    if preview.preview is not None:
+        actual = preview.preview
+    else:
+        if rendered.command.strip() == "" and rendered.last_value is None:
+            actual = None
+        elif rendered.last_value is not None and rendered.command.strip() == str(rendered.last_value):
+            actual = rendered.last_value
+        else:
+            actual = rendered.command
     embed_dict = preview.embed.to_dict() if preview.embed else None
 
     if embed_dict is not None and isinstance(case.expected, dict):

{avrae_ls-0.7.0.dist-info → avrae_ls-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrae-ls
-Version: 0.7.0
+Version: 0.7.1
 Summary: Language server for Avrae draconic aliases
 Author: 1drturtle
 License: MIT License

{avrae_ls-0.7.0.dist-info → avrae_ls-0.7.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 avrae_ls/__init__.py,sha256=BmjrnksGkbG7TPqwbyQvgYj9uei8pFSFpfkRpaGVdJU,63
-avrae_ls/__main__.py,sha256=Ulr1H2dP3-1aBhfbo9f1UesohLazza-W-5-VPXw8h-0,10327
-avrae_ls/alias_preview.py,sha256=LxoUuF_OFTNPnFDjbpIKtE_nQKwlDZDcqJrlRzhVGFE,13433
-avrae_ls/alias_tests.py,sha256=_Aw-IUN11FojviPRUMzWqQXU8xZu3FAa4MlwgnmARfA,11995
+avrae_ls/__main__.py,sha256=lx_Sncc4uiAPeoLtdspnZIdexgNEZNkD2hh-vJgWt30,10743
+avrae_ls/alias_preview.py,sha256=GAYc-lURawY3cO_ykfGAk_tdnjuy1CtIXnX6gYACftM,14601
+avrae_ls/alias_tests.py,sha256=lhb7pZFd_XYmu2BggVXn7sLNAoxLtT_V4mzy871xV4I,12361
 avrae_ls/api.py,sha256=7QVJAmqgKkiS22qj39_aSVsDuO_kUkyl2Ho1IsD58yE,65110
 avrae_ls/argparser.py,sha256=DRptXGyK4f0r7NsuV1Sg4apG-qihIClOX408jgk4HH4,13762
 avrae_ls/argument_parsing.py,sha256=ezKl65VwuNEDxt6KlYwVQcpy1110UDvf4BqZqgZTcqk,2122
@@ -32,8 +32,8 @@ draconic/string.py,sha256=kGrRc6wNHRq1y5xw8Os-fBhfINDtIY2nBWQWkyLSfQI,2858
 draconic/types.py,sha256=1Lsr6z8bW5agglGI4hLt_nPtYuZOIf_ueSpPDB4WDrs,13686
 draconic/utils.py,sha256=D4vJ-txqS2-rlqsEpXAC46_j1sZX4UjY-9zIgElo96k,3122
 draconic/versions.py,sha256=CUEsgUWjAmjez0432WwiBwZlIzWPIObwZUf8Yld18EE,84
-avrae_ls-0.7.0.dist-info/METADATA,sha256=JXBrCBS-f5pC4sPnZm4RIz-_5kgfr6YyqvjuBHJy3KE,7624
-avrae_ls-0.7.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-avrae_ls-0.7.0.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
-avrae_ls-0.7.0.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
-avrae_ls-0.7.0.dist-info/RECORD,,
+avrae_ls-0.7.1.dist-info/METADATA,sha256=2opuMIj8XeU1LZTgKhHLNwObrVojcrQ04BaPhlMnX-o,7624
+avrae_ls-0.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+avrae_ls-0.7.1.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
+avrae_ls-0.7.1.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+avrae_ls-0.7.1.dist-info/RECORD,,