cleanup, todos

peachpiecompiler · May 6, 2024 · 232f292 · 232f292
1 parent 57bab37
commit 232f292
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/Peachpie.CodeAnalysis/Symbols/Php/PhpTypeSymbolExtensions.cs b/src/Peachpie.CodeAnalysis/Symbols/Php/PhpTypeSymbolExtensions.cs
@@ -106,13 +106,17 @@ public static Symbol ResolveInstanceProperty(this ITypeSymbol type, string name)
 
             for (var t = type; t != null; t = t.BaseType)
             {
-                candidate = t.GetMembers(name).OfType<FieldSymbol>().Where(f => !f.IsConst && !f.IsPhpStatic()).SingleOrDefault();
+                var members = t.GetMembers(name);
+
+                candidate = members.OfType<FieldSymbol>().Where(f => !f.IsConst && !f.IsPhpStatic()).SingleOrDefault();
                 if (candidate != null)
                 {
+                    // TODO: if field is private, check also `event` with the same name
+
                     return candidate;
                 }
 
-                candidate = t.GetMembers(name).OfType<PropertySymbol>().Where(p => !p.IsStatic).SingleOrDefault();
+                candidate = members.OfType<PropertySymbol>().Where(p => !p.IsStatic).SingleOrDefault();
                 if (candidate != null)
                 {
                     return candidate;