feat(aegis-server, aegis-core): move provider implementations to aegis-server

Author: TheNuclearNexus

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

@@ -1,49 +1,17 @@
 from dataclasses import dataclass, field
 
 from beet import Context
-from bolt import (
-    AstAttribute,
-    AstClassName,
-    AstFormatString,
-    AstFunctionSignature,
-    AstFunctionSignatureArgument,
-    AstIdentifier,
-    AstImportedItem,
-    AstTargetAttribute,
-    AstTargetIdentifier,
-    AstValue,
-)
-from mecha import AstNode, AstResourceLocation, AstItemSlot
+
+from mecha import AstNode
 
 from .provider import *
-from .resource_location import *
-from .variable import *
-from .generic import *
-
-def get_default_providers() -> dict[type[AstNode], type[BaseFeatureProvider]]:
-    return {
-        # Bolt Specific
-        AstIdentifier: VariableFeatureProvider,
-        AstAttribute: VariableFeatureProvider,
-        AstTargetAttribute: VariableFeatureProvider,
-        AstTargetIdentifier: VariableFeatureProvider,
-        AstImportedItem: VariableFeatureProvider,
-        AstClassName: ClassNameProvider,
-        AstFunctionSignature: FunctionSignatureProvider,
-        AstFunctionSignatureArgument: FunctionSignatureArgProvider,
-        AstValue: ValueProvider,
-        AstFormatString: FormatStringProvider,
-        # Mecha Specific
-        AstResourceLocation: ResourceLocationFeatureProvider,
-        AstItemSlot: ItemSlotProvider,
-    }
 
 
 @dataclass
 class AegisFeatureProviders:
     ctx: Context
     _providers: dict[type[AstNode], type[BaseFeatureProvider]] = field(
-        init=False, default_factory=get_default_providers
+        init=False, default_factory=dict
     )
 
     def attach(self, node_type: type[AstNode], provider: type[BaseFeatureProvider]):

aegis-server/aegis_server/providers/__init__.py

@@ -0,0 +1,49 @@
+from aegis_core.ast.features import AegisFeatureProviders
+from aegis_core.ast.features.provider import BaseFeatureProvider
+from beet import Context
+from bolt import (
+    AstAttribute,
+    AstClassName,
+    AstFormatString,
+    AstFunctionSignature,
+    AstFunctionSignatureArgument,
+    AstIdentifier,
+    AstImportedItem,
+    AstTargetAttribute,
+    AstTargetIdentifier,
+    AstValue,
+)
+from mecha import AstItemSlot, AstNode, AstResourceLocation
+
+from .resource_location import *
+from .variable import *
+from .generic import *
+
+__all__ = [
+    "register_providers"
+]
+
+PROVIDERS: dict[type[AstNode], type[BaseFeatureProvider]] = {
+    # Bolt Specific
+    AstIdentifier: VariableFeatureProvider,
+    AstAttribute: VariableFeatureProvider,
+    AstTargetAttribute: VariableFeatureProvider,
+    AstTargetIdentifier: VariableFeatureProvider,
+    AstImportedItem: VariableFeatureProvider,
+    AstClassName: ClassNameProvider,
+    AstFunctionSignature: FunctionSignatureProvider,
+    AstFunctionSignatureArgument: FunctionSignatureArgProvider,
+    AstValue: ValueProvider,
+    AstFormatString: FormatStringProvider,
+    # Mecha Specific
+    AstResourceLocation: ResourceLocationFeatureProvider,
+    AstItemSlot: ItemSlotProvider,
+}
+
+
+def register_providers(ctx: Context):
+    providers = ctx.inject(AegisFeatureProviders)
+
+    for node, provider in PROVIDERS.items():
+        providers.attach(node, provider)
+

aegis-core/aegis_core/ast/features/generic.py renamed to aegis-server/aegis_server/providers/generic.py

@@ -2,6 +2,7 @@
 import re
 from types import NoneType
 from typing import ClassVar
+from aegis_core.ast.features.provider import BaseFeatureProvider
 from aegis_core.ast.helpers import offset_location
 from aegis_core.ast.metadata import VariableMetadata, retrieve_metadata
 from aegis_core.semantics import TokenModifier, TokenType
@@ -15,7 +16,6 @@
 from mecha import AstNode
 from mecha.ast import AstItemSlot
 from tokenstream import SourceLocation
