From 838626d763a9e446844244636c3cc51d55cbd946 Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <lvond884@gritworld.com>
Date: Fri, 16 Jul 2021 10:33:51 +0200
Subject: [PATCH] remove c#9 features, clean up

---
 .../Diagnostics/Views/MainWindow.xaml.cs      | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index 26e197d790..cfb9e2ead9 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -111,35 +111,33 @@ namespace Avalonia.Diagnostics.Views
                 .FirstOrDefault();
         }
 
-        private static IEnumerable<PopupRoot> GetPopupRoots(IVisual root)
+        private static List<PopupRoot> GetPopupRoots(IVisual root)
         {
-            foreach (var control in root.GetVisualDescendants().OfType<IControl>())
-            {
-                if (control is Popup { Host: PopupRoot r0 })
-                {
-                    yield return r0;
-                }
-
-                if (control.GetValue(ContextFlyoutProperty) is IPopupHostProvider { PopupHost: PopupRoot r1 })
-                {
-                    yield return r1;
-                }
+            var popupRoots = new List<PopupRoot>();
 
-                if (control.GetValue(FlyoutBase.AttachedFlyoutProperty) is IPopupHostProvider { PopupHost: PopupRoot r2 })
+            void ProcessProperty<T>(IControl control, AvaloniaProperty<T> property)
+            {
+                if (control.GetValue(property) is IPopupHostProvider popupProvider
+                    && popupProvider.PopupHost is PopupRoot popupRoot)
                 {
-                    yield return r2;
+                    popupRoots.Add(popupRoot);
                 }
+            }
 
-                if (control.GetValue(ToolTipDiagnostics.ToolTipProperty) is IPopupHostProvider { PopupHost: PopupRoot r3 })
+            foreach (var control in root.GetVisualDescendants().OfType<IControl>())
+            {
+                if (control is Popup p && p.Host is PopupRoot popupRoot)
                 {
-                    yield return r3;
+                    popupRoots.Add(popupRoot);
                 }
 
-                if (control.GetValue(ContextMenuProperty) is IPopupHostProvider { PopupHost: PopupRoot r4 })
-                {
-                    yield return r4;
-                }
+                ProcessProperty(control, ContextFlyoutProperty);
+                ProcessProperty(control, ContextMenuProperty);
+                ProcessProperty(control, FlyoutBase.AttachedFlyoutProperty);
+                ProcessProperty(control, ToolTipDiagnostics.ToolTipProperty);
             }
+
+            return popupRoots;
         }
 
         private void RawKeyDown(RawKeyEventArgs e)