Merge branch 'master' into remove-unused-imports

1 files changed, 76 insertions, 10 deletions

diff --git a/src/server/analysis.odin b/src/server/analysis.odin
index 1e570b4..2278e00 100644
--- a/src/server/analysis.odin
+++ b/src/server/analysis.odin
@@ -340,25 +340,43 @@ are_symbol_basic_same_keywords :: proc(a, b: Symbol) -> bool {
 	if are_keyword_aliases(a.name, b.name) {
 		return true
 	}
-	if a.name != b.name {
+	a_value, a_ok := a.value.(SymbolBasicValue)
+	if !a_ok {
 		return false
 	}
-	if _, ok := a.value.(SymbolBasicValue); !ok {
+
+	b_value, b_ok := b.value.(SymbolBasicValue)
+	if !b_ok {
 		return false
 	}
-	if _, ok := b.value.(SymbolBasicValue); !ok {
+	if a_value.ident.name != b_value.ident.name {
 		return false
 	}
-	if _, ok := keyword_map[a.name]; !ok {
+	if _, ok := keyword_map[a_value.ident.name]; !ok {
 		return false
 	}
-	if _, ok := keyword_map[b.name]; !ok {
+	if _, ok := keyword_map[b_value.ident.name]; !ok {
 		return false
 	}
 
 	return true
 }
 
+is_valid_nil_symbol :: proc(symbol: Symbol) -> bool {
+	if symbol.pointers > 0 {
+		return true
+	}
+
+	#partial switch v in symbol.value {
+	case SymbolMapValue, SymbolSliceValue, SymbolProcedureValue, SymbolDynamicArrayValue:
+		return true
+	case SymbolUnionValue:
+		return v.kind != .no_nil
+	}
+
+	return false
+}
+
 is_symbol_same_typed :: proc(ast_context: ^AstContext, a, b: Symbol, flags: ast.Field_Flags = {}) -> bool {
 	// In order to correctly equate the symbols for overloaded functions, we need to check both directions
 	if same, ok := are_symbol_untyped_basic_same_typed(a, b); ok {
@@ -718,6 +736,7 @@ resolve_function_overload :: proc(ast_context: ^AstContext, group: ast.Proc_Grou
 						call_symbol: Symbol
 						arg_symbol: Symbol
 						ok: bool
+						is_call_arg_nil: bool
 
 						if _, ok = call_arg.derived.(^ast.Bad_Expr); ok {
 							continue
@@ -726,9 +745,14 @@ resolve_function_overload :: proc(ast_context: ^AstContext, group: ast.Proc_Grou
 						//named parameter
 						if field, is_field := call_arg.derived.(^ast.Field_Value); is_field {
 							named = true
-							call_symbol, ok = resolve_call_arg_type_expression(ast_context, field.value)
-							if !ok {
-								break next_fn
+							if ident, is_ident := field.field.derived.(^ast.Ident); is_ident && ident.name == "nil" {
+								is_call_arg_nil = true
+								ok = true
+							} else {
+								call_symbol, ok = resolve_call_arg_type_expression(ast_context, field.value)
+								if !ok {
+									break next_fn
+								}
 							}
 
 							if ident, is_ident := field.field.derived.(^ast.Ident); is_ident {
@@ -744,7 +768,12 @@ resolve_function_overload :: proc(ast_context: ^AstContext, group: ast.Proc_Grou
 								log.error("Expected name parameter after starting named parmeter phase")
 								return {}, false
 							}
-							call_symbol, ok = resolve_call_arg_type_expression(ast_context, call_arg)
+							if ident, is_ident := call_arg.derived.(^ast.Ident); is_ident && ident.name == "nil" {
+								is_call_arg_nil = true
+								ok = true
+							} else {
+								call_symbol, ok = resolve_call_arg_type_expression(ast_context, call_arg)
+							}
 						}
 
 						if !ok {
@@ -783,6 +812,15 @@ resolve_function_overload :: proc(ast_context: ^AstContext, group: ast.Proc_Grou
 							break next_fn
 						}
 
+						if is_call_arg_nil {
+							if is_valid_nil_symbol(arg_symbol) {
+								continue
+							} else {
+								break next_fn
+							}
+
+						}
+
 						if !is_symbol_same_typed(ast_context, call_symbol, arg_symbol, proc_arg.flags) {
 							found := false
 							// Are we a union variant
@@ -1259,6 +1297,13 @@ resolve_index_expr :: proc(ast_context: ^AstContext, v: ^ast.Index_Expr) -> (Sym
 			return indexed, true
 		}
 		return {}, false
+	case SymbolMatrixValue:
+		value := SymbolFixedArrayValue{
+			expr = v2.expr,
+			len = v2.x,
+		}
+		indexed.value = value
+		return indexed, true
 	}
 
 
@@ -2553,7 +2598,9 @@ resolve_location_identifier :: proc(ast_context: ^AstContext, node: ast.Ident) -
 		symbol.uri = uri.uri
 		symbol.flags |= {.Local}
 		return symbol, true
-	} else if global, ok := ast_context.globals[node.name]; ok {
+	}
+
+	if global, ok := ast_context.globals[node.name]; ok {
 		symbol.range = common.get_token_range(global.name_expr, ast_context.file.src)
 		uri := common.create_uri(global.expr.pos.file, ast_context.allocator)
 		symbol.pkg = ast_context.document_package
@@ -2561,6 +2608,25 @@ resolve_location_identifier :: proc(ast_context: ^AstContext, node: ast.Ident) -
 		return symbol, true
 	}
 
+	for imp in ast_context.imports {
+		if imp.name == ast_context.current_package {
+			continue
+		}
+
+		if strings.compare(imp.base, node.name) == 0 {
+			symbol := Symbol {
+				type  = .Package,
+				pkg   = imp.name,
+				value = SymbolPackageValue{},
+				range = imp.range,
+			}
+
+			try_build_package(symbol.pkg)
+
+			return symbol, true
+		}
+	}
+
 	pkg := get_package_from_node(node)
 	if symbol, ok := lookup(node.name, pkg, node.pos.file); ok {
 		return symbol, ok