fix: relative paths hints now work as intended

Author: TheNuclearNexus

aegis-core/aegis_core/ast/features/__init__.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 
 from beet import Context
-from bolt import AstAttribute, AstIdentifier, AstImportedItem, AstTargetIdentifier
+from bolt import AstAttribute, AstIdentifier, AstImportedItem, AstTargetAttribute, AstTargetIdentifier
 from mecha import AstNode, AstResourceLocation
 
 from .provider import *
@@ -13,6 +13,7 @@ def get_default_providers() -> dict[type[AstNode], type[BaseFeatureProvider]]:
     return {
         AstIdentifier: VariableFeatureProvider,
         AstAttribute: VariableFeatureProvider,
+        AstTargetAttribute: VariableFeatureProvider,
         AstTargetIdentifier: VariableFeatureProvider,
         AstImportedItem: VariableFeatureProvider,
         AstResourceLocation: ResourceLocationFeatureProvider,

aegis-core/aegis_core/ast/features/provider.py

@@ -57,7 +57,7 @@ class BaseFeatureProvider(Generic[Node]):
     @classmethod
     def completion(
         cls, params: CompletionParams[Node]
-    ) -> list[lsp.CompletionItem] | None:
+    ) -> lsp.CompletionList | None:
         return None
 
     @classmethod

aegis-core/aegis_core/ast/features/resource_location.py

@@ -1,7 +1,9 @@
 __all__ = ["ResourceLocationFeatureProvider"]
 
 import logging
+import os
 from pathlib import Path
+import re
 from typing import cast
 
 import lsprotocol.types as lsp
@@ -120,13 +122,12 @@ def completion(cls, params):
 
         metadata = retrieve_metadata(node, ResourceLocationMetadata)
 
-        if not metadata or metadata.represents is not type[NamespaceFile]:
+        if not metadata or not metadata.represents:
             return
 
         represents = metadata.represents
 
-        if represents is type[NamespaceFile]:
-            file_type = cast(type[NamespaceFile], represents)
+        if not isinstance(represents, str):
 
             path = node.get_canonical_value()
 
@@ -135,27 +136,38 @@ def completion(cls, params):
 
             resolved = get_path(path)
 
-            unresolved = get_path(metadata.unresolved_path or path)
+            if not metadata.unresolved_path:
+                return
+
+            unresolved = get_path(metadata.unresolved_path)
 
-            if unresolved[1].name == "~":
+            if unresolved[1].name == "~" or metadata.unresolved_path.endswith("/"):
                 resolved_parent = resolved[1]
                 unresolved_parent = unresolved[1]
             else:
                 resolved_parent = resolved[1].parent
                 unresolved_parent = unresolved[1].parent
 
+            logging.debug(f"{resolved[0]}:{resolved_parent}, {unresolved[0]}:{unresolved_parent}")
+
             items = []
 
-            for file in project_index[file_type]:
+            for file in project_index[represents]:
                 file_path = get_path(file)
+                logging.debug(file_path)
 
                 if not (
                     file_path[0] == resolved[0]
-                    and file_path[1].is_relative_to(resolved_parent)
                 ):
                     continue
+                
+                if unresolved[0]:
+                    if not file_path[1].is_relative_to(resolved_parent):
+                        continue
 
-                relative = file_path[1].relative_to(resolved_parent)
+                    relative = file_path[1].relative_to(resolved_parent)
+                else:
+                    relative = os.path.relpath(file_path[1], resolved_parent)
 
                 if unresolved[0] is None and unresolved[1].name == "":
                     new_path = "./" + str(relative)
@@ -168,10 +180,13 @@ def completion(cls, params):
                 if node.is_tag:
                     insert_text = "#" + insert_text
 
+                height_above = len(re.compile(r"\.\./").findall(str(relative)))
+
                 items.append(
                     lsp.CompletionItem(
                         label=insert_text,
                         documentation=file,
+                        sort_text=str(height_above),
                         text_edit=lsp.InsertReplaceEdit(
                             insert_text,
                             node_location_to_range(node),
@@ -180,9 +195,9 @@ def completion(cls, params):
                     )
                 )
 
-                return items
+            return lsp.CompletionList(False, items)
 
-        elif isinstance(represents, str):
+        else:
             registries = params.ctx.inject(AegisGameRegistries)
             items = []
 
@@ -196,4 +211,4 @@ def completion(cls, params):
                 )
             )
 
-            return items
+            return lsp.CompletionList(False, items)

aegis-core/aegis_core/ast/features/variable.py

@@ -1,5 +1,5 @@
 import lsprotocol.types as lsp
-from bolt import AstAttribute, AstIdentifier, AstImportedItem, AstTargetIdentifier
+from bolt import AstAttribute, AstIdentifier, AstImportedItem, AstTargetAttribute, AstTargetIdentifier
 
 from ...reflection import get_annotation_description
 from ..metadata import VariableMetadata, retrieve_metadata
