Resolve type parameters consecutively

Previously, we were resolving all type parameter constraints before
resolving the type parameters themselves. This resulted in unresolved
types in cases where a later type parameter relied on a previous type
parameter.

Author: fourls

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- **API:** `TypeParameterNode::getTypeParameters` method.
+
+### Fixed
+
+- Name resolution failures on generic routine invocations where later type parameters are constrained by earlier type parameters.
+
 ## [1.16.0] - 2025-05-09
 
 ### Added

delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/GenericDefinitionNodeImpl.java

@@ -19,18 +19,12 @@
 package au.com.integradev.delphi.antlr.ast.node;
 
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
-import au.com.integradev.delphi.type.generic.TypeParameterTypeImpl;
-import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.antlr.runtime.Token;
-import org.sonar.plugins.communitydelphi.api.ast.ConstraintNode;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
 import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode;
-import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.TypeParameterNode;
-import org.sonar.plugins.communitydelphi.api.type.Constraint;
-import org.sonar.plugins.communitydelphi.api.type.Type.TypeParameterType;
 
 public final class GenericDefinitionNodeImpl extends DelphiNodeImpl
     implements GenericDefinitionNode {
@@ -53,22 +47,10 @@ public <T> T accept(DelphiParserVisitor<T> visitor, T data) {
   @Override
   public List<TypeParameter> getTypeParameters() {
     if (typeParameters == null) {
-      ImmutableList.Builder<TypeParameter> builder = ImmutableList.builder();
-
-      for (TypeParameterNode parameterNode : getTypeParameterNodes()) {
-        List<Constraint> constraints =
-            parameterNode.getConstraintNodes().stream()
-                .map(ConstraintNode::getConstraint)
-                .collect(Collectors.toUnmodifiableList());
-
-        for (NameDeclarationNode name : parameterNode.getTypeParameterNameNodes()) {
-          TypeParameterType type = TypeParameterTypeImpl.create(name.getImage(), constraints);
-          TypeParameter typeParameter = new TypeParameterImpl(name, type);
-          builder.add(typeParameter);
-        }
-      }
-
-      typeParameters = builder.build();
+      typeParameters =
+          getTypeParameterNodes().stream()
+              .flatMap(node -> node.getTypeParameters().stream())
+              .collect(Collectors.toList());
     }
 
     return typeParameters;
@@ -92,24 +74,4 @@ public String getImage() {
     }
     return image;
   }
-
-  private static final class TypeParameterImpl implements TypeParameter {
-    private final NameDeclarationNode location;
-    private final TypeParameterType type;
-
-    private TypeParameterImpl(NameDeclarationNode location, TypeParameterType type) {
-      this.location = location;
-      this.type = type;
-    }
-
-    @Override
-    public NameDeclarationNode getLocation() {
-      return location;
-    }
-
-    @Override
-    public TypeParameterType getType() {
-      return type;
-    }
-  }
 }

delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/node/TypeParameterNodeImpl.java

@@ -19,14 +19,18 @@
 package au.com.integradev.delphi.antlr.ast.node;
 
 import au.com.integradev.delphi.antlr.ast.visitors.DelphiParserVisitor;
+import au.com.integradev.delphi.type.generic.TypeParameterTypeImpl;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.antlr.runtime.Token;
 import org.sonar.plugins.communitydelphi.api.ast.ConstraintNode;
+import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode.TypeParameter;
 import org.sonar.plugins.communitydelphi.api.ast.NameDeclarationNode;
 import org.sonar.plugins.communitydelphi.api.ast.TypeConstraintNode;
 import org.sonar.plugins.communitydelphi.api.ast.TypeParameterNode;
 import org.sonar.plugins.communitydelphi.api.ast.TypeReferenceNode;
+import org.sonar.plugins.communitydelphi.api.type.Constraint;
+import org.sonar.plugins.communitydelphi.api.type.Type.TypeParameterType;
 
 public final class TypeParameterNodeImpl extends DelphiNodeImpl implements TypeParameterNode {
   public TypeParameterNodeImpl(Token token) {
@@ -61,4 +65,39 @@ public List<TypeReferenceNode> getTypeConstraintNodes() {
   public List<ConstraintNode> getConstraintNodes() {
     return findChildrenOfType(ConstraintNode.class);
   }
+
+  @Override
+  public List<TypeParameter> getTypeParameters() {
+    List<Constraint> constraints =
+        getConstraintNodes().stream()
+            .map(ConstraintNode::getConstraint)
+            .collect(Collectors.toUnmodifiableList());
+
+    return getTypeParameterNameNodes().stream()
+        .map(
+            name ->
+                new TypeParameterImpl(
+                    name, TypeParameterTypeImpl.create(name.getImage(), constraints)))
+        .collect(Collectors.toList());
+  }
+
+  private static final class TypeParameterImpl implements TypeParameter {
+    private final NameDeclarationNode location;
+    private final TypeParameterType type;
+
+    public TypeParameterImpl(NameDeclarationNode location, TypeParameterType type) {
+      this.location = location;
+      this.type = type;
+    }
+
+    @Override
+    public NameDeclarationNode getLocation() {
+      return location;
+    }
+
+    @Override
+    public TypeParameterType getType() {
+      return type;
+    }
+  }
 }

delphi-frontend/src/main/java/au/com/integradev/delphi/antlr/ast/visitors/SymbolTableVisitor.java

@@ -88,7 +88,6 @@
 import org.sonar.plugins.communitydelphi.api.ast.ForToStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.FormalParameterNode.FormalParameterData;
 import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode;
-import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode.TypeParameter;
 import org.sonar.plugins.communitydelphi.api.ast.GotoStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.IfStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.ImplementationSectionNode;
@@ -402,12 +401,14 @@ private static void createTypeParameterDeclarations(
             .map(TypeConstraintNodeImpl.class::cast)
             .map(TypeConstraintNodeImpl::getTypeNode)
             .forEach(data.nameResolutionHelper::resolve);
-      }
 
-      for (TypeParameter typeParameter : definition.getTypeParameters()) {
-        NameDeclarationNode location = typeParameter.getLocation();
-        var declaration = new TypeParameterNameDeclarationImpl(location, typeParameter.getType());
-        data.addDeclaration(declaration, location);
+        parameterNode
+            .getTypeParameters()
+            .forEach(
+                param ->
+                    data.addDeclaration(
+                        new TypeParameterNameDeclarationImpl(param.getLocation(), param.getType()),
+                        param.getLocation()));
       }
     }
   }

delphi-frontend/src/main/java/org/sonar/plugins/communitydelphi/api/ast/TypeParameterNode.java

@@ -19,6 +19,7 @@
 package org.sonar.plugins.communitydelphi.api.ast;
 
 import java.util.List;
+import org.sonar.plugins.communitydelphi.api.ast.GenericDefinitionNode.TypeParameter;
 
 public interface TypeParameterNode extends DelphiNode {
   List<NameDeclarationNode> getTypeParameterNameNodes();
@@ -30,4 +31,6 @@ public interface TypeParameterNode extends DelphiNode {
   List<TypeReferenceNode> getTypeConstraintNodes();
 
   List<ConstraintNode> getConstraintNodes();
+
+  List<TypeParameter> getTypeParameters();
 }