Split declarationBuilder

CppCXY · Jul 2, 2024 · d348391 · d348391
1 parent c13ba16
commit d348391
Show file tree

Hide file tree

Showing 13 changed files with 1,610 additions and 1,520 deletions.
diff --git a/EmmyLua/CodeAnalysis/Compilation/Analyzer/AnalyzeContext.cs b/EmmyLua/CodeAnalysis/Compilation/Analyzer/AnalyzeContext.cs
@@ -14,6 +14,7 @@ public class AnalyzeContext(List<LuaDocument> documents)
 
     public List<UnResolved> UnResolves { get; } = [];
 
+    // TODO
     public List<InferenceUsage> UseInfers { get; } = [];
 
     public Dictionary<SyntaxElementId, ControlFlowGraph> ControlFlowGraphs { get; } = new();

diff --git a/EmmyLua/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationAnalyzer.cs b/EmmyLua/CodeAnalysis/Compilation/Analyzer/DeclarationAnalyzer/DeclarationAnalyzer.cs
@@ -1,13 +1,19 @@
-namespace EmmyLua.CodeAnalysis.Compilation.Analyzer.DeclarationAnalyzer;
+using EmmyLua.CodeAnalysis.Compilation.Search;
+
+namespace EmmyLua.CodeAnalysis.Compilation.Analyzer.DeclarationAnalyzer;
 
 public class DeclarationAnalyzer(LuaCompilation compilation) : LuaAnalyzer(compilation, "Declaration")
 {
     public override void Analyze(AnalyzeContext analyzeContext)
     {
+        var searchContext = new SearchContext(compilation, new SearchContextFeatures() { Cache = false });
         foreach (var document in analyzeContext.LuaDocuments)
         {
-            var builder = new DeclarationBuilder(document.Id, document.SyntaxTree, this, analyzeContext);
-            var tree = builder.Build();
+            var declarationContext = new DeclarationContext(document.Id, this, analyzeContext);
+            var walker = new DeclarationWalker.DeclarationWalker(declarationContext, searchContext);
+            document.SyntaxTree.SyntaxRoot.Accept(walker);
+
+            var tree = declarationContext.GetDeclarationTree();
             if (tree is not null)
             {
                 Compilation.Db.AddDeclarationTree(document.Id, tree);