strip colons and update ast to use unions

1 files changed, 63 insertions, 63 deletions

diff --git a/src/server/hover.odin b/src/server/hover.odin
index e7c5dba..5dd6acf 100644
--- a/src/server/hover.odin
+++ b/src/server/hover.odin
@@ -18,158 +18,158 @@ import "shared:index"
 import "shared:analysis"
 
 write_hover_content :: proc(ast_context: ^analysis.AstContext, symbol: index.Symbol) -> MarkupContent {
-	using analysis;
+	using analysis
 
-	content: MarkupContent;
+	content: MarkupContent
 
-	symbol := symbol;
+	symbol := symbol
 
 	if untyped, ok := symbol.value.(index.SymbolUntypedValue); ok {
 		switch untyped.type {
-		case .String:  symbol.signature = "string";
-		case .Bool:	   symbol.signature = "bool";
-		case .Float:   symbol.signature = "float";
-		case .Integer: symbol.signature = "int";
+		case .String:  symbol.signature = "string"
+		case .Bool:	   symbol.signature = "bool"
+		case .Float:   symbol.signature = "float"
+		case .Integer: symbol.signature = "int"
 		}
 	}
 
-	build_procedure_symbol_signature(&symbol);
+	build_procedure_symbol_signature(&symbol)
 
-	cat := concatenate_symbol_information(ast_context, symbol, false);
+	cat := concatenate_symbol_information(ast_context, symbol, false)
 
 	if cat != "" {
-		content.kind = "markdown";
-		content.value = fmt.tprintf("```odin\n %v\n```\n%v", cat, symbol.doc);
+		content.kind = "markdown"
+		content.value = fmt.tprintf("```odin\n %v\n```\n%v", cat, symbol.doc)
 	} else {
-		content.kind = "plaintext";
+		content.kind = "plaintext"
 	}
 
-	return content;
+	return content
 }
 
 
 get_hover_information :: proc(document: ^common.Document, position: common.Position) -> (Hover, bool) {
-	using analysis;
+	using analysis
 
 	hover := Hover {
 		contents = {
 			kind = "plaintext",
 		},
-	};
+	}
 
-	ast_context := make_ast_context(document.ast, document.imports, document.package_name, document.uri.uri);
+	ast_context := make_ast_context(document.ast, document.imports, document.package_name, document.uri.uri)
 
-	position_context, ok := get_document_position_context(document, position, .Hover);
+	position_context, ok := get_document_position_context(document, position, .Hover)
 
