fix: use correct quote pairs

Author: 1drturtle

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "avrae-ls"
-version = "0.8.1"
+version = "0.8.2"
 description = "Language server for Avrae draconic aliases"
 authors = [
   { name = "1drturtle" }

src/avrae_ls/runtime/alias_preview.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 import re
-import shlex
 from dataclasses import asdict, dataclass, field
 from typing import Any, Optional, Tuple
 
 from avrae_ls.analysis.parser import DRACONIC_RE, INLINE_DRACONIC_RE, INLINE_ROLL_RE
+from avrae_ls.runtime import argparser as avrae_argparser
 from avrae_ls.runtime.runtime import ExecutionResult, MockExecutor, _roll_dice
 from avrae_ls.runtime.context import ContextData, GVarResolver
 from avrae_ls.runtime.argument_parsing import apply_argument_parsing
@@ -203,7 +203,7 @@ def validate_embed_payload(payload: str) -> Tuple[bool, str | None]:
 
 def parse_embed_payload(payload: str) -> EmbedPreview:
     """Parse an embed payload into a structured preview object."""
-    tokens = shlex.split(payload.strip())
+    tokens = avrae_argparser.argsplit(payload.strip())
     preview = EmbedPreview()
 
     i = 0
@@ -259,8 +259,8 @@ def _validate_embed_flags(text: str) -> Tuple[bool, str | None]:
         return False, "Embed payload is empty."
 
     try:
-        tokens = shlex.split(text)
-    except ValueError as exc:  # pragma: no cover - defensive only
+        tokens = avrae_argparser.argsplit(text)
+    except (avrae_argparser.BadArgument, avrae_argparser.ExpectedClosingQuoteError) as exc:
         return False, f"Embed payload could not be parsed: {exc}"
 
     flag_handlers = {

src/avrae_ls/runtime/argparser.py

@@ -47,9 +47,10 @@ def skip_ws(self):
     def get(self):
         if self.eof:
             return None
-        ch = self.buffer[self.index]
         self.index += 1
-        return ch
+        if self.eof:
+            return None
+        return self.buffer[self.index]
 
     def undo(self):
         if self.index > 0:

src/avrae_ls/testing/alias_tests.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import re
-import shlex
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Iterable, Sequence
 
 import yaml
 
+from avrae_ls.runtime import argparser as avrae_argparser
 from avrae_ls.runtime.alias_preview import render_alias_command, simulate_command
 from avrae_ls.runtime.context import ContextBuilder
 from avrae_ls.runtime.runtime import MockExecutor
@@ -278,8 +278,8 @@ def diff_mismatched_parts(expected: Any, actual: Any) -> tuple[Any, Any] | None:
 
 def _split_command(command: str, path: Path) -> list[str]:
     try:
-        tokens = shlex.split(command, posix=True)
-    except ValueError as exc:
+        tokens = avrae_argparser.argsplit(command)
+    except (avrae_argparser.BadArgument, avrae_argparser.ExpectedClosingQuoteError) as exc:
         raise AliasTestError(f"{path} has an invalid command line: {exc}") from exc
     if not tokens:
         raise AliasTestError(f"{path} has an empty command")

tests/test_alias_preview.py

@@ -93,6 +93,8 @@ def test_simulate_command_embeds_validate_unknown_keys():
     assert simulated.validation_error
     ok, err = validate_embed_payload(payload)
     assert not ok
+    assert err is not None
+
     assert "unknown flag" in err
 
 
@@ -106,18 +108,22 @@ def test_validate_embed_flag_style():
 def test_validate_embed_flag_unknown():
     ok, err = validate_embed_payload("-foo bar")
     assert not ok
+    assert err is not None
+
     assert "unknown flag" in err
 
 
 def test_validate_embed_flag_color():
     ok, err = validate_embed_payload("-color nothex")
     assert not ok
+    assert err is not None
     assert "color must be a 6-hex" in err
 
 
 def test_validate_embed_field_format():
     ok, err = validate_embed_payload('-f "BadField"')
     assert not ok
+    assert err is not None
     assert "field must be" in err.lower()
 
 
@@ -127,6 +133,26 @@ def test_validate_embed_color_placeholder():
     assert err is None
 
 
+def test_validate_embed_supports_avrae_quote_pairs():
+    payload = "-title \u201cHello World\u201d -desc \u00abFlavor text\u00bb -f \u300cName|Value|inline\u300d"
+    ok, err = validate_embed_payload(payload)
+    simulated = simulate_command(f"embed {payload}")
+
+    assert ok
+    assert err is None
+    assert simulated.embed is not None
+    assert simulated.embed.title == "Hello World"
+    assert simulated.embed.description == "Flavor text"
+    assert simulated.embed.fields and simulated.embed.fields[0].name == "Name"
+
+
+def test_validate_embed_reports_unclosed_quote_pairs():
+    ok, err = validate_embed_payload("-title \u201cHello")
+    assert not ok
+    assert err is not None
+    assert "Expected closing quote" in err
+
+
 def test_simulate_command_returns_embed_preview():
     payload = '-title "Hello" -desc "World" -color #ABCDEF -t 30 -thumb http://thumb -image http://image -footer "Footer" -f "Name|Value|inline"'
     simulated = simulate_command(f"embed {payload}")
@@ -156,26 +182,32 @@ def test_simulate_command_with_embed_prefix_and_payload_on_newline():
     payload = "-title abc"
     simulated = simulate_command(f"embed\n{payload}")
     assert simulated.command_name == "embed"
+    assert simulated.preview is not None
+
     assert simulated.preview.strip() == payload
 
 
 def test_simulate_command_finds_embed_after_intro_text():
     payload = "-title abc"
     simulated = simulate_command(f"# heading\nembed {payload}")
     assert simulated.command_name == "embed"
+    assert simulated.preview is not None
+
     assert simulated.preview.strip().endswith(payload)
 
 
 def test_simulate_command_supports_multiple_flag_lines():
     payload = "-title abc\n-title def"
     simulated = simulate_command(payload)
     assert simulated.command_name == "embed"
+    assert simulated.preview is not None
     assert "-title abc" in simulated.preview
     assert "-title def" in simulated.preview
 
 
 def test_simulate_command_strips_alias_header():
-    alias = "!alias next embed\n-title \"Done?\""
+    alias = '!alias next embed\n-title "Done?"'
     simulated = simulate_command(alias)
     assert simulated.command_name == "embed"
+    assert simulated.preview is not None
     assert "Done?" in simulated.preview

tests/test_alias_tests.py

@@ -181,6 +181,16 @@ def test_parse_alias_test_requires_alias_file(tmp_path):
         parse_alias_tests(test_path)
 
 
+def test_parse_alias_tests_support_avrae_quote_pairs(tmp_path):
+    alias_path = tmp_path / "say.alias"
+    alias_path.write_text("!alias say echo %1%")
+    test_path = tmp_path / "test-say.alias-test"
+    test_path.write_text("!say \u201chello world\u201d\n---\n\"hello world\"\n")
+
+    case = parse_alias_tests(test_path)[0]
+    assert case.args == ["hello world"]
+
+
 @pytest.mark.asyncio
 async def test_alias_tests_support_regex_expected(tmp_path):
     alias_path = tmp_path / "greet.alias"

tests/test_argparser_unit.py

@@ -4,6 +4,17 @@
 from avrae_ls.runtime.argparser import Argument, EphemeralArgument
 
 
+def test_argsplit_matches_avrae_style_quotes():
+    assert argparser.argsplit('foo bar "two words"') == ["foo", "bar", "two words"]
+    assert argparser.argsplit("-title \u201cHello World\u201d") == ["-title", "Hello World"]
+    assert argparser.argsplit("-desc \u00abFlavor\u00bb") == ["-desc", "Flavor"]
+
+
+def test_argsplit_unclosed_quote_raises():
+    with pytest.raises(argparser.ExpectedClosingQuoteError):
+        argparser.argsplit("-title \u201cHello")
+
+
 def test_argparse_arg_respects_ephemeral_flag():
     assert argparser._argparse_arg("d", None, True, 0, parse_ephem=True) == Argument("d", True, 0)
     assert argparser._argparse_arg("d", "1", True, 0, parse_ephem=True) == EphemeralArgument("d", True, 0, 1)

uv.lock

@@ -2,7 +2,7 @@
   "name": "avrae-ls-client",
   "displayName": "Avrae Draconic Alias Language Server",
   "description": "VS Code client for avrae-ls (draconic alias diagnostics and mock execution).",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "engines": {
     "vscode": "^1.84.0"
   },