@@ -10,7 +10,7 @@
 
 class VariableFeatureProvider(
     BaseFeatureProvider[
-        AstIdentifier | AstAttribute | AstTargetIdentifier | AstImportedItem
+        AstIdentifier | AstAttribute | AstTargetAttribute | AstTargetIdentifier | AstImportedItem
     ]
 ):
     @classmethod
@@ -21,7 +21,7 @@ def hover(cls, params) -> lsp.Hover | None:
         metadata = retrieve_metadata(node, VariableMetadata)
         name = (
             node.value
-            if not isinstance(node, (AstAttribute, AstImportedItem))
+            if not isinstance(node, (AstAttribute, AstTargetAttribute, AstImportedItem))
             else node.name
         )
 

aegis-server/aegis_server/__main__.py

@@ -72,7 +72,7 @@ def hover(ls: AegisServer, params: lsp.HoverParams):
     @server.feature(lsp.TEXT_DOCUMENT_RENAME)
     def rename(ls: AegisServer, params: lsp.RenameParams):
         return rename_variable(ls, params)
-
+    
     @server.command("mecha.server.dumpIndices")
     def dump(ls: AegisServer, *args):
         for _, i in ls._instances.values():

aegis-server/aegis_server/server/features/completion.py

@@ -92,22 +92,22 @@ def completion(ls: AegisServer, params: lsp.CompletionParams):
 
     with ls.context(text_doc) as ctx:
         if ctx is None:
-            items = []
+            items = None
         else:
             items = get_completions(ctx, params.position, text_doc)
 
-        return lsp.CompletionList(False, items or [])
+        return items
 
 
 def get_completions(
     ctx: LanguageServerContext,
     pos: lsp.Position,
     text_doc: TextDocument,
-) -> list[lsp.CompletionItem] | None:
+) -> lsp.CompletionList | None:
     mecha = ctx.inject(Mecha)
 
     if not (compiled_doc := get_compilation_data(ctx, text_doc)):
-        return []
+        return None
 
     ast = compiled_doc.ast
     diagnostics = compiled_doc.diagnostics
@@ -190,7 +190,7 @@ def get_diag_completions(
                 add_raw_definition(items, name, getattr(builtins, name))
 
             break
-    return items
+    return lsp.CompletionList(False, items)
 
 
 def add_variable_definition(

aegis-server/aegis_server/server/features/validate.py

@@ -134,6 +134,7 @@ def try_to_mount_file(ctx: LanguageServerContext, file_path: str):
             ctx.path_to_resource[path] = (location, file)
             ctx.data[type(file)][location] = file
 
+        logging.debug(f"Mounted {path} to {location}")
         return True
     except Exception as exc:
         logging.error(f"Failed to mount {path}, reloading datapack,\n{exc}")

aegis-server/aegis_server/server/indexing.py

@@ -214,10 +214,10 @@ def get_referenced_type(
 
 
 def add_representation(arg_node: AstNode, type: Any):
-    metadata = (
-        retrieve_metadata(arg_node, ResourceLocationMetadata)
-        or ResourceLocationMetadata()
-    )
+    metadata = retrieve_metadata(arg_node, ResourceLocationMetadata)
+
+    if metadata is None:
+        metadata = ResourceLocationMetadata()
 
     metadata.represents = type
 
@@ -304,18 +304,16 @@ def value(self, value: AstValue):
 
     @rule(AstResourceLocation)
     def resource_location(self, node: AstResourceLocation):
-        metadata = (
-            retrieve_metadata(node, ResourceLocationMetadata)
-            or ResourceLocationMetadata()
-        )
 
         if isinstance(node, AstNestedLocation):
-            metadata.unresolved_path = f"~/" + node.path
-        else:
-            metadata.unresolved_path = node.get_canonical_value()
+            metadata = (
+                retrieve_metadata(node, ResourceLocationMetadata)
+                or ResourceLocationMetadata()
+            )
 
-        attach_metadata(node, metadata)
+            metadata.unresolved_path = f"~/" + node.path
 
+            attach_metadata(node, metadata)
 
 @dataclass
 class BindingStep(Reducer):

aegis-server/aegis_server/server/patches/__init__.py

@@ -1,5 +1,6 @@
 from dataclasses import replace
 from functools import partial
+import logging
 from typing import Callable, TypeVar, cast
 
 from mecha import AstNode, AstResourceLocation, Rule
@@ -34,7 +35,6 @@ def parse_relative_path(
         retrieve_metadata(node, ResourceLocationMetadata) or ResourceLocationMetadata()
     )
 
-    attach_metadata(node, metadata)
 
     if node.namespace is None and node.path.startswith(("./", "../")):
         unresolved = node.path
@@ -50,6 +50,9 @@ def parse_relative_path(
         metadata.unresolved_path = unresolved
     else:
         metadata.unresolved_path = node.get_canonical_value()
+
+    attach_metadata(node, metadata)
+
     return node