-	get_globals(document.ast, &ast_context);
+	get_globals(document.ast, &ast_context)
 
 	if position_context.function != nil {
-		get_locals(document.ast, position_context.function, &ast_context, &position_context);
+		get_locals(document.ast, position_context.function, &ast_context, &position_context)
 	}
 
 	if position_context.identifier != nil {
-		if ident, ok := position_context.identifier.derived.(ast.Ident); ok {
+		if ident, ok := position_context.identifier.derived.(^ast.Ident); ok {
 			if _, ok := common.keyword_map[ident.name]; ok {
-				hover.contents.kind = "plaintext";
-				hover.range = common.get_token_range(position_context.identifier^, ast_context.file.src);
-				return hover, true;
+				hover.contents.kind = "plaintext"
+				hover.range = common.get_token_range(position_context.identifier^, ast_context.file.src)
+				return hover, true
 			}
 		}
 	}
 
 	if position_context.selector != nil && position_context.identifier != nil {
-		hover.range = common.get_token_range(position_context.identifier^, ast_context.file.src);
+		hover.range = common.get_token_range(position_context.identifier^, ast_context.file.src)
 
-		ast_context.use_locals      = true;
-		ast_context.use_globals     = true;
-		ast_context.current_package = ast_context.document_package;
+		ast_context.use_locals      = true
+		ast_context.use_globals     = true
+		ast_context.current_package = ast_context.document_package
 
 		//if the base selector is the client wants to go to.
-		if base, ok := position_context.selector.derived.(ast.Ident); ok && position_context.identifier != nil {
+		if base, ok := position_context.selector.derived.(^ast.Ident); ok && position_context.identifier != nil {
 
-			ident := position_context.identifier.derived.(ast.Ident);
+			ident := position_context.identifier.derived.(^ast.Ident)^
 
 			if ident.name == base.name {
 
 				if resolved, ok := resolve_type_identifier(&ast_context, ident); ok {				
-					resolved.signature = get_signature(&ast_context, ident, resolved);
-					resolved.name = ident.name;
+					resolved.signature = get_signature(&ast_context, ident, resolved)
+					resolved.name = ident.name
 
 					if resolved.type == .Variable {
-						resolved.pkg = ast_context.document_package;
+						resolved.pkg = ast_context.document_package
 					}
 
-					hover.contents = write_hover_content(&ast_context, resolved);
-					return hover, true;
+					hover.contents = write_hover_content(&ast_context, resolved)
+					return hover, true
 				}
 			}
 		}
 
-		selector: index.Symbol;
-		selector, ok = resolve_type_expression(&ast_context, position_context.selector);
+		selector: index.Symbol
+		selector, ok = resolve_type_expression(&ast_context, position_context.selector)
 
 		if !ok {
-			return hover, true;
+			return hover, true
 		}
 
-		field: string;
+		field: string
 
 		if position_context.field != nil {
 
-			switch v in position_context.field.derived {
-			case ast.Ident:
-				field = v.name;
+			#partial switch v in position_context.field.derived {
+			case ^ast.Ident:
+				field = v.name
 			}
 		}
 
-		hover.range = common.get_token_range(position_context.identifier^, document.ast.src);
+		hover.range = common.get_token_range(position_context.identifier^, document.ast.src)
 
 		#partial switch v in selector.value {
 		case index.SymbolStructValue:
 			for name, i in v.names {
 				if strings.compare(name, field) == 0 {
 					if symbol, ok := resolve_type_expression(&ast_context, v.types[i]); ok {
-						symbol.name      = name; //TODO refractor - never set symbol name after creation - change writer_hover_content
-						symbol.pkg       = selector.name;
-						symbol.signature = common.node_to_string(v.types[i]);
-						hover.contents   = write_hover_content(&ast_context, symbol);
-						return hover, true;
+						symbol.name      = name //TODO refractor - never set symbol name after creation - change writer_hover_content
+						symbol.pkg       = selector.name
+						symbol.signature = common.node_to_string(v.types[i])
+						hover.contents   = write_hover_content(&ast_context, symbol)
+						return hover, true
 					}
 				}
 			}
 		case index.SymbolPackageValue:
 			if position_context.field != nil {
-				if ident, ok := position_context.field.derived.(ast.Ident); ok {
-					ast_context.current_package = selector.pkg;
-					if symbol, ok := resolve_type_identifier(&ast_context, ident); ok {
-						hover.contents = write_hover_content(&ast_context, symbol);
-						return hover, true;
+				if ident, ok := position_context.field.derived.(^ast.Ident); ok {
+					ast_context.current_package = selector.pkg
+					if symbol, ok := resolve_type_identifier(&ast_context, ident^); ok {
+						hover.contents = write_hover_content(&ast_context, symbol)
+						return hover, true
 					}
 				}
 			}
 		}
 	} else if position_context.identifier != nil {
 
-		ast_context.use_locals      = true;
-		ast_context.use_globals     = true;
-		ast_context.current_package = ast_context.document_package;
+		ast_context.use_locals      = true
+		ast_context.use_globals     = true
+		ast_context.current_package = ast_context.document_package
 
-		ident := position_context.identifier.derived.(ast.Ident);
+		ident := position_context.identifier.derived.(^ast.Ident)^
 
-		hover.range = common.get_token_range(position_context.identifier^, document.ast.src);
+		hover.range = common.get_token_range(position_context.identifier^, document.ast.src)
 
 		if resolved, ok := resolve_type_identifier(&ast_context, ident); ok {	
-			resolved.signature = get_signature(&ast_context, ident, resolved);
-			resolved.name = ident.name;
+			resolved.signature = get_signature(&ast_context, ident, resolved)
+			resolved.name = ident.name
 
 			if resolved.type == .Variable {
-				resolved.pkg = ast_context.document_package;
+				resolved.pkg = ast_context.document_package
 			}
 
-			hover.contents = write_hover_content(&ast_context, resolved);
-			return hover, true;
+			hover.contents = write_hover_content(&ast_context, resolved)
+			return hover, true
 		}
 	}
 
-	return hover, true;
+	return hover, true
 }