From 86aad32bee708db2b93bcfdac87f1af620c089ca Mon Sep 17 00:00:00 2001
From: Luis von der Eltz <luis@gritworld.com>
Date: Thu, 20 Aug 2020 18:23:19 +0200
Subject: [PATCH] Adding support for regex filter of devtools properties

---
 .../ViewModels/ControlDetailsViewModel.cs     | 31 ++++++-------
 .../ViewModels/TreePageViewModel.cs           | 34 +++++++++++---
 .../Diagnostics/Views/ControlDetailsView.xaml | 45 +++++++++++--------
 3 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 4e7129da41..c8f618580b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Avalonia.Collections;
 using Avalonia.VisualTree;
 
@@ -12,12 +13,13 @@ namespace Avalonia.Diagnostics.ViewModels
         private readonly IVisual _control;
         private readonly IDictionary<object, List<PropertyViewModel>> _propertyIndex;
         private AvaloniaPropertyViewModel _selectedProperty;
-        private string _propertyFilter;
 
-        public ControlDetailsViewModel(IVisual control, string propertyFilter)
+        public ControlDetailsViewModel(TreePageViewModel treePage, IVisual control)
         {
             _control = control;
 
+            TreePage = treePage;
+
             var properties = GetAvaloniaProperties(control)
                 .Concat(GetClrProperties(control))
                 .OrderBy(x => x, PropertyComparer.Instance)
@@ -25,7 +27,6 @@ namespace Avalonia.Diagnostics.ViewModels
                 .ToList();
 
             _propertyIndex = properties.GroupBy(x => x.Key).ToDictionary(x => x.Key, x => x.ToList());
-            _propertyFilter = propertyFilter;
 
             var view = new DataGridCollectionView(properties);
             view.GroupDescriptions.Add(new DataGridPathGroupDescription(nameof(AvaloniaPropertyViewModel.Group)));
@@ -43,19 +44,9 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public DataGridCollectionView PropertiesView { get; }
+        public TreePageViewModel TreePage { get; }
 
-        public string PropertyFilter
-        {
-            get => _propertyFilter;
-            set
-            {
-                if (RaiseAndSetIfChanged(ref _propertyFilter, value))
-                {
-                    PropertiesView.Refresh();
-                }
-            }
-        }
+        public DataGridCollectionView PropertiesView { get; }
 
         public AvaloniaPropertyViewModel SelectedProperty
         {
@@ -137,9 +128,15 @@ namespace Avalonia.Diagnostics.ViewModels
 
         private bool FilterProperty(object arg)
         {
-            if (!string.IsNullOrWhiteSpace(PropertyFilter) && arg is PropertyViewModel property)
+            if (!string.IsNullOrWhiteSpace(TreePage.PropertyFilter) && arg is PropertyViewModel property)
             {
-                return property.Name.IndexOf(PropertyFilter, StringComparison.OrdinalIgnoreCase) != -1;
+                if (TreePage.UseRegexFilter)
+                {
+                    var regex = new Regex(TreePage.PropertyFilter);
+                    return regex.IsMatch(property.Name);
+                }
+
+                return property.Name.IndexOf(TreePage.PropertyFilter, StringComparison.OrdinalIgnoreCase) != -1;
             }
 
             return true;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
index ec48cff399..77594570ed 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreePageViewModel.cs
@@ -8,7 +8,8 @@ namespace Avalonia.Diagnostics.ViewModels
     {
         private TreeNode _selectedNode;
         private ControlDetailsViewModel _details;
-        private string _propertyFilter;
+        private string _propertyFilter = string.Empty;
+        private bool _useRegexFilter;
 
         public TreePageViewModel(TreeNode[] nodes)
         {
@@ -34,15 +35,10 @@ namespace Avalonia.Diagnostics.ViewModels
             get => _selectedNode;
             private set
             {
-                if (Details != null)
-                {
-                    _propertyFilter = Details.PropertyFilter;
-                }
-
                 if (RaiseAndSetIfChanged(ref _selectedNode, value))
                 {
                     Details = value != null ?
-                        new ControlDetailsViewModel(value.Visual, _propertyFilter) :
+                        new ControlDetailsViewModel(this, value.Visual) :
                         null;
                 }
             }
@@ -62,6 +58,30 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
+        public string PropertyFilter
+        {
+            get => _propertyFilter;
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _propertyFilter, value))
+                {
+                    Details.PropertiesView.Refresh();
+                }
+            }
+        }
+
+        public bool UseRegexFilter
+        {
+            get => _useRegexFilter;
+            set
+            {
+                if (RaiseAndSetIfChanged(ref _useRegexFilter, value))
+                {
+                    Details.PropertiesView.Refresh();
+                }
+            }
+        }
+
         public void Dispose()
         {
             foreach (var node in Nodes)
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index 29ce26fcdf..b2d3a8bddb 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -2,24 +2,31 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:conv="clr-namespace:Avalonia.Diagnostics.Converters"
              x:Class="Avalonia.Diagnostics.Views.ControlDetailsView">
-  <Grid ColumnDefinitions="*">
-    <DockPanel Grid.Column="0">
-      <TextBox DockPanel.Dock="Top"
-               BorderThickness="0"
-               Text="{Binding PropertyFilter}"
-               Watermark="Filter properties"/>
-      <DataGrid Items="{Binding PropertiesView}"
-                BorderThickness="0"
-                RowBackground="Transparent"
-                SelectedItem="{Binding SelectedProperty, Mode=TwoWay}"
-                CanUserResizeColumns="true">
-        <DataGrid.Columns>
-          <DataGridTextColumn Header="Property" Binding="{Binding Name}" IsReadOnly="True"/>
-          <DataGridTextColumn Header="Value" Binding="{Binding Value}"/>
-          <DataGridTextColumn Header="Type" Binding="{Binding Type}"/>
-          <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True"/>
-        </DataGrid.Columns>
-      </DataGrid>
-    </DockPanel>
+  <Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
+
+    <TextBox Grid.Row="0" Grid.Column="0"
+             BorderThickness="0"
+             Text="{Binding TreePage.PropertyFilter}"
+             Watermark="Filter properties" />
+
+    <CheckBox Grid.Row="0" 
+              Grid.Column="1" 
+              Content="Regex" 
+              IsChecked="{Binding TreePage.UseRegexFilter}"/>
+
+    <DataGrid Items="{Binding PropertiesView}"
+              Grid.Row="1" Grid.ColumnSpan="2"
+              BorderThickness="0"
+              RowBackground="Transparent"
+              SelectedItem="{Binding SelectedProperty, Mode=TwoWay}"
+              CanUserResizeColumns="true">
+      <DataGrid.Columns>
+        <DataGridTextColumn Header="Property" Binding="{Binding Name}" IsReadOnly="True" />
+        <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
+        <DataGridTextColumn Header="Type" Binding="{Binding Type}" />
+        <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
+      </DataGrid.Columns>
+    </DataGrid>
+
   </Grid>
 </UserControl>