Fix various name resolution errors around routine references

Author: cirras

CHANGELOG.md

@@ -63,6 +63,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Name resolution failures on invocations of methods with generic open array parameters.
 - Name resolution failures around `Create` calls on types with `constructor` constraints.
 - Name resolution failures on `read`, `write`, and `stored` specifiers of indexed properties.
+- Name resolution failures on routine references assigned to a `var`/`const` declaration.
+- Name resolution failures on routine references in constant arrays.
 - Type resolution failures on array expressions nested within multidimensional constant arrays.
 - Incorrect file position calculation for multiline string tokens.
 - Analysis errors around `type of` type declarations.

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

@@ -38,11 +38,14 @@
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import org.sonar.plugins.communitydelphi.api.ast.AnonymousMethodNode;
+import org.sonar.plugins.communitydelphi.api.ast.ArrayExpressionNode;
 import org.sonar.plugins.communitydelphi.api.ast.ArrayIndicesNode;
 import org.sonar.plugins.communitydelphi.api.ast.ArrayTypeNode;
 import org.sonar.plugins.communitydelphi.api.ast.AssignmentStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.AttributeListNode;
 import org.sonar.plugins.communitydelphi.api.ast.AttributeNode;
+import org.sonar.plugins.communitydelphi.api.ast.ConstDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.ConstStatementNode;
 import org.sonar.plugins.communitydelphi.api.ast.DelphiNode;
 import org.sonar.plugins.communitydelphi.api.ast.ExpressionNode;
 import org.sonar.plugins.communitydelphi.api.ast.ForInStatementNode;
@@ -71,6 +74,8 @@
 import org.sonar.plugins.communitydelphi.api.ast.TypeNode;
 import org.sonar.plugins.communitydelphi.api.ast.TypeReferenceNode;
 import org.sonar.plugins.communitydelphi.api.ast.UnaryExpressionNode;
+import org.sonar.plugins.communitydelphi.api.ast.VarDeclarationNode;
+import org.sonar.plugins.communitydelphi.api.ast.VarStatementNode;
 import org.sonar.plugins.communitydelphi.api.operator.UnaryOperator;
 import org.sonar.plugins.communitydelphi.api.symbol.Invocable;
 import org.sonar.plugins.communitydelphi.api.symbol.NameOccurrence;
@@ -86,6 +91,7 @@
 import org.sonar.plugins.communitydelphi.api.type.IntrinsicType;
 import org.sonar.plugins.communitydelphi.api.type.Type;
 import org.sonar.plugins.communitydelphi.api.type.Type.AliasType;
+import org.sonar.plugins.communitydelphi.api.type.Type.CollectionType;
 import org.sonar.plugins.communitydelphi.api.type.Type.ProceduralType;
 import org.sonar.plugins.communitydelphi.api.type.Type.ScopedType;
 import org.sonar.plugins.communitydelphi.api.type.Type.TypeParameterType;
@@ -517,18 +523,18 @@ private static boolean handleRoutineReference(
 
     if (parent instanceof AssignmentStatementNode) {
       ExpressionNode assignee = ((AssignmentStatementNode) parent).getAssignee();
-      if (expression == assignee) {
-        return false;
-      }
-
-      if (assignee.getType().isProcedural()) {
-        NameResolver clone = new NameResolver(resolver);
-        clone.disambiguateRoutineReference((ProceduralType) assignee.getType());
-        if (!clone.getDeclarations().isEmpty()) {
-          clone.addToSymbolTable();
-          return true;
-        }
-      }
+      return expression != assignee && handleRoutineReference(assignee.getType(), resolver);
+    } else if (parent instanceof VarDeclarationNode) {
+      return handleRoutineReference(((VarDeclarationNode) parent).getType(), resolver);
+    } else if (parent instanceof ConstDeclarationNode) {
+      return handleRoutineReference(((ConstDeclarationNode) parent).getTypeNode(), resolver);
+    } else if (parent instanceof VarStatementNode) {
+      return handleRoutineReference(((VarStatementNode) parent).getTypeNode(), resolver);
+    } else if (parent instanceof ConstStatementNode) {
+      return handleRoutineReference(((ConstStatementNode) parent).getTypeNode(), resolver);
+    } else if (parent instanceof ArrayExpressionNode) {
+      Type arrayType = ((ArrayExpressionNode) parent).getType();
+      return handleRoutineReference(((CollectionType) arrayType).elementType(), resolver);
     } else if (parent instanceof RecordExpressionItemNode) {
       resolver.addToSymbolTable();
       return true;
@@ -537,6 +543,23 @@ private static boolean handleRoutineReference(
     return false;
   }
 
+  private static boolean handleRoutineReference(TypeNode typeNode, NameResolver resolver) {
+    // You can't assign routine references unless a procedural type is explicitly declared.
+    return typeNode != null && handleRoutineReference(typeNode.getType(), resolver);
+  }
+
+  private static boolean handleRoutineReference(Type type, NameResolver resolver) {
+    if (type.isProcedural()) {
+      NameResolver clone = new NameResolver(resolver);
+      clone.disambiguateRoutineReference((ProceduralType) type);
+      if (!clone.getDeclarations().isEmpty()) {
+        clone.addToSymbolTable();
+        return true;
+      }
+    }
+    return false;
+  }
+
   private static boolean handlePascalReturn(
       PrimaryExpressionNode expression, NameResolver resolver) {
     if (expression.getChildren().size() != 1) {

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

@@ -422,6 +422,27 @@ void testBestEffortArguments() {
     verifyUsages(9, 2, reference(11, 6), reference(11, 11));
   }
 
+  @Test
+  void testRoutineReferenceAssignedToProcedural() {
+    execute("RoutineReferenceAssignedToProcedural.pas");
+    verifyUsages(
+        10,
+        9,
+        reference(21, 17),
+        reference(25, 35),
+        reference(27, 5),
+        reference(28, 10),
+        reference(32, 28));
+    verifyUsages(
+        15,
+        9,
+        reference(22, 19),
+        reference(25, 40),
+        reference(27, 10),
+        reference(28, 5),
+        reference(33, 31));
+  }
+
   @Test
   void testClassReferenceMethodResolution() {
     execute("classReferences/MethodResolution.pas");

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

@@ -0,0 +1,35 @@
+unit RoutineReferenceAssignedToProcedural;
+
+interface
+
+implementation
+
+type
+  TFoo = function(const A: Integer; B: string; var C: Variant): Boolean;
+
+function Bar(const A: Integer; B: string; var C: Variant): Boolean;
+begin
+  Result := True;
+end;
+
+function Baz(const A: Integer; B: string; var C: Variant): Boolean;
+begin
+  Result := False;
+end;
+
+var
+  VarFoo: TFoo = Bar;
+  ConstFoo: TFoo = Baz;
+
+const
+  FooArray: array[0..1] of TFoo = (Bar, Baz);
+  MultiFooArray: array[0..1, 0..1] of TFoo = (
+    (Bar, Baz),
+    (Baz, Bar)
+   );
+
+initialization
+  var InlineVarFoo: TFoo := Bar;
+  const InlineConstFoo: TFoo = Baz;
+
+end.