Merge branch 'master' into invert-if

9 files changed, 12 insertions, 3 deletions

diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index 000080d..c9cd863 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -1,4 +1,5 @@
 #+feature dynamic-literals
+#+feature using-stmt
 package server
 
 import "core:fmt"
diff --git a/src/server/ast.odin b/src/server/ast.odin
index 42c0ba6..07f2169 100644
--- a/src/server/ast.odin
+++ b/src/server/ast.odin
@@ -1,4 +1,5 @@
 #+feature dynamic-literals
+#+feature using-stmt
 package server
 
 import "core:fmt"
diff --git a/src/server/clone.odin b/src/server/clone.odin
index 215ab42..5a9a3ba 100644
--- a/src/server/clone.odin
+++ b/src/server/clone.odin
@@ -1,3 +1,4 @@
+#+feature using-stmt
 package server
 
 import "base:intrinsics"
diff --git a/src/server/collector.odin b/src/server/collector.odin
index 37d3cd8..708c96b 100644
--- a/src/server/collector.odin
+++ b/src/server/collector.odin
@@ -1,3 +1,4 @@
+#+feature using-stmt
 package server
 
 import "core:mem"
@@ -469,7 +470,7 @@ get_proc_group_member_name :: proc(expr: ^ast.Expr) -> (name: string, ok: bool)
 @(private = "file")
 get_or_create_package :: proc(collection: ^SymbolCollection, pkg_name: string) -> ^SymbolPackage {
 	pkg := &collection.packages[pkg_name]
-	if pkg.symbols == nil {
+	if pkg == nil || pkg.symbols == nil {
 		collection.packages[pkg_name] = {}
 		pkg = &collection.packages[pkg_name]
 		pkg.symbols = make(map[string]Symbol, 100, collection.allocator)
diff --git a/src/server/file_resolve.odin b/src/server/file_resolve.odin
index 8c7de51..f381aac 100644
--- a/src/server/file_resolve.odin
+++ b/src/server/file_resolve.odin
@@ -1,3 +1,4 @@
+#+feature using-stmt
 package server
 
 import "core:odin/ast"
@@ -58,7 +59,7 @@ resolve_ranged_file :: proc(
 		if range.start.line - margin <= decl.end.line && decl.pos.line <= range.end.line + margin {
 			resolve_decl(&position_context, &ast_context, document, decl, &symbols, .None, allocator)
 			clear(&ast_context.locals)
-		}	
+		}
 	}
 
 	return symbols
diff --git a/src/server/locals.odin b/src/server/locals.odin
index 3e3d126..e24d27b 100644
--- a/src/server/locals.odin
+++ b/src/server/locals.odin
@@ -1,3 +1,4 @@
+#+feature using-stmt
 package server
 
 import "core:log"
diff --git a/src/server/position_context.odin b/src/server/position_context.odin
index 7670e79..7687d01 100644
--- a/src/server/position_context.odin
+++ b/src/server/position_context.odin
@@ -1,3 +1,4 @@
+#+feature using-stmt
 package server
 
 import "core:log"
diff --git a/src/server/semantic_tokens.odin b/src/server/semantic_tokens.odin
index 885588d..5ff822b 100644
--- a/src/server/semantic_tokens.odin
+++ b/src/server/semantic_tokens.odin
@@ -5,6 +5,7 @@ https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/spe
 
 */
 
+#+feature using-stmt
 package server
 
 import "core:fmt"
@@ -494,7 +495,7 @@ visit_bit_field_fields :: proc(node: ast.Bit_Field_Type, builder: ^SemanticToken
 visit_import_decl :: proc(decl: ^ast.Import_Decl, builder: ^SemanticTokenBuilder) {
 	/*
 	hightlight the namespace in the import declaration
-	
+
 	import "pkg"
 	        ^^^
 	import "core:fmt"
diff --git a/src/server/unmarshal.odin b/src/server/unmarshal.odin
index 04e155d..9025428 100644
--- a/src/server/unmarshal.odin
+++ b/src/server/unmarshal.odin
@@ -1,3 +1,4 @@
+#+feature using-stmt
 package server
 
 import "base:runtime"