-from .provider import BaseFeatureProvider
 
 
 __all__ = [

aegis-core/aegis_core/ast/features/resource_location.py renamed to aegis-server/aegis_server/providers/resource_location.py

@@ -6,18 +6,16 @@
 import re
 from typing import cast
 
+from aegis_core.ast.features.provider import BaseFeatureProvider
+from aegis_core.ast.helpers import node_location_to_range
+from aegis_core.ast.metadata import ResourceLocationMetadata, retrieve_metadata
+from aegis_core.indexing.project_index import AegisProjectIndex
 import lsprotocol.types as lsp
 from beet import File, NamespaceFile
 from mecha import AstResourceLocation
 
 from aegis_core.registry import AegisGameRegistries
 
-from ...ast.helpers import node_location_to_range
-from ...ast.metadata import ResourceLocationMetadata, retrieve_metadata
-from ...indexing.project_index import AegisProjectIndex
-from .provider import BaseFeatureProvider
-
-
 def add_registry_items(
     registries: AegisGameRegistries,
     represents: str,

aegis-core/aegis_core/ast/features/variable.py renamed to aegis-server/aegis_server/providers/variable.py

@@ -1,8 +1,10 @@
 from functools import reduce
 import inspect
-from typing import Any, Literal, get_origin
-from aegis_core.ast.features.provider import SemanticsParams
+from typing import Any, get_origin
+from aegis_core.ast.features.provider import BaseFeatureProvider
 from aegis_core.ast.helpers import offset_location
+from aegis_core.ast.metadata import VariableMetadata, attach_metadata, retrieve_metadata
+from aegis_core.reflection import UNKNOWN_TYPE, FunctionInfo, TypeInfo, get_annotation_description, get_function_description, get_type_info
 from aegis_core.semantics import TokenModifier, TokenType
 import lsprotocol.types as lsp
 from bolt import (
@@ -11,22 +13,11 @@
     AstImportedItem,
     AstTargetAttribute,
     AstTargetIdentifier,
-    Runtime,
     Variable,
 )
 from mecha import AstNode
-from tokenstream import set_location
-
-from ...reflection import (
-    UNKNOWN_TYPE,
-    FunctionInfo,
-    TypeInfo,
-    get_annotation_description,
-    get_function_description,
-    get_type_info,
-)
-from ..metadata import VariableMetadata, attach_metadata, retrieve_metadata
-from . import BaseFeatureProvider
+
+
 
 __all__ = ["VariableFeatureProvider"]
 

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

@@ -1,6 +1,6 @@
 import builtins
 
-from aegis_core.ast.features.variable import add_raw_definition, add_variable_definition
+from aegis_server.providers.variable import add_raw_definition, add_variable_definition
 from bolt import Runtime, UndefinedIdentifier
 from lsprotocol import types as lsp
 from mecha import (

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

@@ -108,15 +108,6 @@ def command(self, node: AstCommand):
                     pos=node.location.pos + name_length,
                     colno=node.location.colno + name_length,
                 )
-            # if node.location.lineno == node.arguments[0].location.lineno:
-            #     command_name_offset = (
-            #         node.arguments[0].location.pos - node.location.pos - 1
-            #     )
-            #     end_location = SourceLocation(
-            #         lineno=node.location.lineno,
-            #         pos=node.location.pos + command_name_offset,
-            #         colno=node.location.colno + command_name_offset,
-            #     )
             else:
                 return
 
@@ -190,17 +181,6 @@ def node(self, node: AstNode):
                 f"An error occured running provider {provider}\n{e}\n{tb}"
             )
 
-    # @rule(AstAssignment)
-    # def assignment(self, assignment: AstAssignment):
-    #     self.generic_identifier(assignment.target)
-
-    #     if assignment.type_annotation != None:
-    #         self.nodes.append((assignment.type_annotation, TOKEN_TYPES["class"], 0))
-
-    # @rule(AstExpressionUnary)
-    # def expression(self, expression: AstExpressionUnary):
-    #     if expression.operator == "not" or expression.operator == "is":
-    #         self.nodes.append((expression, TOKEN_TYPES["operator"], TOKEN_MODIFIERS["declaration"]))
 
     def walk(self, root: AstNode):
         self.nodes = []

aegis-server/aegis_server/server/shadows/project_builder.py

@@ -3,6 +3,7 @@
 from contextlib import ExitStack
 from copy import deepcopy
 
+from aegis_server.providers import register_providers
 from beet import (
     LATEST_MINECRAFT_VERSION,
     Context,
@@ -89,6 +90,10 @@ def initialize(self, ls: LanguageServer) -> LanguageServerContext:
 
                 pipelined_plugin.append(item)
 
+
+            logging.debug("Configuring Context")
+            configure_ctx(ctx)
+
             with change_directory(tmpdir):
                 for plugin in pipelined_plugin:
                     logging.debug(f"Running pipeline {plugin}")
@@ -108,9 +113,6 @@ def initialize(self, ls: LanguageServer) -> LanguageServerContext:
 
             mc = ctx.inject(Mecha)
 
-            logging.debug("Configuring mecha")
-            configure_mecha(mc)
-
             for pack in ctx.packs:
                 logging.debug("Enqueuing files in database")
                 # Add file to the compilation database
@@ -133,7 +135,8 @@ def initialize(self, ls: LanguageServer) -> LanguageServerContext:
             return ctx
 
 
-def configure_mecha(mc: Mecha):
+def configure_ctx(ctx: LanguageServerContext):
     # mc.steps = mc.steps[: mc.steps.index(mc.lint) + 1]
 
+    register_providers(ctx)
     apply_patches()