avrae-ls 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

avrae_ls/completions.py

@@ -6,7 +6,7 @@ import re
 import typing
 from dataclasses import dataclass
 from functools import lru_cache
-from typing import Any, Dict, Iterable, List, Optional
+from typing import Any, ClassVar, Dict, Iterable, List, Optional
 
 from lsprotocol import types
 
@@ -42,6 +42,76 @@ from .api import (
 )
 from .signature_help import FunctionSig
 
+
+class _BuiltinList:
+    ATTRS: ClassVar[list[str]] = []
+    METHODS: ClassVar[list[str]] = ["append", "extend", "insert", "remove", "pop", "clear", "index", "count", "sort", "reverse", "copy"]
+
+    def __iter__(self) -> Iterable[Any]:
+        return iter([])
+
+    def append(self, value: Any) -> None: ...
+    def extend(self, iterable: Iterable[Any]) -> None: ...
+    def insert(self, index: int, value: Any) -> None: ...
+    def remove(self, value: Any) -> None: ...
+    def pop(self, index: int = -1) -> Any: ...
+    def clear(self) -> None: ...
+    def index(self, value: Any, start: int = 0, stop: int | None = None) -> int: ...
+    def count(self, value: Any) -> int: ...
+    def sort(self, *, key=None, reverse: bool = False) -> None: ...
+    def reverse(self) -> None: ...
+    def copy(self) -> list[Any]: ...
+
+
+class _BuiltinDict:
+    ATTRS: ClassVar[list[str]] = []
+    METHODS: ClassVar[list[str]] = ["get", "keys", "values", "items", "pop", "popitem", "update", "setdefault", "clear", "copy"]
+
+    def __iter__(self) -> Iterable[Any]:
+        return iter({})
+
+    def get(self, key: Any, default: Any = None) -> Any: ...
+    def keys(self) -> Any: ...
+    def values(self) -> Any: ...
+    def items(self) -> Any: ...
+    def pop(self, key: Any, default: Any = None) -> Any: ...
+    def popitem(self) -> tuple[Any, Any]: ...
+    def update(self, *args, **kwargs) -> None: ...
+    def setdefault(self, key: Any, default: Any = None) -> Any: ...
+    def clear(self) -> None: ...
+    def copy(self) -> dict[Any, Any]: ...
+
+
+class _BuiltinStr:
+    ATTRS: ClassVar[list[str]] = []
+    METHODS: ClassVar[list[str]] = [
+        "lower",
+        "upper",
+        "title",
+        "split",
+        "join",
+        "replace",
+        "strip",
+        "startswith",
+        "endswith",
+        "format",
+    ]
+
+    def __iter__(self) -> Iterable[str]:
+        return iter("")
+
+    def lower(self) -> str: ...
+    def upper(self) -> str: ...
+    def title(self) -> str: ...
+    def split(self, sep: str | None = None, maxsplit: int = -1) -> list[str]: ...
+    def join(self, iterable: Iterable[str]) -> str: ...
+    def replace(self, old: str, new: str, count: int = -1) -> str: ...
+    def strip(self, chars: str | None = None) -> str: ...
+    def startswith(self, prefix, start: int = 0, end: int | None = None) -> bool: ...
+    def endswith(self, suffix, start: int = 0, end: int | None = None) -> bool: ...
+    def format(self, *args, **kwargs) -> str: ...
+
+
 TYPE_MAP: Dict[str, object] = {
     "character": CharacterAPI,
     "combat": SimpleCombat,
@@ -74,6 +144,9 @@ TYPE_MAP: Dict[str, object] = {
     "SimpleGroup": SimpleGroup,
     "effect": SimpleEffect,
     "SimpleEffect": SimpleEffect,
+    "list": _BuiltinList,
+    "dict": _BuiltinDict,
+    "str": _BuiltinStr,
 }
 
 
@@ -108,6 +181,7 @@ class MethodMeta:
 class TypeMeta:
     attrs: Dict[str, AttrMeta]
     methods: Dict[str, MethodMeta]
+    element_type: str = ""
 
 
 def gather_suggestions(
@@ -304,9 +378,16 @@ def _attribute_receiver_and_prefix(code: str, line: int, character: int, capture
     dot = line_text.rfind(".")
     if dot == -1:
         return None
-    prefix = line_text[dot + 1 :].strip()
+    tail = line_text[dot + 1 :]
+    prefix_match = re.match(r"\s*([A-Za-z_]\w*)?", tail)
+    prefix = prefix_match.group(1) or "" if prefix_match else ""
+    suffix = tail[prefix_match.end() if prefix_match else 0 :]
     placeholder = "__COMPLETE__"
-    new_line = f"{line_text[:dot]}.{placeholder}"
+    new_line = f"{line_text[:dot]}.{placeholder}{suffix}"
+    # Close unmatched parentheses so the temporary code parses.
+    paren_balance = new_line.count("(") - new_line.count(")")
+    if paren_balance > 0:
+        new_line = new_line + (")" * paren_balance)
     mod_lines = list(lines)
     mod_lines[line] = new_line
     mod_code = "\n".join(mod_lines)
@@ -330,17 +411,29 @@ def _attribute_receiver_and_prefix(code: str, line: int, character: int, capture
     Finder().visit(tree)
     if receiver_src is None:
         return None
-    cleaned = re.sub(r"\[[^\]]*\]", "", receiver_src)
-    return cleaned, prefix
+    return receiver_src, prefix
 
 
 def _sanitize_incomplete_line(code: str, line: int, character: int) -> str:
     lines = code.splitlines()
     if 0 <= line < len(lines):
-        prefix = lines[line][:character].rstrip()
-        if prefix.endswith("."):
-            prefix = prefix[:-1]
+        prefix = lines[line][:character]
+        trimmed = prefix.rstrip()
+        if trimmed.endswith("."):
+            prefix = trimmed[:-1]
+        else:
+            dot = prefix.rfind(".")
+            if dot != -1:
+                after = prefix[dot + 1 :]
+                if not re.match(r"\s*[A-Za-z_]", after):
+                    prefix = prefix[:dot] + after
         lines[line] = prefix
+        candidate = "\n".join(lines)
+        try:
+            ast.parse(candidate)
+        except SyntaxError:
+            indent = re.match(r"[ \t]*", lines[line]).group(0)
+            lines[line] = indent + "pass"
     return "\n".join(lines)
 
 
@@ -370,54 +463,89 @@ def _infer_type_map(code: str) -> Dict[str, str]:
 
     class Visitor(ast.NodeVisitor):
         def visit_Assign(self, node: ast.Assign):
-            val_type = self._value_type(node.value)
+            val_type, elem_type = self._value_type(node.value)
             for target in node.targets:
                 if not isinstance(target, ast.Name):
                     continue
                 if val_type:
                     type_map[target.id] = val_type
+                if elem_type:
+                    type_map[f"{target.id}.__element__"] = elem_type
                 self._record_dict_key_types(target.id, node.value)
             self.generic_visit(node)
 
+        def visit_For(self, node: ast.For):
+            iter_type, elem_type = self._value_type(node.iter)
+            if not elem_type and isinstance(node.iter, ast.Name):
+                elem_type = type_map.get(f"{node.iter.id}.__element__")
+            if elem_type and isinstance(node.target, ast.Name):
+                type_map[node.target.id] = elem_type
+            self.generic_visit(node)
+
         def visit_AnnAssign(self, node: ast.AnnAssign):
-            val_type = self._value_type(node.value) if node.value else None
+            val_type, elem_type = self._value_type(node.value) if node.value else (None, None)
             if isinstance(node.target, ast.Name):
                 if val_type:
                     type_map[node.target.id] = val_type
+                if elem_type:
+                    type_map[f"{node.target.id}.__element__"] = elem_type
                 self._record_dict_key_types(node.target.id, node.value)
             self.generic_visit(node)
 
-        def _value_type(self, value: ast.AST | None) -> Optional[str]:
+        def _value_type(self, value: ast.AST | None) -> tuple[Optional[str], Optional[str]]:
             if isinstance(value, ast.Call) and isinstance(value.func, ast.Name):
                 if value.func.id in {"character", "combat"}:
-                    return value.func.id
+                    return value.func.id, None
                 if value.func.id == "vroll":
-                    return "SimpleRollResult"
+                    return "SimpleRollResult", None
+                if value.func.id in {"list", "dict", "str"}:
+                    return value.func.id, None
+            if isinstance(value, ast.List):
+                return "list", None
+            if isinstance(value, ast.Dict):
+                return "dict", None
+            if isinstance(value, ast.Constant):
+                if isinstance(value.value, str):
+                    return "str", None
             if isinstance(value, ast.Name):
                 if value.id in type_map:
-                    return type_map[value.id]
+                    return type_map[value.id], type_map.get(f"{value.id}.__element__")
                 if value.id in {"character", "combat", "ctx"}:
-                    return value.id
+                    return value.id, None
             if isinstance(value, ast.Attribute):
                 attr_name = value.attr
                 base_type = None
+                base_elem = None
                 if isinstance(value.value, ast.Name):
                     base_type = type_map.get(value.value.id)
+                    base_elem = type_map.get(f"{value.value.id}.__element__")
                 if base_type is None:
-                    base_type = self._value_type(value.value)
-                if base_type and attr_name in TYPE_MAP:
-                    return attr_name
-                return None
-            return None
+                    base_type, base_elem = self._value_type(value.value)
+                if base_type:
+                    meta = _type_meta(base_type)
+                    attr_meta = meta.attrs.get(attr_name)
+                    if attr_meta:
+                        if attr_meta.type_name:
+                            return attr_meta.type_name, attr_meta.element_type or None
+                        if attr_meta.element_type:
+                            return base_type, attr_meta.element_type
+                    if base_elem:
+                        return base_elem, None
+                    if attr_name in TYPE_MAP:
+                        return attr_name, None
+                return None, None
+            return None, None
 
         def _record_dict_key_types(self, var_name: str, value: ast.AST | None) -> None:
             if not isinstance(value, ast.Dict):
                 return
             for key_node, val_node in zip(value.keys or [], value.values or []):
                 if isinstance(key_node, ast.Constant) and isinstance(key_node.value, str):
-                    val_type = self._value_type(val_node)
+                    val_type, elem_type = self._value_type(val_node)
                     if val_type:
                         type_map[f"{var_name}.{key_node.value}"] = val_type
+                    if elem_type:
+                        type_map[f"{var_name}.{key_node.value}.__element__"] = elem_type
 
     Visitor().visit(tree)
     return type_map
@@ -431,13 +559,26 @@ def _resolve_type_name(receiver: str, code: str, type_map: Dict[str, str] | None
         dict_key = f"{base}.{key}"
         if dict_key in mapping:
             return mapping[dict_key]
+    bracket = receiver.rfind("[")
+    if bracket != -1 and receiver.endswith("]"):
+        base_expr = receiver[:bracket]
+        elem_hint = mapping.get(f"{base_expr}.__element__")
+        if elem_hint:
+            return elem_hint
+        base_type = _resolve_type_name(base_expr, code, mapping)
+        if base_type:
+            base_meta = _type_meta(base_type)
+            if base_meta.element_type:
+                return base_meta.element_type
+            return base_type
     receiver = receiver.rstrip("()")
     if "." in receiver:
         base_expr, attr_name = receiver.rsplit(".", 1)
         base_type = _resolve_type_name(base_expr, code, mapping)
         if base_type:
             meta = _type_meta(base_type)
-            attr_meta = meta.attrs.get(attr_name)
+            attr_key = attr_name.split("[", 1)[0]
+            attr_meta = meta.attrs.get(attr_key)
             if attr_meta:
                 if attr_meta.element_type:
                     return attr_meta.element_type
@@ -446,16 +587,19 @@ def _resolve_type_name(receiver: str, code: str, type_map: Dict[str, str] | None
 
     if receiver in mapping:
         return mapping[receiver]
+    elem_key = f"{receiver}.__element__"
+    if elem_key in mapping:
+        return mapping[elem_key]
     if receiver in TYPE_MAP:
         return receiver
-    tail = receiver.split(".")[-1]
+    tail = receiver.split(".")[-1].split("[", 1)[0]
     if tail in TYPE_MAP:
         return tail
     return receiver
 
 
 def _type_meta(type_name: str) -> TypeMeta:
-    return _type_meta_map().get(type_name, TypeMeta(attrs={}, methods={}))
+    return _type_meta_map().get(type_name, TypeMeta(attrs={}, methods={}, element_type=""))
 
 
 @lru_cache()
@@ -474,6 +618,7 @@ def _type_meta_map() -> Dict[str, TypeMeta]:
     for type_name, cls in TYPE_MAP.items():
         attrs: dict[str, AttrMeta] = {}
         methods: dict[str, MethodMeta] = {}
+        iterable_element = _iter_element_for_type_name(type_name)
 
         for attr in getattr(cls, "ATTRS", []):
             doc = ""
@@ -508,7 +653,7 @@ def _type_meta_map() -> Dict[str, TypeMeta]:
                 doc = (meth_obj.__doc__ or "").strip()
             methods[meth] = MethodMeta(signature=sig_label, doc=doc)
 
-        meta[type_name] = TypeMeta(attrs=attrs, methods=methods)
+        meta[type_name] = TypeMeta(attrs=attrs, methods=methods, element_type=iterable_element)
     return meta
 
 
@@ -571,8 +716,9 @@ def _type_names_from_annotation(ann: Any, reverse_type_map: Dict[type, str]) ->
         if args:
             elem = args[0]
             elem_name, _ = _type_names_from_annotation(elem, reverse_type_map)
-            return "", elem_name
-        return "", ""
+            container_name = reverse_type_map.get(origin) or "list"
+            return container_name, elem_name
+        return reverse_type_map.get(origin) or "list", ""
 
     if isinstance(ann, type) and ann in reverse_type_map:
         return reverse_type_map[ann], ""

avrae_ls/runtime.py

@@ -129,12 +129,9 @@ def _default_builtins() -> Dict[str, Any]:
         "abs": abs,
         "range": range,
         "enumerate": enumerate,
-        "sorted": sorted,
-        "reversed": reversed,
         "int": int,
         "float": float,
         "str": str,
-        "bool": bool,
         "round": round,
         "ceil": math.ceil,
         "floor": math.floor,

{avrae_ls-0.3.0.dist-info → avrae_ls-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avrae-ls
-Version: 0.3.0
+Version: 0.3.1
 Summary: Language server for Avrae draconic aliases
 Author: 1drturtle
 Requires-Python: >=3.11

{avrae_ls-0.3.0.dist-info → avrae_ls-0.3.1.dist-info}/RECORD

@@ -4,18 +4,18 @@ avrae_ls/alias_preview.py,sha256=Wy_ZNRq73ojPiLFf6P6fJ7rG7DeFFsFLkLlhFrAjkKI,611
 avrae_ls/api.py,sha256=sGbwWs5o6M49lyk3qZi6gNdSH_u_BMdghsTlAjpviqQ,64852
 avrae_ls/argparser.py,sha256=-6RKrXavbSjEyyEeaoz8hRamnB-MEmJt3Cw2smRbmdI,13483
 avrae_ls/argument_parsing.py,sha256=ezKl65VwuNEDxt6KlYwVQcpy1110UDvf4BqZqgZTcqk,2122
-avrae_ls/completions.py,sha256=lMLaEB-8QWGIxdXYo6gUr-ZfXtws2faahAH7hhsbfe8,28183
+avrae_ls/completions.py,sha256=WSyP967_t_oBhRMjLk-QQKyXWiNh4sJTH560VdMBQeg,34336
 avrae_ls/config.py,sha256=C51wfG6-82uX4dsffqcDLMiXbZZL9JQgfpulAr8eiqs,15267
 avrae_ls/context.py,sha256=w0uVSR6Pis3q1fF3kSPsqbTirKOE6n3k2XMO8UZI7sk,5719
 avrae_ls/cvars.py,sha256=0tcVbUHx_CKJ6aou3kEsKX37LRWAjkUWlqqIuSRFlXk,3197
 avrae_ls/diagnostics.py,sha256=EAdbckvvWu0pswopaZ6JyVGCHXUl5ZvGBhP2PDVCrVw,16180
 avrae_ls/dice.py,sha256=DY7V7L-EwAXaCgddgVe9xU1s9lVtiw5Zc2reipNgdTk,874
 avrae_ls/parser.py,sha256=AuNxNkkfquN9dcyTpmzAZxWcAQ7CV3PQLHUDYLMz_7U,1148
-avrae_ls/runtime.py,sha256=mxke-uwXQol82Syi6kKi0-GqZ0klRXAeAkZP0qUNW7s,20870
+avrae_ls/runtime.py,sha256=sSN_C48TrF7F5NtsUpgHr_cZyYX6HCQHBfCpAYxsDJo,20792
 avrae_ls/server.py,sha256=L3qGTpCDOa64hWFmfWfoKbrDZ3262gmu5wYhHkdLBPY,13070
 avrae_ls/signature_help.py,sha256=JheaEzINV4FO72t5U0AJfL2ZX15y3-gcA6xk3M1jHcY,6980
 avrae_ls/symbols.py,sha256=8aMalHBDnRsRvhwdbmf0nOazio7G185qw9le45Xb5Mk,4449
-avrae_ls-0.3.0.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
+avrae_ls-0.3.1.dist-info/licenses/LICENSE,sha256=O-0zMbcEi6wXz1DiSdVgzMlQjJcNqNe5KDv08uYzqR0,1055
 draconic/LICENSE,sha256=Fzvu32_DafLKKn2mzxhEdlmrKZzAsigDZ87O7uoVqZI,1067
 draconic/__init__.py,sha256=YPH420Pcn_nTkfB62hJy_YqC5kpJdzSa78jP8n4z_xY,109
 draconic/exceptions.py,sha256=siahnHIsumbaUhKBDSrw_DmLZ-0oZks8L5oytPH8hD4,3753
@@ -25,8 +25,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.3.0.dist-info/METADATA,sha256=wljFfTfBdkF2SBdWjThl9lpz64fTj5XL4ufqgFvtcS4,2107
-avrae_ls-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-avrae_ls-0.3.0.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
-avrae_ls-0.3.0.dist-info/top_level.txt,sha256=TL68uzGHmB2R2ID32_s2zocmcNnpMJVQ6_4NBvyo8a4,18
-avrae_ls-0.3.0.dist-info/RECORD,,
+avrae_ls-0.3.1.dist-info/METADATA,sha256=TRJQs5mkNC4TPeYBkO2rXDnvkJhjf2jws1ginLXaXq4,2107
+avrae_ls-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+avrae_ls-0.3.1.dist-info/entry_points.txt,sha256=OtYXipMQzqmxpMoApgo0MeJYFmMbkbFN51Ibhpb8hF4,52
+avrae_ls-0.3.1.dist-info/top_level.txt,sha256=TL68uzGHmB2R2ID32_s2zocmcNnpMJVQ6_4NBvyo8a4,18
+avrae_ls-0.3.1.dist-info/RECORD,,