Fix name resolution failures around ancestors of enclosing types

Author: Cirras

CHANGELOG.md

@@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - False positives on enumerator property `Current` in `UnusedProperty`.
 - False positives on enums that are never referenced by name (but have used values) in `UnusedType`.
 - Name resolution failures in legacy initialization sections referencing the implementation section.
+- Name resolution failures whena accessing ancestors of enclosing types from nested type methods.
 - 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/Search.java

@@ -253,14 +253,14 @@ private Set<NameDeclaration> searchTypeScope(TypeScope scope) {
   private Set<NameDeclaration> searchEnclosingTypes(@Nullable DelphiScope scope) {
     Set<NameDeclaration> result = Collections.emptySet();
     if (scope != null) {
-      TypeScope nextTypeScope = scope.getEnclosingScope(TypeScope.class);
-      if (nextTypeScope != null) {
+      TypeScope enclosingTypeScope = scope.getEnclosingScope(TypeScope.class);
+      if (enclosingTypeScope != null) {
         if (TRACE) {
-          LOG.info("  checking enclosing type scope {}", nextTypeScope);
+          LOG.info("  checking enclosing type scope {}", enclosingTypeScope);
         }
-        result = filterTypeScopeResults(nextTypeScope.findDeclaration(occurrence));
+        result = searchTypeScope(enclosingTypeScope);
         if (result.isEmpty()) {
-          return searchEnclosingTypes(nextTypeScope.getParent());
+          return searchEnclosingTypes(enclosingTypeScope.getParent());
         }
       }
     }

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

@@ -179,6 +179,7 @@ void testNestedTypes() {
     execute("NestedTypes.pas");
     verifyUsages(7, 8, reference(20, 10), reference(21, 5));
     verifyUsages(8, 26, reference(23, 4), reference(24, 4));
+    verifyUsages(29, 20, reference(46, 2));
   }
 
   @Test

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

@@ -24,4 +24,26 @@ procedure TFoo.TBaz.Test;
   B.DoStuff;
 end;
 
+type
+  TFlimFlam = class
+    class procedure Flarp;
+  end;
+
+  TFoo = class(TFlimFlam)
+    type
+      TBar = class
+        procedure Baz;
+      end;
+  end;
+
+class procedure TFlimFlam.Flarp;
+begin
+  // do nothing
+end;
+
+procedure TFoo.TBar.Baz;
+begin
+  Flarp;
+end;
+
 end.