Merge packages

1 files changed, 3 insertions, 5 deletions

diff --git a/src/server/caches.odin b/src/server/caches.odin
index cc993c3..42dbc27 100644
--- a/src/server/caches.odin
+++ b/src/server/caches.odin
@@ -1,19 +1,17 @@
 package server
 
-import "shared:index"
-import "shared:analysis"
 import "shared:common"
 
 //Used in semantic tokens and inlay hints to handle the entire file being resolved.
 FileResolveCache :: struct {
-	files: map[string]map[uintptr]index.SymbolAndNode,
+	files: map[string]map[uintptr]SymbolAndNode,
 }
 
 file_resolve_cache: FileResolveCache
 
-resolve_entire_file :: proc(document: ^common.Document) -> map[uintptr]index.SymbolAndNode{
+resolve_entire_file_cached :: proc(document: ^common.Document) -> map[uintptr]SymbolAndNode{
 	if document.uri.uri not_in file_resolve_cache.files {
-		file_resolve_cache.files[document.uri.uri] = analysis.resolve_entire_file(
+		file_resolve_cache.files[document.uri.uri] = resolve_entire_file(
 			document,
 			common.scratch_allocator(document.allocator),
 		)