Merge branch 'master' into rename

1 files changed, 21 insertions, 1 deletions

diff --git a/src/server/generics.odin b/src/server/generics.odin
index 5ff5997..237a271 100644
--- a/src/server/generics.odin
+++ b/src/server/generics.odin
@@ -148,7 +148,6 @@ resolve_poly :: proc(
 
 			return found
 		}
-	case ^ast.Struct_Type:
 	case ^ast.Dynamic_Array_Type:
 		if call_array, ok := call_node.derived.(^ast.Dynamic_Array_Type); ok {
 			if poly_type, ok := p.elem.derived.(^ast.Poly_Type); ok {
@@ -304,6 +303,7 @@ resolve_poly :: proc(
 				return true
 			}
 		}
+	case ^ast.Struct_Type, ^ast.Proc_Type:
 	case ^ast.Ident:
 		return true
 	case:
@@ -457,6 +457,26 @@ find_and_replace_poly_type :: proc(
 				v.pos.file = expr.pos.file
 				v.end.file = expr.end.file
 			}
+		case ^ast.Proc_Type:
+			if v.params != nil {
+				for param in v.params.list {
+					if expr, ok := get_poly_map(param.type, poly_map); ok {
+						param.type = expr
+						param.pos.file = expr.pos.file
+						param.end.file = expr.end.file
+					}
+				}
+			}
+
+			if v.results != nil {
+				for result in v.results.list {
+					if expr, ok := get_poly_map(result.type, poly_map); ok {
+						result.type = expr
+						result.pos.file = expr.pos.file
+						result.end.file = expr.end.file
+					}
+				}
+			}
 		}
 
 		return visitor