Fix type resolution failures on class reference constructors

Author: fourls

CHANGELOG.md

@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Name resolution failures on generic routine invocations where later type parameters are constrained by earlier type parameters.
 - Type resolution failures on `as` casts where the type is returned from a routine invocation.
+- Inaccurate type resolution when calling a constructor on a class reference type.
 
 ## [1.16.0] - 2025-05-09
 

delphi-frontend/src/main/java/au/com/integradev/delphi/symbol/resolve/NameResolver.java

@@ -1103,17 +1103,27 @@ private void disambiguateArguments(List<ExpressionNode> argumentExpressions, boo
   }
 
   private void resolveReturnType(Invocable invocable, List<InvocationArgument> arguments) {
-    if (!isConstructor((NameDeclaration) invocable)) {
-      Type returnType = invocable.getReturnType();
-      if (returnType instanceof IntrinsicReturnType) {
-        List<Type> argumentTypes =
-            arguments.stream()
-                .map(InvocationArgument::getType)
-                .collect(Collectors.toUnmodifiableList());
-        returnType = ((IntrinsicReturnType) returnType).getReturnType(argumentTypes);
+    // Constructors are a special case - they return the type they are invoked on
+    if (isConstructor((NameDeclaration) invocable)) {
+      if (currentType.isClassReference()) {
+        // Calling the constructor on a class reference type returns an instance of that class
+        updateType(((ClassReferenceType) currentType).classType());
       }
-      updateType(returnType);
+
+      return;
     }
+
+    Type returnType = invocable.getReturnType();
+
+    if (returnType instanceof IntrinsicReturnType) {
+      List<Type> argumentTypes =
+          arguments.stream()
+              .map(InvocationArgument::getType)
+              .collect(Collectors.toUnmodifiableList());
+      returnType = ((IntrinsicReturnType) returnType).getReturnType(argumentTypes);
+    }
+
+    updateType(returnType);
   }
 
   private void createCandidates(InvocationResolver resolver) {

delphi-frontend/src/test/java/au/com/integradev/delphi/executor/DelphiSymbolTableExecutorTest.java

@@ -458,7 +458,7 @@ void testClassReferenceArgumentResolution() {
   @Test
   void testClassReferenceConstructorTypeResolution() {
     execute("classReferences/ConstructorTypeResolution.pas");
-    verifyUsages(15, 10, reference(22, 2));
+    verifyUsages(15, 10, reference(22, 2), reference(23, 2));
     verifyUsages(8, 16, reference(22, 11));
   }
 

delphi-frontend/src/test/resources/au/com/integradev/delphi/symbol/classReferences/ConstructorTypeResolution.pas

@@ -20,6 +20,7 @@ procedure Proc(Obj: TObject);
 procedure Test(Bar: Boolean; Baz: TMetaFoo);
 begin
   Proc(Baz.Create(Bar));
+  Proc(TMetaFoo.Create(Bar));
 end;
 
 end.