Merge pull request #4312 from IvenBach/Issue3872

Search bar on Code Explorer now filters results after reparse request

Author: Hosch250

Rubberduck.Core/Navigation/CodeExplorer/CodeExplorerViewModel.cs

@@ -260,9 +260,7 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
             get => _projects;
             set
             {
-                ReorderChildNodes(value);
-                _projects = new ObservableCollection<CodeExplorerItemViewModel>(value.OrderBy(o => o.NameWithSignature));
-                CanSearch = _projects.Any();
+                _projects = ForceProjectsRefresh(value);
 
                 OnPropertyChanged();
                 // Once a Project has been set, show the TreeView
@@ -271,6 +269,14 @@ public ObservableCollection<CodeExplorerItemViewModel> Projects
             }
         }
 
+        private ObservableCollection<CodeExplorerItemViewModel> ForceProjectsRefresh(ObservableCollection<CodeExplorerItemViewModel> projects)
+        {
+            ReorderChildNodes(projects);
+            CanSearch = projects.Any();
+
+            return new ObservableCollection<CodeExplorerItemViewModel>(projects.OrderBy(o => o.NameWithSignature));
+        }
+
         private void HandleStateChanged(object sender, ParserStateEventArgs e)
         {
             if (Projects == null)
@@ -304,6 +310,8 @@ private void HandleStateChanged(object sender, ParserStateEventArgs e)
             UpdateNodes(Projects, newProjects);
 
             Projects = new ObservableCollection<CodeExplorerItemViewModel>(newProjects);
+
+            FilterByName(Projects, _filterText);
         }
 
         private void UpdateNodes(IEnumerable<CodeExplorerItemViewModel> oldList, IEnumerable<CodeExplorerItemViewModel> newList)
@@ -388,7 +396,7 @@ private void ParserState_ModuleStateChanged(object sender, ParseProgressEventArg
                     folderNode.AddChild(newNode);
 
                     // Force a refresh. OnPropertyChanged("Projects") didn't work.
-                    Projects = Projects;
+                    ForceProjectsRefresh(Projects);
                 }
                 catch (Exception exception)
                 {
@@ -479,6 +487,21 @@ private void SwitchNodeState(CodeExplorerItemViewModel node, bool expandedState)
                 SwitchNodeState(item, expandedState);
             }
         }
+        
+        private string _filterText;
+        public string FilterText
+        {
+            get => _filterText;
+            set
+            {
+                if (!_filterText?.Equals(value) ?? true)
+                {
+                    _filterText = value;
+                    OnPropertyChanged();
+                    FilterByName(Projects, _filterText);
+                }
+            }
+        }
 
         public ObservableCollection<double> FontSizes { get; } = new ObservableCollection<double> { 8, 10, 12, 14, 16 };
 
@@ -569,10 +592,10 @@ public void FilterByName(IEnumerable<CodeExplorerItemViewModel> nodes, string se
                 {
                     FilterByName(item.Items, searchString);
                 }
-                
-                item.IsVisible = item.Items.Any(c => c.IsVisible) ||
-                                 item.Name.ToLowerInvariant().Contains(searchString.ToLowerInvariant()) ||
-                                 string.IsNullOrEmpty(searchString);
+
+                item.IsVisible = string.IsNullOrEmpty(searchString) ||
+                                 item.Items.Any(c => c.IsVisible) ||
+                                 item.Name.ToLowerInvariant().Contains(searchString.ToLowerInvariant());
             }
         }
 

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml

@@ -621,8 +621,8 @@
                          VerticalContentAlignment="Center"
                          IsEnabled="{Binding CanSearch}"
                          PreviewKeyDown="SearchBox_OnPreviewKeyDown"
-                         TextChanged="SearchBox_OnTextChanged" />
-        
+                         Text="{Binding FilterText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+
                 <Image Source="{StaticResource SearchImage}" 
                        HorizontalAlignment="Right" VerticalAlignment="Center" 
                        MaxHeight="16" Margin="0,0,1,0" 
@@ -632,7 +632,7 @@
 
                 <Button Style="{StaticResource XButtonStyle}" 
                         HorizontalAlignment="Right" VerticalAlignment="Center" 
-                        Height="18" Width="18" Margin="0,1,1,0" 
+                        Height="16" Width="16" Margin="0,1,1,0" 
                         IsEnabled="{Binding CanSearch}"
                         Visibility="{Binding ElementName=SearchBox, Path=Text.Length, Converter={StaticResource StringHasNoValueToVisibility}}" 
                         Click="ButtonBase_OnClick" />

Rubberduck.Core/UI/CodeExplorer/CodeExplorerControl.xaml.cs

@@ -16,7 +16,7 @@ public CodeExplorerControl()
         }
 
         private CodeExplorerViewModel ViewModel => DataContext as CodeExplorerViewModel;
-
+        
         private void TreeView_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
             if (ViewModel != null && ViewModel.OpenCommand.CanExecute(ViewModel.SelectedItem))
@@ -32,11 +32,6 @@ private void TreeView_OnMouseRightButtonDown(object sender, MouseButtonEventArgs
             e.Handled = true;
         }
 
-        private void SearchBox_OnTextChanged(object sender, TextChangedEventArgs e)
-        {
-            ViewModel.FilterByName(ViewModel.Projects, ((TextBox)sender).Text);
-        }
-
         private void SearchIcon_OnMouseDown(object sender, MouseButtonEventArgs e)
         {
             SearchBox.Focus();