Use correct type for this in methods for generic structs

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
index fa32a440..5feee88b 100644
--- a/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
+++ b/src/main/java/org/shedlang/compiler/typechecker/TypeChecker.java
@@ -1786,9 +1786,16 @@ public class TypeChecker {
                     // fine since those steps can (currently, at least) happen
                     // in any other -- maybe they should just be merged, given
                     // that otherwise this is invalid?
+                    var thisType = switch (typeOrConstructor) {
+                        case TypeOrConstructor.Constructor<SimpleStructType> constructor ->
+                            Types.constructedType(constructor.value(), constructor.value().params());
+                        case TypeOrConstructor.Type<SimpleStructType> type ->
+                            type.value();
+                    };
+
                     var declareFunctionResult = declareFunctionDefinition(
                         untypedMethodNode,
-                        Optional.of(typeOrConstructor.toType()),
+                        Optional.of(thisType),
                         context
                     );
                     var typeCheckFunctionState = declareFunctionResult.value();