fix(aegis-server, aegis-core): remove dereferenced files from compilation database

Author: TheNuclearNexus

aegis-core/aegis_core/indexing/project_index.py

@@ -1,12 +1,15 @@
+from heapq import heapify
 import logging
 import re
 from dataclasses import dataclass, field
 from pathlib import Path
 from threading import Lock
 from typing import ClassVar
 
-from beet import Context, File, NamespaceFile
+from beet import Context, File, Function, NamespaceFile
 from beet.core.utils import extra_field, required_field
+from bolt import Module
+from mecha import Mecha
 from tokenstream import SourceLocation
 
 __all__ = ["FilePointer", "ResourceIndex", "AegisProjectIndex"]
@@ -43,22 +46,27 @@ class ResourceIndex:
     _files: dict[str, ResourceIndice] = extra_field(default_factory=dict)
     _lock: Lock = extra_field(default_factory=Lock)
 
-    def remove_associated(self, path: str | File):
+    def remove_associated(self, path: str | File) -> list[str]:
         self._lock.acquire()
 
         if isinstance(path, File):
             path = str(Path(path.ensure_source_path()).absolute())
 
+        removed = []
+
         for file, indice in list(self._files.items()):
-            if path in indice.definitions:
-                del indice.definitions[path]
+
             if path in indice.references:
                 del indice.references[path]
+            if path in indice.definitions:
+                del indice.definitions[path]
 
-            if len(indice.definitions) == 0:
-                del self._files[file]
+                if len(indice.definitions) == 0:
+                    del self._files[file]
+                    removed.append(file)
 
         self._lock.release()
+        return removed
 
     def add_definition(
         self,
@@ -158,8 +166,31 @@ def __getitem__(self, key: type[NamespaceFile]):
         return self._resources.setdefault(key, ResourceIndex())
 
     def remove_associated(self, path: str):
-        for resource in self._resources.values():
-            resource.remove_associated(path)
+        for resource, index in self._resources.items():
+            removed_files = index.remove_associated(path)
+
+            for removed in removed_files:
+                for pack in self._ctx.packs:
+                    if not removed in pack[resource]:
+                        continue
+
+                    file = pack[resource][removed]
+
+                    mecha = self._ctx.inject(Mecha)
+                    if file in mecha.database:
+                        del mecha.database[file]
+                        self._remove_from_queue(file, mecha)
+
+    def _remove_from_queue(self, file, mecha: Mecha):
+        index = -1
+        for i, (_, _, _, _, queued_file) in enumerate(mecha.database.queue):
+            if file == queued_file:
+                index = i
+                break
+
+        if index != -1:
+            mecha.database.queue.pop(i)
+            heapify(mecha.database.queue)
 
     def dump(self) -> str:
         dump = ""

aegis-server/aegis_server/providers/resource_location.py

@@ -146,13 +146,10 @@ def completion(cls, params):
                 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[represents]:
                 file_path = get_path(file)
-                logging.debug(file_path)
 
                 if not (
                     file_path[0] == resolved[0]

aegis-server/aegis_server/server/__init__.py

@@ -9,6 +9,7 @@
 from contextlib import contextmanager
 from pathlib import Path
 from threading import Lock, Thread
+import traceback
 from typing import Generator, cast
 from urllib import request
 from urllib.parse import unquote, urlparse
@@ -65,7 +66,7 @@ def __init__(self, *args):
             target=lambda self, parent: self.scan_functions(parent),
             args=[self, threading.current_thread()],
         )
-        self._index_thread.start()
+        # self._index_thread.start()
 
     def index_functions(self, ctx: LanguageServerContext):
         for function, file in cast(
@@ -93,7 +94,8 @@ def scan_functions(self, parent_thread: Thread):
                     time.sleep(0.1)
         except Exception as exc:
             lock.release()
-            logging.error(f"Fatal error occured while indexing function!\n{exc}")
+            tb = "\n".join(traceback.format_tb(exc.__traceback__))
+            logging.error(f"Fatal error occured while indexing function!\n{exc}\n{tb}")
 
         logging.info("Stopped Indexing Thread")
 

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

@@ -211,6 +211,13 @@ def compile(
     mecha = ctx.inject(Mecha)
     diagnostics = []
 
+    try:
+        project_index = ctx.inject(AegisProjectIndex)
+        project_index.remove_associated(source_path)
+    except Exception as e:
+        tb = "\n".join(traceback.format_tb(e.__traceback__))
+        logging.error(f"{e}\n{tb}")
+    
     indexer = Indexer(
         ctx=ctx,
         resource_location=resource_location,
@@ -224,10 +231,12 @@ def compile(
         compiled_unit = CompilationUnit(
             resource_location=resource_location, pack=ctx.data
         )
-        mecha.database[source_file] = compiled_unit
-        mecha.database.enqueue(source_file)
+        database = mecha.database
+        database[source_file] = compiled_unit
+        database.enqueue(source_file)
+
 
-        for step, file_instance in mecha.database.process_queue():
+        for step, file_instance in database.process_queue():
             compilation_unit = mecha.database[file_instance]
 
             if step < 0:

aegis-server/aegis_server/server/indexing.py

@@ -683,7 +683,6 @@ def __call__(self, ast: AstRoot, *args) -> AbstractNode:
 
         # A file always defines itself
         source_type = type(self.file_instance)
-        project_index.remove_associated(self.source_path)
 
         project_index[source_type].add_definition(
             self.resource_location, self.source_path